Fix building with libpng-1.5, bug 354557

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 99 insertions, 4 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index ae01c5ac1dbe..7fedd68cacbc 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2011/03/22 19:47:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.11 2011/04/04 17:42:49 nirbheek Exp $
+
+  04 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gdk-pixbuf-2.22.1.ebuild, +files/gdk-pixbuf-2.22.1-fix-libpng15.patch:
+  Fix building with libpng-1.5, bug 354557
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
   Marking gdk-pixbuf-2.22.1 ppc stable for bug 353436
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 092b925a7d3f..4241ed95f04d 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,7 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
 DIST gdk-pixbuf-2.22.0.tar.bz2 1538400 RMD160 6089a4f48588d8252ff8ea06db7f395d1d3a43f0 SHA1 80c25eaa08b22ebab24b98e88883ff615240d7cf SHA256 b8ff6a308f037af6b501246ad8779a951ca92af975efc2e97c354ea6702667cf
 DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
 EBUILD gdk-pixbuf-2.22.0.ebuild 2427 RMD160 12f041036235d4b620c03f4259b1651a464837c1 SHA1 5e3d46ef6f24da64df56dfd3f22c10f7a6fa4feb SHA256 d8010de3b205c10c2c4617cd049722dfdcb650033f93f543da798ae193a6769f
-EBUILD gdk-pixbuf-2.22.1.ebuild 2417 RMD160 c96c57545fd34ab36166039eeafe0679dedeccff SHA1 a745660fcc1c3a1357a297a90fc03e2d7fd504d3 SHA256 e1503eb2f490e533a4d85bc8395141ceebbcd2c731816f2f8f6ed5e7c9f6c96c
-MISC ChangeLog 1592 RMD160 81ba3074edd11e5131e34495fe9bb436e8db2025 SHA1 101f05975f2eb8110fbba3f823884ee6867fd38b SHA256 26453fe98a1b5f6b9e907b0d273016927c072d741b4b232bd898d1b17fe24e9d
+EBUILD gdk-pixbuf-2.22.1.ebuild 2534 RMD160 9fc41ccb3b28b5ab86c14d072929ae4b7677c06a SHA1 2348d9a538a1f18925e0e7fa12f53ccb5360ffa2 SHA256 5cc538612c68dbf51ad127901a6f22f63ee8e13fa2b105b9e5cfe7b807b461ed
+MISC ChangeLog 1765 RMD160 e15c72962feeee9773788c78e7c9caa7ed7b40e1 SHA1 4ccf426e2930e34f3f301d370e29f58de27f3c3a SHA256 171fd89dae2f814b5f429d8ef25be4b4d88651f6ea1ef345af1f49b0245bed82
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNmgMWAAoJEO/kOhxWD91k2G8P/1vVEjngYiAjBQpzJW0/+hEf
+J0EHWADonR442tqMisF9qEP+d5LgOuVGAvXe3TUNOhkBNDARxl0RlxV3Dv5L06mI
+tTWqrW/PK+Tx/d/4FYh8ag9O+aWnQ5+XJNNfMe6m7Hj+/p/Pq3iASpEFeqM2+wiM
+dTwrp+MhUtc/4G060wJ4BuVf4rG4fDdHXumG2A5dFVHgGeyajbXISCgQvvlsBKpO
+uW/Q9gJNUBozrwAZE8ckkRAUlUT9lcSBaWbwpKh4vSoQ/JkuXE22YYFbLTxhDEM7
+Fdy8leiruXsYAvwN4mudhW1TA3z+zNNqjKnjfW9lsQov3wYqDJudsCPXsSs6TVvu
+VHc9jdbbJjLbOEikFDUqXvNcxfLPmjWfQEz+rPZi8fLSWrpk+sIZTXYMNzoq6u2L
+BcppfKbRTmy5X8JbQEIoJCUXvZmU7++qC/CKLA9++EQYRVSLXojDuyTT7dbGYWDR
+R/ZfT3QI0kP2+3h7hjYFyClCHwLmWJ84BHy+cVE2MRLEDoB31Vtn7AXK0H5frQcm
+t5FJAt/B7oR1tlHGXR8QuHfY2lD4NyrZ99tDuOYwWMfpSmZPmweqeF5x2im7R8Iz
+rpFondic7C/8zp90Y3fUKgisB6Me70qKA0G2P4bhyWgn4bq0+61nveeNVefNAQzp
+qfgMa8VdfnElHw3Dprku
+=TZ3T
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..424938e81577
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.22.1-fix-libpng15.patch
@@ -0,0 +1,67 @@
+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.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
index 62750c2ba89c..f836b876b174 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.7 2011/03/22 19:47:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild,v 1.8 2011/04/04 17:42:49 nirbheek Exp $
 
 EAPI="3"
 
@@ -39,6 +39,9 @@ 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"
+
 	elibtoolize
 	eautoreconf
 }