apply patch to fix #118722 . Attached patch to gnome bug #317961

Package-Manager: portage-2.0.53

7 files changed, 182 insertions, 6 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4e8728a23d17..d32a7426975b 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.210 2006/01/08 12:42:36 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.211 2006/01/13 01:10:14 allanonjl Exp $
+
+*gtk+-2.8.10 (13 Jan 2006)
+
+  13 Jan 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gtk+-gdk-pixbuf-testfix.patch, gtk+-2.8.8.ebuild,
+  gtk+-2.8.9.ebuild, +gtk+-2.8.10.ebuild:
+  apply patch to fix #118722 . Attached patch to gnome bug #317961
 
   08 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> gtk+-2.8.8.ebuild:
   ppc stable, bug #117505
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 156d6900b09c..c1e7990bd2da 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,7 +1,8 @@
-MD5 46631b257b75ecb8941a8625c7737f4d ChangeLog 30097
+MD5 235cb8cac368715c1cec77d6ab54980f ChangeLog 30349
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 f0e0f202bdf17540985215d5384480ed files/digest-gtk+-2.6.10-r1 212
+MD5 0f77874c9c171c26671e8f2ad570a383 files/digest-gtk+-2.8.10 141
 MD5 c2395b72772f29144c0b34c311e68b26 files/digest-gtk+-2.8.8 140
 MD5 08ac67047e9ffc29d4e51f7df2d7dc88 files/digest-gtk+-2.8.9 140
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
@@ -10,10 +11,12 @@ MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 9ea5c063ade44a46b279eab398fc969a files/gtk+-gdk-pixbuf-testfix.patch 578
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 03ae62ac03643ccc0a36779df1bfd6af gtk+-1.2.10-r10.ebuild 1702
 MD5 60b495d6aa1169ba2dc4b20a303b18d7 gtk+-1.2.10-r11.ebuild 1916
 MD5 6017f72966d53602c58c288364dd61a9 gtk+-2.6.10-r1.ebuild 3125
-MD5 908bd763cc61f9f7988a06ac0542cb47 gtk+-2.8.8.ebuild 4037
-MD5 cd7d1847bd56023ddf0521ae04e7bada gtk+-2.8.9.ebuild 4042
+MD5 f0afd1a0ef262a76f38f8651ce34f2cf gtk+-2.8.10.ebuild 4123
+MD5 b4c6b5105cae408fe85b83e78696f317 gtk+-2.8.8.ebuild 4116
+MD5 b1d222ade0fd24eb5aa4b7f22b49fc6d gtk+-2.8.9.ebuild 4122
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.10 b/x11-libs/gtk+/files/digest-gtk+-2.8.10
new file mode 100644
index 000000000000..a13ede4eaf42
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.10
@@ -0,0 +1,2 @@
+MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
+MD5 c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2 11964355
diff --git a/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch b/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
new file mode 100644
index 000000000000..f4371243e000
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
@@ -0,0 +1,9 @@
+--- gtk+-2.8.10/gdk-pixbuf/abicheck.sh	2005-08-07 09:47:25.000000000 -0400
++++ gtk+-2.8.10.new/gdk-pixbuf/abicheck.sh	2006-01-12 18:56:04.000000000 -0500
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+ 
+ cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+-nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
++nm -D .libs/libgdk_pixbuf-2.0.so | grep " [GBDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+ diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/x11-libs/gtk+/gtk+-2.8.10.ebuild b/x11-libs/gtk+/gtk+-2.8.10.ebuild
new file mode 100644
index 000000000000..d5a1f20518ac
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.8.10.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.10.ebuild,v 1.1 2006/01/13 01:10:14 allanonjl Exp $
+
+inherit gnome.org flag-o-matic eutils debug
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gtk+-2-smoothscroll-r6.patch.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc jpeg tiff"
+
+RDEPEND="|| ( (
+			x11-libs/libXrender
+			x11-libs/libX11
+			x11-libs/libXi
+			x11-libs/libXt
+			x11-libs/libXext
+			x11-libs/libXinerama
+			x11-libs/libXcursor
+			x11-libs/libXrandr
+			x11-libs/libXfixes )
+		virtual/x11 )
+
+	>=dev-libs/glib-2.8.5
+	>=x11-libs/pango-1.9
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-0.9.2
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	media-libs/fontconfig
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	sys-devel/autoconf
+	>=sys-devel/automake-1.7.9
+
+	|| ( (
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/inputproto
+			x11-proto/xineramaproto )
+		virtual/x11 )
+
+	doc? (
+		>=dev-util/gtk-doc-1.4
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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-smoothscroll-r6.patch.bz2
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
+
+	# fix tests, see #118722
+	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.patch
+
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	if use x86 && [ "$(get_libdir)" == "lib32" ]; then
+		epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
+	fi
+
+	use ppc64 && append-flags -mminimal-toc
+
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		--with-libpng            \
+		--with-gdktarget=x11     \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf $myconf || die "./configure failed to run"
+
+	emake || die "gtk+ failed to compile"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# 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() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
+		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	einfo "If you experience text corruption issues, turn off RenderAccel"
+	einfo "in your xorg.conf.  NVIDIA is working on this issue. "
+	einfo "See http://bugs.gentoo.org/113123 for more information."
+}
diff --git a/x11-libs/gtk+/gtk+-2.8.8.ebuild b/x11-libs/gtk+/gtk+-2.8.8.ebuild
index ede0ae722ae4..c9cac9996afe 100644
--- a/x11-libs/gtk+/gtk+-2.8.8.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.8.ebuild,v 1.8 2006/01/08 12:42:36 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.8.ebuild,v 1.9 2006/01/13 01:10:14 allanonjl Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -77,6 +77,9 @@ src_unpack() {
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
 	epatch "${DISTDIR}"/${PN}-2-smoothscroll-r6.patch.bz2
 
+	# fix tests, see #118722
+	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.patch
+
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
 	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
diff --git a/x11-libs/gtk+/gtk+-2.8.9.ebuild b/x11-libs/gtk+/gtk+-2.8.9.ebuild
index aee60f459433..694250324b46 100644
--- a/x11-libs/gtk+/gtk+-2.8.9.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.9.ebuild,v 1.2 2006/01/02 23:20:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.9.ebuild,v 1.3 2006/01/13 01:10:14 allanonjl Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -81,6 +81,9 @@ src_unpack() {
 	# dont clash on multilib systems
 	has_multilib_profile && epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
 
+	# fix tests, see #118722
+	epatch "${FILESDIR}"/${PN}-gdk-pixbuf-testfix.patch
+
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
 	if use x86 && [ "$(get_libdir)" == "lib32" ]; then