Added patch, new revision

4 files changed, 92 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 34b335d92eb4..a9044295e88a 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.29 2002/11/05 03:49:39 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.30 2002/11/05 23:43:05 foser Exp $
+
+*gtk+-2.0.7-r1 (05 Nov 2002)
+
+  05 Nov 2002; foser <foser@gentoo.org> gtk+-2.0.7-r1 :
+  Added a patch to fix problems with gdk-pixbuf (bug #10261)
 
 *gtk+-2.0.7 (04 Nov 2002)
 
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1
new file mode 100644
index 000000000000..24041ff7750e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1
@@ -0,0 +1 @@
+MD5 c9f641a22400660555094506f298e9b8 gtk+-2.0.7.tar.bz2 6319904
diff --git a/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch b/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch
new file mode 100644
index 000000000000..6b3fe0afd2e9
--- /dev/null
+++ b/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch
@@ -0,0 +1,11 @@
+--- gtk+-2.0.7/gdk-pixbuf/io-gif.c.old	2002-11-06 00:11:44.000000000 +0100
++++ gtk+-2.0.7/gdk-pixbuf/io-gif.c	2002-11-06 00:12:25.000000000 +0100
+@@ -534,7 +534,7 @@
+ 	return 0;
+ }
+ 
+-#define CHECK_LZW_SP() if(((guchar *)context->lzw_sp) >= (((guchar *)context->lzw_stack) + sizeof(context->lzw_stack))) { \
++#define CHECK_LZWP_SP() if(((guchar *)context->lzw_sp) >= (((guchar *)context->lzw_stack) + sizeof(context->lzw_stack))) { \
+         g_set_error (context->error,                  \
+                      GDK_PIXBUF_ERROR,                \
+                      GDK_PIXBUF_ERROR_CORRUPT_IMAGE,  \
diff --git a/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..4ea1c9bb2e16
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild,v 1.1 2002/11/05 23:43:05 foser Exp $
+
+IUSE="tiff doc jpeg"
+
+inherit libtool flag-o-matic
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Gimp ToolKit + "
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
+HOMEPAGE="http://www.gtk.org/"
+LICENSE="LGPL-2.1"
+
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.0.7
+	>=dev-libs/atk-1.0.3-r1
+	>=x11-libs/pango-1.0.4-r1
+	>=media-libs/libpng-1.2.1
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	directfb? ( >=dev-libs/DirectFB-0.9.13 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	 doc? ( >=dev-util/gtk-doc-0.9 )"
+
+src_unpack() {
+	unpack ${A}
+	# fix a typo in gdk-pixbuf source
+	patch -d ${S} -p1 < ${FILESDIR}/gentoo-${P}-gdk-pixbuf.patch
+}
+
+src_compile() {
+	# see bug 8762
+	replace-flags "-O3" "-O2"
+
+	elibtoolize
+	
+	local myconf=""
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --disable-gtk-doc"
+	use jpeg ||  myconf="${myconf} --without-libjpeg"
+	use tiff ||  myconf="${myconf} --without-libtiff"
+	if [ -n "$DEBUG" ]; then
+		myconf="${myconf}  --enable-debug"
+	fi
+		
+	econf --with-gdktarget=x11 ${myconf} || die
+
+# gtk+ isn't multithread friendly due to some obscure code generation bug
+	make || die
+}
+
+src_install() {
+	dodir /etc/gtk-2.0
+	make DESTDIR=${D} \
+		prefix=/usr \
+		sysconfdir=/etc \
+		infodir=/usr/share/info \
+		mandir=/usr/share/man \
+		install || die
+	dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO
+}
+
+
+pkg_postinst() {
+	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
+}
+