From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
Date: Sat, 23 Jul 2011 17:46:33 +0000 (UTC) [thread overview]
Message-ID: <ac4dc90fd5041baf7295c9d27589f5e7b291f8c9.tetromino@gentoo> (raw)
commit: ac4dc90fd5041baf7295c9d27589f5e7b291f8c9
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 17:25:54 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Jul 23 17:25:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac4dc90f
x11-libs/gtk+: 3.1.8-r1 → 3.1.10
Version bump with a new save dialog and lots of a11y changes. Update
dependencies. Theming engine patch no longer needed.
---
...k+-3.1.8-themingengine-new-gparamspec-api.patch | 28 --------------------
.../{gtk+-3.1.8-r1.ebuild => gtk+-3.1.10.ebuild} | 9 +-----
x11-libs/gtk+/gtk+-9999.ebuild | 6 +---
3 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch b/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
deleted file mode 100644
index d14c7e9..0000000
--- a/x11-libs/gtk+/files/gtk+-3.1.8-themingengine-new-gparamspec-api.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7741f5a09a841c4dc93727b990defc303510ed2c Mon Sep 17 00:00:00 2001
-From: Florian Müllner <fmuellner@gnome.org>
-Date: Fri, 15 Jul 2011 18:45:59 +0000
-Subject: theming-engine: Adjust register_property() to recent glib change
-
-GParamSpec now uses an intern'ed string for 'name', so the code
-in gtk_theming_engine_register_property() which prefixes the name
-with a namespace has to be adjusted.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654695
----
-diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
-index 66adad6..64a2bc5 100644
---- a/gtk/gtkthemingengine.c
-+++ b/gtk/gtkthemingengine.c
-@@ -391,8 +391,8 @@ gtk_theming_engine_register_property (const gchar *name_space,
-
- /* FIXME: hack hack hack, replacing pspec->name to include namespace */
- name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
-- g_free (pspec->name);
-- pspec->name = name;
-+ pspec->name = (char *)g_intern_string (name);
-+ g_free (name);
-
- gtk_style_properties_register_property (parse_func, pspec);
- }
---
-cgit v0.9
diff --git a/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.1.10.ebuild
similarity index 95%
rename from x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
rename to x11-libs/gtk+/gtk+-3.1.10.ebuild
index 4ceeca9..908a1f1 100644
--- a/x11-libs/gtk+/gtk+-3.1.8-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.10.ebuild
@@ -49,8 +49,8 @@ COMMON_DEPEND="!aqua? (
>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.29.4
- >=x11-libs/pango-1.24.0[introspection?]
+ >=dev-libs/glib-2.29.14
+ >=x11-libs/pango-1.29.0[introspection?]
>=dev-libs/atk-1.30[introspection?]
>=x11-libs/gtk+-2.24:2
media-libs/fontconfig
@@ -77,9 +77,7 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )"
-# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
RDEPEND="${COMMON_DEPEND}
- >=dev-libs/glib-2.29.12
!<gnome-base/gail-1000
packagekit? ( app-admin/packagekit-base )"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
@@ -122,9 +120,6 @@ src_prepare() {
[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
fi
- # Fixes constant crashes with glib-2.29.12; will be in next release
- epatch "${FILESDIR}/${P}-themingengine-new-gparamspec-api.patch"
-
gnome2_src_prepare
}
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 4259e9a..908a1f1 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -49,8 +49,8 @@ COMMON_DEPEND="!aqua? (
>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.29.4
- >=x11-libs/pango-1.24.0[introspection?]
+ >=dev-libs/glib-2.29.14
+ >=x11-libs/pango-1.29.0[introspection?]
>=dev-libs/atk-1.30[introspection?]
>=x11-libs/gtk+-2.24:2
media-libs/fontconfig
@@ -77,9 +77,7 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )"
-# >=dev-libs/glib-2.29.12 needed at runtime, see gnome bugs 654627, 654695
RDEPEND="${COMMON_DEPEND}
- >=dev-libs/glib-2.29.12
!<gnome-base/gail-1000
packagekit? ( app-admin/packagekit-base )"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
next reply other threads:[~2011-07-23 17:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-23 17:46 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 4:46 [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ Alexandre Restovtsev
2011-09-18 23:01 Alexandre Restovtsev
2011-09-07 21:30 Alexandre Restovtsev
2011-08-13 19:33 Alexandre Restovtsev
2011-07-20 23:42 Alexandre Restovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ac4dc90fd5041baf7295c9d27589f5e7b291f8c9.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox