added ppc64 patch

6 files changed, 170 insertions, 24 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index dd220424e37c..0c5a21c1c72d 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.136 2004/12/23 23:17:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.137 2004/12/26 10:03:25 corsair Exp $
+
+*gtk+-2.4.9-r2 (26 Dec 2004)
+
+  26 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  +files/gtk+-2.4.9-ppc64.patch, gtk+-2.4.14.ebuild, +gtk+-2.4.9-r2.ebuild:
+  I've added the patch from bug #64359, which fixes a cursor key problem on
+  ppc64 to 2.4.9-r2 and 2.4.14. I marked 2.4.9-r2 stable on ppc64 and will
+  remove this version when 2.4.14 will be marked stable. Credits go to Yuta
+  SATOH.
 
   24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.13-r1.ebuild:
   Stable on alpha.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index da08e90104ac..730df6d94dac 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6b0eda470635ab231977524c1ed4c09 ChangeLog 20271
-MD5 42a96f5d633c999e3d7cac24c6a85961 gtk+-2.4.13-r1.ebuild 3118
-MD5 5c064391ca5ac3b1ee33658d4347972b gtk+-2.4.14.ebuild 2837
+MD5 85a38123417a0dfa872800562ac18f26 ChangeLog 20664
 MD5 745da6d8feb5c80670d33a3c43400bf5 gtk+-1.2.10-r10.ebuild 1719
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1aa3638017cfffe3060e9102e2fb2865 gtk+-2.4.9-r1.ebuild 3135
 MD5 71531996ce3e654b8c2f1de597b99481 gtk+-1.2.10-r11.ebuild 1789
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 1c32aec676734b9b6846877939a1d374 gtk+-2.4.14.ebuild 2926
+MD5 b85e869ed4c071b73911a92a65c50166 gtk+-2.4.9-r2.ebuild 3177
+MD5 1aa3638017cfffe3060e9102e2fb2865 gtk+-2.4.9-r1.ebuild 3135
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 42a96f5d633c999e3d7cac24c6a85961 gtk+-2.4.13-r1.ebuild 3118
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+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 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
-MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
-MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBy1IPugEuf3OQ0akRAn32AJoCc35ifVQYZ5V1NMKKBLKQos7CXwCdGJVv
-HAjsJeRvhDS5gqIxJTi5PxM=
-=B4Yr
------END PGP SIGNATURE-----
+MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
+MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
+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
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2 b/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2
new file mode 100644
index 000000000000..3ede30e4d7ca
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2
@@ -0,0 +1,2 @@
+MD5 bfe3b960d334e81d8f91c3509f70868d gtk+-2.4.9.tar.bz2 9599004
+MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/gtk+-2.4.9-ppc64.patch b/x11-libs/gtk+/files/gtk+-2.4.9-ppc64.patch
new file mode 100644
index 000000000000..485a571f84fd
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.4.9-ppc64.patch
@@ -0,0 +1,28 @@
+diff -Nur gtk+-2.4.9.orig/gtk/gtkmarshal.c gtk+-2.4.9/gtk/gtkmarshal.c
+--- gtk+-2.4.9.orig/gtk/gtkmarshal.c	2004-12-26 02:20:42.371982784 +0900
++++ gtk+-2.4.9/gtk/gtkmarshal.c	2004-12-26 02:23:34.879984760 +0900
+@@ -35,8 +35,8 @@
+ #define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+ #define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+ #define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
++#define g_marshal_value_peek_enum(v)     (v)->data[0].v_int
++#define g_marshal_value_peek_flags(v)    (v)->data[0].v_uint
+ #define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+ #define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+ #define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+diff -Nur gtk+-2.4.9.orig/gtk/gtkmarshalers.c gtk+-2.4.9/gtk/gtkmarshalers.c
+--- gtk+-2.4.9.orig/gtk/gtkmarshalers.c	2004-12-26 02:20:42.372982632 +0900
++++ gtk+-2.4.9/gtk/gtkmarshalers.c	2004-12-26 02:25:57.154922896 +0900
+@@ -35,8 +35,8 @@
+ #define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+ #define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+ #define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
++#define g_marshal_value_peek_enum(v)     (v)->data[0].v_int
++#define g_marshal_value_peek_flags(v)    (v)->data[0].v_uint
+ #define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+ #define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+ #define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
diff --git a/x11-libs/gtk+/gtk+-2.4.14.ebuild b/x11-libs/gtk+/gtk+-2.4.14.ebuild
index af26ae0312f6..69a9ce052482 100644
--- a/x11-libs/gtk+/gtk+-2.4.14.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.14.ebuild,v 1.1 2004/12/11 04:30:12 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.14.ebuild,v 1.2 2004/12/26 10:03:25 corsair Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -50,6 +50,8 @@ src_unpack() {
 	# 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.4.1-lib64.patch.bz2
+	# patch for ppc64 (#64359)
+	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 
 	autoconf || die
 	automake || die
diff --git a/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild b/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild
new file mode 100644
index 000000000000..5846dd27e9fd
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild,v 1.1 2004/12/26 10:03:25 corsair 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
+	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="ppc64"
+IUSE="doc tiff jpeg"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.0.1
+	>=x11-libs/pango-1.4
+	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 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# security fixes (#64230)
+	epatch ${FILESDIR}/${P}-xpm_ico_secure.patch
+
+	# 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 ${FILESDIR}/${PN}-2.4-smoothscroll.patch
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	use amd64 && epatch ${DISTDIR}/gtk+-2.4.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.4.1-lib64.patch.bz2
+	# patch for ppc64 (#64359)
+	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
+
+	autoconf || die
+	automake || 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
+	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 INSTALL 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
+
+	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)."
+
+}