Fix building with libpng15 wrt #383313 by 383313 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 44 insertions, 19 deletions

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 0ae0740a5ca3..5a1210ca81e5 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xloadimage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.54 2011/08/25 20:51:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.55 2011/09/17 17:09:53 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xloadimage-4.1-r11.ebuild, +files/xloadimage-4.1-libpng15.patch:
+  Fix building with libpng15 wrt #383313 by 383313 by Diego Elio Pettenò
 
   25 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   xloadimage-4.1-r10.ebuild, xloadimage-4.1-r11.ebuild,
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 540bff4f35e9..fa415f071cf3 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX xloadimage-4.1-bracket.patch 518 RMD160 848289d06a5cf1dcd3bab467885c4b30611ecdca SHA1 c298e654ecca9f7e869bef75130a7a4dd3f72ba8 SHA256 cc5289450dceb1794dcf99a230c7011d99fcd45e26dcc276a7de25dbd6f5867e
 AUX xloadimage-4.1-endif.patch 321 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f SHA1 4b3ed8fedb88c9ec9276a6bf2b48f372193f415c SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204
 AUX xloadimage-4.1-include-errno_h.patch 303 RMD160 a6125c8e94db89d348a4e358610bd195db044720 SHA1 94568ec6e2679c236b675754a49559f979e772e7 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a
 AUX xloadimage-4.1-ldflags_and_exit.patch 775 RMD160 d7b44f8658d2e58aedf26c25c4075683ea9ad1b0 SHA1 3f9bf0f027e793454a02fcd8df3cecf5c74e0912 SHA256 f2b80e39246e495a5118f27e815cb8100b9619184580d35696c512a0d81b55fb
+AUX xloadimage-4.1-libpng15.patch 747 RMD160 ff3bc212721c44a6ac4574557e34ed21896718b6 SHA1 daf773fb2cc6b40a962533e721e4407120cee1dc SHA256 c0d30c64354d4261c3218b23498ae41f43215b875688a4c0d1efc3c6c12736fa
 AUX xloadimage-4.1-unaligned-access.patch 1730 RMD160 31d77d46308db7e1a44e391922db385217227281 SHA1 0fd44ef9e54c59884575f589a97c20cec7ec7657 SHA256 35548e5242d32f66e7175c090af4b2df5ee6f20f51d7e7f83a9f430af568f6c9
 AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf7d2451d3d2c94678 SHA1 4ac943a7b4eb78d65577838b910628fa14fb84e6 SHA256 253064f5eebcd6c1c318b9637f1010657927b5f65be59581ef37523a50f3601e
 AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2 SHA1 4fa12fa375187f04f5f71dafe7b02b858273b050 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30
@@ -12,23 +13,13 @@ DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 RMD160 57f09f43e96fea7c103cd283aaea
 DIST xloadimage-4.1-gentoo.diff.bz2 41390 RMD160 63b160b968937d8c580c7876137263bdbaaa575d SHA1 6436b03b74429470b5491870706885dd7fe69f63 SHA256 dae93c4bd2955810252ff4dd5650386c34f82db8a7a1502c653bf965dad1632a
 DIST xloadimage.4.1.tar.gz 596021 RMD160 000271b40f58601cd1057b4e99c31a30da6e10af SHA1 0a8ee9b185702750706f68e4a34e086873f17690 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
 EBUILD xloadimage-4.1-r10.ebuild 2209 RMD160 56151d25964d8151509447a020b7a85ba40e93af SHA1 cf9fa2bb36434f821f7fab9b59d8aeed6bd5a3e8 SHA256 40694b4868236e80dbff89e6d1bc6a3e7dedf265136aae34b632a5f65c65ece6
-EBUILD xloadimage-4.1-r11.ebuild 2305 RMD160 aa304f550decdfcca456f931b42ac3ae3177a99a SHA1 918134d24a2bd389339ee9799d81b70284ef4542 SHA256 896915d7770a455ad763f475c995a0208d0084920e620bfa5a5518a8e23bd066
-MISC ChangeLog 8847 RMD160 9cdbaf1c0fb077494f47cd887dae3201949ad681 SHA1 8493d1842c3946af7ab524ff635da2aa769c26d6 SHA256 3f740ea9c561f5a4c4aca3ac9a3c782466a38f3b342e2d0377a851b7bd834ba2
+EBUILD xloadimage-4.1-r11.ebuild 2347 RMD160 7dfd3640dc0e76714933228ce49fc6626c06d890 SHA1 e60bf03516b398d80ea5045aa3b9cd934603bb22 SHA256 d1c46150e234c21afa67b7e04626ebe09aa6b0c8b6344f600f2b7bde28d96c77
+MISC ChangeLog 9043 RMD160 bcc221b1a682543c0666694f17190930f87e3302 SHA1 79f2ba5d112799c3953d1341dc9c1a8b2df092e5 SHA256 1fe91dd34b385ab9c85160a285669e84d8be304cd18261d4556cc358f33173d0
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOVrXbAAoJENwGBM22xffe0EUP/RxrzJ94RGMukPGg5Lv7iy/V
-/CPUWgnNuVfYqRExW0Md8C7s0vfVjdcZ1dp2usNUuNujLK1CXesy8udursq/Z6Ev
-yGHD5gdFbQZXf4YexAnGE90d6qp3+1tFX4pVLhRq2k+nnx+dj6/jtXK3VnGWOb6A
-jS+WOQwtM+ECQHMl6iyjS82kvzY9oSQsloACoq1NcO18+E2fvy04Cl0ZnpPKm4kD
-+hhEYcxsBs3I+G2kJS6zhA7LqJrV8U8NZ6yGxVnBcsEo/rFRIbHgSL8gd/ZLtW3H
-AiaWyR6slzLo37HPlfgwzIBx7n7r7WU3tSzVkTUuXYa2Z3036ZvHvf2kmsOul5wc
-voo5wpFFOgXCJ6kM+IrIXha6egym1Ze+4Yxbnj0ZWh2+0dnNSLfiJNyb3/92Mi1G
-2VaCPmbfkq2pfAp41sqRzkcy6JGxjQP1qjSQXm/tHS96Q/XSbtHxTNAvtu/OGqb+
-r5ha11YcfHcCJkPuRb0RF1wmWAm8OpAdxF1mmZQKsCHFBzd5OzMetiiaPZ6dA9lN
-6hUK2LximgO8NgeXYNopO1Gwb8O49Y8HU1l4iCPO2QNesWopJ90Sr+WtWLXrjtRV
-bkvARiwRuFK4VyxtMHpPS5Tuz/sRHZ/f8T7/MGhAAOvmX5lQ0ZgyJMiFsFCZ0Spy
-Y9ZeJu8gsa+F3vJpCpvO
-=J8W/
+iF4EAREIAAYFAk501J0ACgkQXkR9YqOcLPGQggD/Qp1QY72LFtwvM2JbiZM4zMbW
+91EOAEkWIqXCmTd8vtIBAIf9d335IoYocT4NjPJJMdrjyoF+dzV7LIdq3/Q+rJcF
+=ZkeE
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
new file mode 100644
index 000000000000..ffd05f62b332
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
@@ -0,0 +1,29 @@
+--- png.c
++++ png.c
+@@ -75,7 +75,7 @@
+ {
+   debug(" #error ");
+   output_warn( png_ptr, str);
+-  longjmp(png_ptr->jmpbuf, 1);	/* return control to outer routine */
++  longjmp(png_jmpbuf(png_ptr), 1);	/* return control to outer routine */
+ }
+ 
+ 
+@@ -164,7 +164,7 @@
+     png_destroy_read_struct(png_pp, info_pp, end_pp);
+     return 0;
+   }
+-  if (setjmp((*png_pp)->jmpbuf)) {
++  if (setjmp(png_jmpbuf(*png_pp))) {
+     /* On error */
+     png_destroy_read_struct(png_pp, info_pp, end_pp);
+     return 0;
+@@ -220,7 +220,7 @@
+     zclose(zinput_file);
+     return 0;
+   }
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* On error */
+     freeImage(image);
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
index 338957a0dccc..3f268c4f52f1 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r11.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/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.3 2011/08/25 20:51:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.4 2011/09/17 17:09:53 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils toolchain-funcs
@@ -46,6 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-unaligned-access.patch
 	epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
 
+	epatch "${FILESDIR}"/${P}-libpng15.patch
 	sed -i \
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
 		png.c || die