experimental fixes that fix crashes in epiphany on amd64

5 files changed, 134 insertions, 9 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 29d8658cab72..56cec30ae085 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.88 2004/03/30 05:22:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.89 2004/04/09 07:05:10 lv Exp $
+
+*gtk+-2.4.0-r1 (09 Apr 2004)
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> gtk+-2.4.0-r1.ebuild,
+  files/gtk+-2.4.0-uimanager-zero-becomes-null.patch:
+  added patch to fix a crash in epiphany that may or may not occur only on
+  amd64. for more information on this bug, please refer to
+  http://bugzilla.gnome.org/show_bug.cgi?id=138997
 
   30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; gtk+-2.2.4-r1.ebuild,
   gtk+-2.4.0.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 03c8bef1c107..73d325d3e4b9 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,14 @@
+MD5 6eea7581ae520d259bb272a1079b614e ChangeLog 14555
+MD5 458e3585f989fdafdfb2437aca36e65b gtk+-1.2.10-r10.ebuild 1735
+MD5 db116695699bc21786a6a1e41c5b45bc gtk+-1.2.10-r11.ebuild 1756
+MD5 a693316a8b90fa23bf56eacf80559a0b gtk+-2.2.4-r1.ebuild 2425
+MD5 e0372e397064eee34fa4a99ec18080fd gtk+-2.4.0.ebuild 2065
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 b8a113aef47838ab4c7c794a590adc91 gtk+-2.4.0-r1.ebuild 2311
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0 64
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
@@ -7,11 +16,5 @@ MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0 64
-MD5 6eea7581ae520d259bb272a1079b614e ChangeLog 14555
-MD5 458e3585f989fdafdfb2437aca36e65b gtk+-1.2.10-r10.ebuild 1735
-MD5 a693316a8b90fa23bf56eacf80559a0b gtk+-2.2.4-r1.ebuild 2425
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 db116695699bc21786a6a1e41c5b45bc gtk+-1.2.10-r11.ebuild 1756
-MD5 e0372e397064eee34fa4a99ec18080fd gtk+-2.4.0.ebuild 2065
+MD5 d53a0b86cfefe71e851e14a48b2251fd files/digest-gtk+-2.4.0-r1 64
+MD5 4b098c6ff71c10394cedabd87521e4c9 files/gtk+-2.4.0-uimanager-zero-becomes-null.patch 656
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1
new file mode 100644
index 000000000000..927736ca506c
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1
@@ -0,0 +1 @@
+MD5 fd16157de447c7f0a86495ad0dc67a1b gtk+-2.4.0.tar.bz2 8476610
diff --git a/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch b/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch
new file mode 100644
index 000000000000..92de10faff12
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch
@@ -0,0 +1,20 @@
+--- gtk/gtkuimanager.c.old	2004-04-09 02:36:33.679152760 -0400
++++ gtk/gtkuimanager.c	2004-04-09 02:45:50.571492256 -0400
+@@ -584,7 +584,7 @@
+ 		    "object_signal::connect_proxy", G_CALLBACK (cb_proxy_connect_proxy), self,
+ 		    "object_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
+ 		    "object_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self,
+-		    "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, 0);
++		    "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, NULL);
+ 
+   /* dirty all nodes, as action bindings may change */
+   dirty_all_nodes (self);
+@@ -619,7 +619,7 @@
+                        "any_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
+                        "any_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self,
+                        "any_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, 
+-                       0);
++                       NULL);
+   g_object_unref (action_group);
+ 
+   /* dirty all nodes, as action bindings may change */
diff --git a/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..d216f4c0680b
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild,v 1.1 2004/04/09 07:05:10 lv Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="-x86 -ppc -sparc -mips -alpha -hppa ~amd64 -ia64"
+IUSE="doc tiff jpeg"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.4
+	>=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
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+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
+
+	# This patch fixes crashes in epiphany that some users on amd64
+	# seem to be experiencing. For more information, please refer to
+	# http://bugzilla.gnome.org/show_bug.cgi?id=138997
+	# This might also be usefull to other archs.
+	# Travis Tilley <lv@gentoo.org> (9 Apr 2004)
+	epatch ${FILESDIR}/gtk+-2.4.0-uimanager-zero-becomes-null.patch
+
+	autoconf || die
+
+}
+
+src_compile() {
+
+	# bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+
+	econf \
+		`use_enable doc gtk-doc` \
+		`use_with jpeg libjpeg` \
+		`use_with tiff libtiff` \
+		--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
+
+	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 INSTALL NEWS* README*
+
+}
+
+pkg_postinst() {
+
+	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
+	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
+
+	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
+	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"
+	einfo "you upgrade from gtk+-2.2 to 2.4 (requires gentoolkit)."
+
+}