Version bump, add missing DEPEND on proper coreutils version (bug #395103 by arnaud), remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 33 insertions, 154 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 45919cdc3671..5c611933c875 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.43 2011/11/13 11:52:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.44 2011/12/31 18:24:32 pacho Exp $
+
+*gdk-pixbuf-2.24.1 (31 Dec 2011)
+
+  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.1.ebuild,
+  -files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch,
+  -files/gdk-pixbuf-2.22.1-fix-libpng15.patch, -gdk-pixbuf-2.22.1-r2.ebuild:
+  Version bump, add missing DEPEND on proper coreutils version (bug #395103 by
+  arnaud), remove old.
 
   13 Nov 2011; Justin Lecher <jlec@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
   gdk-pixbuf-2.24.0-r1.ebuild:
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch
deleted file mode 100644
index 6c5e93348faf..000000000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f8569bb13e2aa1584dde61ca545144750f7a7c98 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 24 Jun 2011 05:09:35 +0000
-Subject: GIF: Don't return a partially initialized pixbuf structure
-
-It was found that gdk-pixbuf GIF image loader gdk_pixbuf__gif_image_load()
-routine did not properly handle certain return values from their subroutines.
-A remote attacker could provide a specially-crafted GIF image, which once
-opened in an application, linked against gdk-pixbuf would lead to gdk-pixbuf
-to return partially initialized pixbuf structure, possibly having huge
-width and height, leading to that particular application termination due
-excessive memory use.
-
-The CVE identifier of CVE-2011-2485 has been assigned to this issue.
----
-diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
-index 0b370ee..8a1fa3e 100644
---- a/gdk-pixbuf/io-gif.c
-+++ b/gdk-pixbuf/io-gif.c
-@@ -1455,6 +1455,7 @@ gdk_pixbuf__gif_image_load (FILE *file, GError **error)
- {
- 	GifContext *context;
- 	GdkPixbuf *pixbuf;
-+        gint retval;
- 
- 	g_return_val_if_fail (file != NULL, NULL);
- 
-@@ -1472,19 +1473,25 @@ gdk_pixbuf__gif_image_load (FILE *file, GError **error)
-         context->error = error;
-         context->stop_after_first_frame = TRUE;
- 
--	if (gif_main_loop (context) == -1 || context->animation->frames == NULL) {
-+        retval = gif_main_loop (context);
-+	if (retval == -1 || context->animation->frames == NULL) {
-                 if (context->error && *(context->error) == NULL)
-                         g_set_error_literal (context->error,
-                                              GDK_PIXBUF_ERROR,
-                                              GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                              _("GIF file was missing some data (perhaps it was truncated somehow?)"));
-         }
-+        else if (retval == -2) {
-+                pixbuf = NULL;
-+                goto out;
-+        }
-         
-         pixbuf = gdk_pixbuf_animation_get_static_image (GDK_PIXBUF_ANIMATION (context->animation));
- 
-         if (pixbuf)
-                 g_object_ref (pixbuf);
- 
-+out:
-         g_object_unref (context->animation);
-         
-         g_free (context->buf);
---
-cgit v0.9
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch
deleted file mode 100644
index 424938e81577..000000000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 24 Jan 2011 10:39:22 +0000
-Subject: Use png_jmpbuf macro
-
-This makes the png loader compatible with libpng 1.5
----
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 79c81fd..76f3304 100644
---- a/gdk-pixbuf/io-png.c
-+++ b/gdk-pixbuf/io-png.c
-@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_save_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf(png_save_ptr), 1);
- }
- 
- static void
-@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 	    	g_free (rows);
- 
- 		if (pixbuf)
-@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                 return NULL;
-         }
-         
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
-         lc->error = error;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
-                 lc->error = NULL;
- 		return FALSE;
- 	} else {
-@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_read_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf(png_read_ptr), 1);
- }
- 
- static void
-@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
- 	       success = FALSE;
- 	       goto cleanup;
-        }
--       if (setjmp (png_ptr->jmpbuf)) {
-+       if (setjmp (png_jmpbuf(png_ptr))) {
- 	       success = FALSE;
- 	       goto cleanup;
-        }
---
-cgit v0.9
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild
index b9454a3a4f3d..066d2c9a15b4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.10 2011/11/13 11:52:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild,v 1.1 2011/12/31 18:24:32 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit gnome.org multilib libtool autotools
 
@@ -11,43 +11,37 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug doc +introspection jpeg jpeg2k svg tiff test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
 
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="
-	>=dev-libs/glib-2.25.15
-	>=media-libs/libpng-1.2.44:0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.27.2:2
+	>=media-libs/libpng-1.4:0
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
 	tiff? ( >=media-libs/tiff-3.9.2:0 )
-	X? ( x11-libs/libX11 )
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3"
-DEPEND="${RDEPEND}
+	X? ( x11-libs/libX11 )"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.9
+	>=sys-apps/coreutils-8.5
 	>=sys-devel/gettext-0.17
 	>=dev-util/gtk-doc-am-1.11
 	doc? (
 		>=dev-util/gtk-doc-1.11
 		~app-text/docbook-xml-dtd-4.1.2 )"
-# Needed as reported in bug #363715
-PDEPEND="svg? ( gnome-base/librsvg )"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3"
 
 src_prepare() {
-	# Only build against libX11 if the user wants to do so
-	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
-	# Fix libpng-1.5 compatibility, bug 354557 — taken from upstream
-	epatch "${FILESDIR}/${P}-fix-libpng15.patch"
-
-	# GIF: Don't return a partially initialized pixbuf structure
-	epatch "${FILESDIR}/${P}-CVE-2011-2485.patch"
-
-	elibtoolize
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
 	eautoreconf
 }
 
@@ -69,11 +63,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS NEWS* README* || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS* README*
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# New library, remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
 }
 
 pkg_postinst() {