add bmp fix, mark 2.6.4-r1 x86

Package-Manager: portage-2.0.51.19

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index d48cc3ac85a847a19345dc7ae89d2dffa8f4aea9..48c7177edf6f9246e2b91d6a1d42db7169cdd8af 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.151 2005/03/21 03:42:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.152 2005/03/30 09:58:37 foser Exp $
+
+*gtk+-2.6.4-r1 (30 Mar 2005)
+
+  30 Mar 2005; foser <foser@gentoo.org> gtk+-2.6.4-r1.ebuild :
+  Add bmp corruption header fix (#86979)
+  Change location of epunt_cxx so it has some effect
 
   21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   gtk+-1.2.10-r11.ebuild:

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0740dfa801f88a7cc37dc423b651a5e30f82b0b7..8917f7ba734685733a58260028317a9f5766fe33 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,39 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a8a4aa1eeb5ccb40ecf99cb52ea2d1b ChangeLog 22465
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 d3a898f6dc31b653a5916d374d3bc93a gtk+-1.2.10-r11.ebuild 1827
+MD5 4cb5f6f9bbd2c302c853982ca7592744 gtk+-2.6.4.ebuild 2901
+MD5 29ea0a9a7bec737ce15ef534c631f7b3 gtk+-2.6.4-r1.ebuild 2988
 MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120
 MD5 5594f6f778ece40f7badcdb6d1c7009f gtk+-2.4.14.ebuild 2915
 MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139
-MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 55a0240fe45beae9e83402b8bd3f8cbf gtk+-2.6.1-r2.ebuild 3279
+MD5 9ab02a2ca8291020c128d85185265665 ChangeLog 22648
 MD5 ef2a0dc4245e964cf21ba8b20a3ad067 gtk+-2.6.2.ebuild 3036
-MD5 4cb5f6f9bbd2c302c853982ca7592744 gtk+-2.6.4.ebuild 2901
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
+MD5 b56b88c0586a987cf38f9cf8b4c04688 files/digest-gtk+-2.6.2 208
+MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4 208
 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 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
 MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+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-r2 208
+MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
+MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256
+MD5 a81714da3cedcf01f370878a82f4ba8d files/gtk+-2.6.1-gtk_dialog.patch 627
+MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
+MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
+MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
-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
-MD5 b56b88c0586a987cf38f9cf8b4c04688 files/digest-gtk+-2.6.2 208
-MD5 a81714da3cedcf01f370878a82f4ba8d files/gtk+-2.6.1-gtk_dialog.patch 627
-MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4 208
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPkK+ArHZZzCEUG0RAmWbAJ9Gx/6H8cZybVbmXPdJ78PwDJXxpACgh7ym
-yL9gdVQT3w/+gapF7TbHcXA=
-=YYPt
------END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1 b/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1
new file mode 100644 (file)
index 0000000..2525cd8
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.4-r1
@@ -0,0 +1,3 @@
+MD5 4749fce7b082b784a71a076aa586dc25 gtk+-2.6.4.tar.bz2 11222426
+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.4-bmp_reject_corrupt.patch b/x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch
new file mode 100644 (file)
index 0000000..be3c823
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.6.4-bmp_reject_corrupt.patch
@@ -0,0 +1,45 @@
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
+retrieving revision 1.46
+retrieving revision 1.46.2.2
+diff -u -r1.46 -r1.46.2.2
+--- io-bmp.c   2005/01/04 15:47:02     1.46
++++ io-bmp.c   2005/03/28 04:12:32     1.46.2.2
+@@ -219,7 +219,19 @@
+ static gboolean grow_buffer (struct bmp_progressive_state *State,
+                              GError **error)
+ {
+-  guchar *tmp = g_try_realloc (State->buff, State->BufferSize);
++  guchar *tmp;
++
++  if (State->BufferSize == 0) {
++    g_set_error (error,
++               GDK_PIXBUF_ERROR,
++               GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
++               _("BMP image has bogus header data"));
++    State->read_state = READ_STATE_ERROR;
++    return FALSE;
++  }
++
++  tmp = g_try_realloc (State->buff, State->BufferSize);
++
+   if (!tmp) {
+     g_set_error (error,
+                GDK_PIXBUF_ERROR,
+@@ -228,6 +240,7 @@
+     State->read_state = READ_STATE_ERROR;
+     return FALSE;
+   }
++
+   State->buff = tmp;
+   return TRUE;
+ }
+@@ -1031,7 +1044,7 @@
+                       gint new_y = MIN (context->compr.y, context->Header.height);
+                       (*context->updated_func) (context->pixbuf,
+                                                 0,
+-                                                y,
++                                                context->Header.height - new_y,
+                                                 context->Header.width,
+                                                 new_y - y,
+                                                 context->user_data);

diff --git a/x11-libs/gtk+/gtk+-2.6.4-r1.ebuild b/x11-libs/gtk+/gtk+-2.6.4-r1.ebuild
new file mode 100644 (file)
index 0000000..a7eae21
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.6.4-r1.ebuild
@@ -0,0 +1,113 @@
+# 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.4-r1.ebuild,v 1.1 2005/03/30 09:58:37 foser Exp $
+
+inherit 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}
+       # 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
+
+       cd ${S}/gdk-pixbuf
+       # fix #86979
+       epatch ${FILESDIR}/${P}-bmp_reject_corrupt.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
+
+       epunt_cxx
+
+}
+
+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
+
+}