# 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:
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
-AUX gdk-pixbuf-2.22.1-CVE-2011-2485.patch 2230 RMD160 5250b2c5404691d988edd586514566edcba67744 SHA1 5147710cd7d6670c47d6bf785f85de1a6c62ce87 SHA256 10f7e6ef2c4ab8a3dd744ad2711963202b2a7e63fe3baea3d9c3401b84644c47
-AUX gdk-pixbuf-2.22.1-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
-DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
-EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2943 RMD160 088a7e40a84d38191ed7ba87fb9815d9bbbe3e3a SHA1 ea83566b4daca390580d2981abcdb8ddf91d2d0b SHA256 238774cf0aa70e4a76f3f8998a80435440878ce09ac84f11a77879eee789a869
+DIST gdk-pixbuf-2.24.1.tar.xz 1177036 RMD160 e1290bfcb3bdba52c32a74e7843ac14b7d614eeb SHA1 b1719e885598a1dfada2e2187b81705b5f3b11c6 SHA256 da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1
EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2933 RMD160 bc5b5d29d17cc5d421f1561011b4d0f096cbcb76 SHA1 5fd2c942b919d8444d23ee0d7724f066e18d0a3d SHA256 1aa1e57618e90d8cc239327a6148039ebadaa8587f78bbec8a93d10603dbef49
-MISC ChangeLog 6320 RMD160 38be784c654c5657334e1cb61699d30bcead7943 SHA1 508bdc1c3101eaa2e71509268338fffa518e8b36 SHA256 9a955cd65dc6a3c4a4ccc62ed1fb92ef8fede6e14ee4cae1401764c29fb2f3c7
+EBUILD gdk-pixbuf-2.24.1.ebuild 2842 RMD160 1f8c356437832019b6c40685f6e2483260230b32 SHA1 4d96a6a036628148d4f40a2ec18886d8f6939e6c SHA256 29216fd6ca3d4b0777f56b634f580d338715a94b1b486cd868ad1b7d2150e31f
+MISC ChangeLog 6656 RMD160 e2ae23fc259938c69ce889db11e55f589f340427 SHA1 9c228a714d1fbb9931db8016dcb120e075217ef2 SHA256 7102aeb94bc112fbcabc943219b5bdbcf13b0dce998a70f298b0463a4a7a64b9
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAk6/r3sACgkQgAnW8HDreRbs0gCghhtUJ4G+8DCe3uy1KGdgvkqm
-k/QAniK0c+p/pyCLyba2O0abgRcHzOTV
-=wzIU
+iEYEARECAAYFAk7/U2YACgkQCaWpQKGI+9SJTgCbBr7L+9/uYS4SilS4ON9piX6l
+AiMAmwScOtvnBkCdK1qCVugbDlgp1/7v
+=S3t6
-----END PGP SIGNATURE-----
+++ /dev/null
-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
+++ /dev/null
-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
# 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
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
}
}
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() {
projects / gentoo.git / commitdiff