Use upstream patch to make feh build against libpng-1.5

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

4 files changed, 57 insertions, 5 deletions

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 6243eeb5cf46..2c6a7db1040f 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.67 2011/02/09 22:28:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.68 2011/03/12 11:41:58 hwoarang Exp $
+
+  12 Mar 2011; Markos Chandras <hwoarang@gentoo.org> feh-1.11.2.ebuild,
+  +files/feh-1.11.2-libpng15.patch:
+  Use upstream patch to make feh build against libpng-1.5
 
 *feh-1.11.2 (09 Feb 2011)
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 85ff12e1954e..0eea02252282 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX feh-1.11.2-libpng15.patch 752 RMD160 e906ff564b954af476d62a14587c2623ab28ca99 SHA1 96355a757b952d4c9c74ed3943f71fb0cf8f461e SHA256 077fa3da75b9c151f4374ca10c859ea1af7c6e008da56a877ce3fff2aad292a8
 DIST feh-1.11.2.tar.bz2 2288822 RMD160 8fd98657925bc560f309b1c0dee5b90a9bec4770 SHA1 599cbf19d24ccd68767b0f8c1e304b63a24efcf0 SHA256 1ec0693bb7b72ccb2143969156712fd141daf55a7a05f1ea0d2111f59e74e0c2
 DIST feh-1.9.tar.bz2 336047 RMD160 2e0bd31a94fd9c549ecfa9fc4141124483d8088b SHA1 643b5ba085ed1b7f37fb6e48293779f9056fca6e SHA256 fc825467264f5fbffa5c8ca40438784e9377d30b0dcdb83e648c1786fb6c0c45
-EBUILD feh-1.11.2.ebuild 1306 RMD160 02446ea7e6ed79a9a1725c918db3def2e923e53c SHA1 da64e6475b55e1bba7e521bf13a3ddb68c70796c SHA256 5db2a80962443478f8cf0c4bc88a1e94375e8cfbe2ff89ddfa976fcca992c791
+EBUILD feh-1.11.2.ebuild 1368 RMD160 b61296eb974a6bdf18ec069c68cde7f86a9a0b7e SHA1 179983323749cb5b0e8183f6789e42cb9139dc68 SHA256 e0f9f3f2acb2614fb09ec9b83598f89b076a4dadc4af95f67ad184c724b85db2
 EBUILD feh-1.9.ebuild 1176 RMD160 f6793d284eff465f1bf73c1afc5f85e96d79ec4e SHA1 2b2bbf6a095fc7843c58fa7dfb5640b53f114a81 SHA256 cfd9e1981773505a99e3490b3f7af3969d677a4a6817c072ebb8ed973ffe8c70
-MISC ChangeLog 7605 RMD160 aaa97cdc4a9624f790d6adb6f9fc7be8abaa4d93 SHA1 917c0b2fed185dc36980a36f74f008200ac84c4d SHA256 39247536bcddbd1e7d75bf016ad806b337e185f8d3853c4d05307eee8a362cfd
+MISC ChangeLog 7772 RMD160 ec5330351ca517d01669661ecce1c603b12b7fe1 SHA1 a5863ea4b4f35558709dab92e8afd79536ab60bc SHA256 80e9964b1dc10a763f214586203d7e9e7292abbc0eaf8f677cd3b2029b2ae1fd
 MISC metadata.xml 357 RMD160 2542e9af556c4b189fa37535a4807466f12efc62 SHA1 d0c0c1eafa248757555046ea2d6ea4e653df0b6a SHA256 91c6ea742ef1f0bf7cf47634ccb91eadcb32624c300f782511121d7420e322bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNe1vKAAoJEPqDWhW0r/LCoYkP/j2Uy6QytQb5/ZFwf0AwRA9r
+XrwxbVMvzqf9K2hJS9VGyVTwLJAORcb4XGu9ZkiAt2rqy+XOJ5XjDEvqZqN92J6c
+yeUL0UDBsCYVIzZE2ckC3vvFdzb+j26ly1oR0WlPvP8bx5mSA6ZCyHv39RgQdc0e
+VBX3DFQZKw0FWsXIlSUAmi3JxL5b92FPXrmTgjVCjqMzcvHnwBKzjPKR6xs5r3IO
+ARRmfCC34vZhzuUL4aRaRPoEi7gDyYP2jaclcDjkmWCkz3Nwwp3HWtaOVIM3CLuf
+tfWLA6nCs4hECisQwNHLKReDceXciJ0PQwIRFDZFrQ2TEXj2JwymqSsQlq6kRbFl
+xLCRm31WdAegpAWlbPi6lR8a9BDnuC/RR/Isj0NV9Ru8PVFBliidcEz/HySST17p
+2l2L4g/Zd+0dcLNEmy8rsmJ11gg/2ddqG9Wizoo1JjakoxkJ4TgM70KdoAi/TlcV
+A78XSFiZZnlt0zq/KEajbsM+Ev7tlxKVbIj42r3mBuzMEXK1agpxWiKMjtGEcO7l
+32EQRpcwyC7J9DoH+X83hOK4VPPyiU8Cby7rYzsXTJUUwqetdURqO3jpfDdyyMHd
+JZBtH26K1jAQrk24lx3LCqlm4L7SWHMo4zGqoh/1AqxH2TpjHBQ04n/XdH8sAQVp
+ozU2o20WylzuR1kOupw8
+=7J/N
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/feh/feh-1.11.2.ebuild b/media-gfx/feh/feh-1.11.2.ebuild
index a27dca5482d0..df4fa1fb9576 100644
--- a/media-gfx/feh/feh-1.11.2.ebuild
+++ b/media-gfx/feh/feh-1.11.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.11.2.ebuild,v 1.1 2011/02/09 22:28:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.11.2.ebuild,v 1.2 2011/03/12 11:41:58 hwoarang Exp $
 
 EAPI=2
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
@@ -39,6 +39,8 @@ src_prepare() {
 	if ! use xinerama; then
 		sed -i -e '/^xinerama/d' config.mk || die
 	fi
+	#bug 354667
+	epatch "${FILESDIR}/${P}-libpng15.patch"
 }
 
 src_compile() {
diff --git a/media-gfx/feh/files/feh-1.11.2-libpng15.patch b/media-gfx/feh/files/feh-1.11.2-libpng15.patch
new file mode 100644
index 000000000000..d04027b72bca
--- /dev/null
+++ b/media-gfx/feh/files/feh-1.11.2-libpng15.patch
@@ -0,0 +1,25 @@
+Fix compilation against libpng-1.5
+https://github.com/derf/feh/commit/bbc68473129227511e1fb1f9876e3cb68bc7fa26#diff-1
+
+diff --git a/src/feh_png.c b/src/feh_png.c
+index cefd4c8..f02aecb 100644
+--- a/src/feh_png.c
++++ b/src/feh_png.c
+@@ -66,7 +66,7 @@ gib_hash *feh_png_read_comments(char *file)
+ 		return hash;
+ 	}
+ 
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 		fclose(fp);
+ 		return hash;
+@@ -124,7 +124,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
+ 		return 0;
+ 	}
+ 
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		fclose(fp);
+ 		png_destroy_write_struct(&png_ptr, &info_ptr);
+ 		png_destroy_info_struct(png_ptr, &info_ptr);