Fix abort when icon widgets on gtktoolbuttons aren't GtkMisc, needed by gnome-boxes

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 278 insertions, 7 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index ec31dac3124b..c780de1f0992 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.550 2011/11/16 21:54:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.551 2011/11/16 23:44:46 nirbheek Exp $
+
+*gtk+-3.2.2-r1 (16 Nov 2011)
+
+  16 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gtk+-3.2.2-r1.ebuild,
+  +files/gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch:
+  Fix abort when icon widgets on gtktoolbuttons aren't GtkMisc, needed by
+  gnome-boxes
 
 *gtk+-2.24.8 (16 Nov 2011)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 83137f97f6a1..980aae6ef05c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
@@ -17,6 +17,7 @@ AUX gtk+-3.0.12-use-const.patch 8069 RMD160 ca641c05aa678b046ec42a800c39ef80b9d9
 AUX gtk+-3.0.8-darwin-quartz.patch 579 RMD160 e7cee263b7edbf2d8cdfb848939c0f588b595567 SHA1 5196ef95f68080e2bd8a1582db7d61b0a65b0aac SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc
 AUX gtk+-3.2.1-failing-tests.patch 1287 RMD160 364821995cd6e6cf1d8d24be55cbc44877b38680 SHA1 59b483d4a562a2563e8b44fbc3c84c97c2ff49d7 SHA256 07368c5a7b577b9493c3be423c51feadcfe48503203785e2e944309996a30850
 AUX gtk+-3.2.1-selector.errors 55 RMD160 e2f54101a3243845dad2fe799e1e17ecedee848f SHA1 73b998497c02bef60bd122d2644eff846fc289d4 SHA256 dfec659411fb82ac9464b07e1675bf428a114f0348836dc1f4a9f98b9a1b5707
+AUX gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch 2093 RMD160 552e6e0df6e683d765f1137a496a964fb07026ac SHA1 4961acb2c33450a237d2b5483113bed2050ee546 SHA256 432fc6be1995142545ffe591b9649ca58b65cf7e5e3bd6826e3186b6eb999d22
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 AUX settings.ini 96 RMD160 ff8d7e28f097820b15ea1d2168d9405db1a5707b SHA1 92c3120655ba14f163846a22d5c94fa50b0eb437 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
@@ -40,13 +41,24 @@ EBUILD gtk+-2.24.8.ebuild 7871 RMD160 0a02f32b8fa40e84b8646e8458e1916b5dbdcdc5 S
 EBUILD gtk+-3.0.12-r1.ebuild 6168 RMD160 0f1671e21ae1d8f5296cef76abc76e8529d5fcf3 SHA1 ce3f023df86242370b1ce92a5dfeaa008e9019ce SHA256 bfb696209c581aff44462759223770dea30cc41a2be608fd96169dc34ec9faab
 EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e
 EBUILD gtk+-3.2.1.ebuild 6248 RMD160 78c1cb16b8ed44fdcf8d9dc30b9d68be006cb230 SHA1 a792484cda6857875f17b163b39aba3908c5507e SHA256 c0389b5bb1f3537f096b6229f72bec022503f0ceda061a5646d1150d75b41a25
+EBUILD gtk+-3.2.2-r1.ebuild 6487 RMD160 a97e95a52550b20f499aa022a495e81950953983 SHA1 f9da3a0e020fca36ec4d3fe1026768c139e78d9c SHA256 830169ea374d0d4b2c1a64f5a45d33bb894557e4842b56ed83cbe0a6975e59c1
 EBUILD gtk+-3.2.2.ebuild 6400 RMD160 b56f4af2dcd010df43ea2d8608d519a31ce7e1ae SHA1 1d71a0979bc6bbd936aca03dcfa1c8988679b5f5 SHA256 813f9a4f6c2bd5d497808bf3ad5f605f36e12bc85e29efa40c7561f45c37cb1f
-MISC ChangeLog 83403 RMD160 5391c7e4194b3be2541e4ac4626de15bd0237e28 SHA1 a8bb34fa2d07baa4256bb0ccf19ef5a134034290 SHA256 3e58ea6807524b0db106bfc6fbfc8e67ac24b3f2399fecedabe78b3e63bb2250
+MISC ChangeLog 83656 RMD160 e4e889c6fec8ee69a88d2b537dd2d4ea4aa53a90 SHA1 0a379bf62f717989bccbc30ae8321690f687d91a SHA256 9fe3407fe9850666a7f33534e68ffacd5faac3d775ea9f4252388059e0409461
 MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7EMQoACgkQdjK8w9WeBnDm5AEAotSeJqCZbO7MhgemjrWC7Y/G
-wAG+1/2y3PXOfRrmwW4BAKx7yyw4PRkUcIvLb0gxbjQ9ADfV6owS8O4Vtk9iBg9r
-=s1lK
+iQIcBAEBAgAGBQJOxErzAAoJEO/kOhxWD91kqqMP/RZ3U73FsIAicq1D7fqwdhdl
+fkFj4r2hJVsG0H6Qk/5JTBsexuSOWJvkKyK3zqRHJywPpyMc27wDjg143MyKR3sz
+Owdcs1dPYjt2s597EmaQicBgYxVWLjq/YGvTlKAltbaRsJ1jSC/zN+fAFQjE5AUY
+oTO7jrS82h6FacNsDDfuitwz7gwtllKayOB9T0c/HQMdRCZVd4Hxye3NpMK9w9Co
+CgijijXHNIvnsq9k96OcJD4vd38JrIMdtBahDZDQm1hS3k4V76J7+8Nd5ZqgqW+b
+CXwCsYgwy0Id6XTYiFyqP4+m6NiS7pH1EUupV6r8VGkTt9hKp3jNc2vjCVUAnt0u
+iJb/F/kRuQN0dKXRfTtjnCDfelaDRRFNob7y0QqLLZ7cyXeN93Ufg1lxQPKnQATL
+EAqYQ67WeFTD8TpLr6qVrjSNhJ83U3EUXvZe0nbacQd2yvlDNV3YqDtdjJY4S4ng
+QG37fM/PeOiRYwcJnGFKocVHb5W7Z+OER3m3psNtgLEnot1Oyf76m745hFMbg+50
+skdHSZ9aIy05ymciQddMPlzyYG1X29u1wRLvLgjB2lmRTfHnURsuWZQz8ZkpwXJ0
+bkld8WMkh6EU4Vi/6hFT0YSYW9umDpaFL7IO7foaMnhHTtsYEuU2SgCScwXh2qE1
+mGu3O0bO2yz9adA46aJ/
+=zJAL
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch b/x11-libs/gtk+/files/gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch
new file mode 100644
index 000000000000..fa9c52eed829
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.2.2-toolbutton-icon-widget-GtkMisc.patch
@@ -0,0 +1,52 @@
+From 5cf0450c69f7bbdb0d1ca22ec54355e3b3e8c9c2 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Tue, 27 Sep 2011 21:06:59 +0000
+Subject: toolbutton: don't force the icon widget to be a GtkMisc
+
+There's really no reason the icon widget must be a GtkMisc. You might
+want to use e.g. a GtkSpinner.
+---
+diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
+index 8ee5fdf..934ca61 100644
+--- a/gtk/gtktoolbutton.c
++++ b/gtk/gtktoolbutton.c
+@@ -972,9 +972,9 @@ gtk_tool_button_new_from_stock (const gchar *stock_id)
+ /**
+  * gtk_tool_button_new:
+  * @label: (allow-none): a string that will be used as label, or %NULL
+- * @icon_widget: (allow-none): a #GtkMisc widget that will be used as icon widget, or %NULL
++ * @icon_widget: (allow-none): a widget that will be used as the button contents, or %NULL
+  *
+- * Creates a new %GtkToolButton using @icon_widget as icon and @label as
++ * Creates a new %GtkToolButton using @icon_widget as contents and @label as
+  * label.
+  *
+  * Return value: A new #GtkToolButton
+@@ -987,7 +987,7 @@ gtk_tool_button_new (GtkWidget	 *icon_widget,
+ {
+   GtkToolButton *button;
+ 
+-  g_return_val_if_fail (icon_widget == NULL || GTK_IS_MISC (icon_widget), NULL);
++  g_return_val_if_fail (icon_widget == NULL || GTK_IS_WIDGET (icon_widget), NULL);
+ 
+   button = g_object_new (GTK_TYPE_TOOL_BUTTON,
+                          "label", label,
+diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
+index 16d847a..aafac3d 100644
+--- a/tests/testtoolbar.c
++++ b/tests/testtoolbar.c
+@@ -680,6 +680,12 @@ main (gint argc, gchar **argv)
+   add_item_to_list (store, item, "Terminal");
+   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+ 
++  image = gtk_spinner_new ();
++  gtk_spinner_start (GTK_SPINNER (image));
++  item = gtk_tool_button_new (image, "Spinner");
++  add_item_to_list (store, item, "Spinner");
++  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
++
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+   gtk_container_add (GTK_CONTAINER (vbox), hbox);
+--
+cgit v0.9.0.2
diff --git a/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..c314f0fcf048
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild,v 1.1 2011/11/16 23:44:46 nirbheek Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
+COMMON_DEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.10.0[X,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.29.14
+	>=x11-libs/pango-1.29.0[introspection?]
+	>=dev-libs/atk-2.1.5[introspection?]
+	>=x11-libs/gtk+-2.24:2
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
+	packagekit? ( app-admin/packagekit-base )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# Fix invalid aborts, taken from git, will probably go into next release
+	epatch "${FILESDIR}/${P}-toolbutton-icon-widget-GtkMisc.patch"
+
+	# Non-working test in gentoo's env
+	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+		-i gtk/tests/testing.c || die "sed 1 failed"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+	# Failing treeview scrolling tests; bug #384855,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		strip_builddir SRC_SUBDIRS tests Makefile.in
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am
+		strip_builddir SRC_SUBDIRS demos Makefile.in
+	fi
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable packagekit)
+		$(use_enable cups cups auto)
+		$(use_enable colord)
+		$(use_enable introspection)
+		--disable-papi
+		--enable-gtk2-dependency"
+
+	# XXX: Maybe with multi-backend we should enable x11 all the time?
+	if use aqua; then
+		myconf="${myconf} --enable-quartz-backend --disable-xinput"
+	else
+		myconf="${myconf} --enable-x11-backend --enable-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# Remove unneeded *.la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
+		|| ewarn "Failed to run gtk-query-immodules-3.0"
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update --uninstall
+}