Adding upstream patch from bug 80262 as reported by compnerd. Should fix gtk+ apps crashing when focus is called on lable widgets.

(Portage version: 2.0.51-r15)

5 files changed, 154 insertions, 9 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index c767137c8a60..154c020a7424 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.143 2005/01/22 17:47:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.144 2005/02/03 06:54:11 joem Exp $
+
+*gtk+-2.6.1-r2 (03 Feb 2005)
+
+  03 Feb 2005; Joe McCann <joem@gentoo.org>
+  +files/gtk+-2.6.1-gtk_dialog.patch, +gtk+-2.6.1-r2.ebuild:
+  Adding upstream patch from bug 80262 as reported by compnerd. Should fix
+  gtk+ apps crashing when focus is called on lable widgets.
 
   22 Jan 2005; Markus Rothe <corsair@gentoo.org> gtk+-2.6.1-r1.ebuild:
   Added append-flags -mminimal-toc for ppc64 to let it compile
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 61581e446978..54316b8a7446 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,24 +1,26 @@
 MD5 7cb8a5b2c054189dfe480e44e9c38a18 ChangeLog 21449
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 db49b476d800c643e57ce06255a0d3d0 gtk+-1.2.10-r11.ebuild 1792
+MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120
 MD5 c31e800d1404af26a255e2314a8ca8b2 gtk+-2.4.14.ebuild 2920
-MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
 MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120
+MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
 MD5 de74b35fc2ec173149d04a3d3f843521 gtk+-2.6.1-r1.ebuild 3180
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 de74b35fc2ec173149d04a3d3f843521 gtk+-2.6.1-r2.ebuild 3180
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
 MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
+MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
+MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r1 208
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
-MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r1 208
 MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r2 208
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2 b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2
new file mode 100644
index 000000000000..3b2b31081039
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2
@@ -0,0 +1,3 @@
+MD5 146ed9d12c9506fcf8745ddb2c22530a gtk+-2.6.1.tar.bz2 11070668
+MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
+MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch b/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch
new file mode 100644
index 000000000000..e73b27dd57c3
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch
@@ -0,0 +1,19 @@
+diff -Naur gtk+-2.6.1.orig/gtk/gtkdialog.c gtk+-2.6.1/gtk/gtkdialog.c
+--- gtk+-2.6.1.orig/gtk/gtkdialog.c	2005-01-03 18:40:36.000000000 +0100
++++ gtk+-2.6.1/gtk/gtkdialog.c	2005-01-21 10:31:17.072576888 +0100
+@@ -345,10 +345,16 @@
+   if (!window->focus_widget)
+     {
+       GList *children, *tmp_list;
++      GtkWidget *first_focus = NULL;
+       
+       do 
+ 	{
+ 	  g_signal_emit_by_name (window, "move_focus", GTK_DIR_TAB_FORWARD);
++
++	  if (first_focus == NULL)
++	    first_focus = window->focus_widget;
++	  else if (first_focus == window->focus_widget)
++	    break;
+ 	}
+       while (GTK_IS_LABEL (window->focus_widget));
diff --git a/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild b/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild
new file mode 100644
index 000000000000..037d6ce78c48
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild,v 1.1 2005/02/03 06:54:11 joem Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
+	mirror://gentoo/gtk+-2.6-smoothscroll-r2.patch
+	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="doc tiff jpeg static"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.6
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.8
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/autoconf
+	>=sys-devel/automake-1.7.9
+	doc? ( >=dev-util/gtk-doc-1 )
+	!x11-themes/gtk-engines-pixmap"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Turn of --export-symbols-regex for now, since it removes
+	# the wrong symbols
+#	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
+	# beautifying patch for disabled icons
+	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+	# add smoothscroll support for usability reasons
+	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
+	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch
+	# fix empty filechooser combo (http://bugzilla.gnome.org/show_bug.cgi?id=164290)
+	#Fix crash when labled widgets are given focus. Bug 80411 
+	epatch ${FILESDIR}/${P}-gtk_dialog.patch
+	cd ${S}/gtk
+	epatch ${FILESDIR}/${P}-empty_default_combo.patch
+
+	cd ${S}
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	use amd64 && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+	# patch for ppc64 (#64359)
+	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+	use ppc64 && append-flags -mminimal-toc
+
+	autoconf || die
+	automake || die
+
+}
+
+src_compile() {
+
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		`use_enable static` \
+		--with-png \
+		--with-gdktarget=x11 \
+		--with-xinput \
+		|| die
+
+	# gtk+ isn't multithread friendly due to some obscure code generation bug
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die
+
+}
+
+src_install() {
+
+	dodir /etc/gtk-2.0
+	use amd64 && dodir /etc/gtk-2.0/${CHOST}
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
+
+	make DESTDIR=${D} install || die
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+}
+
+pkg_postinst() {
+
+	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
+	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
+
+}