Fix building with libpng15.

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

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 067fcffc9f72294566ce5f607d7d3d332cdd6a0b..a69287c26081823cb639df92fddd6340aa7c693a 100644 (file)
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.150 2011/02/26 22:34:33 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.151 2011/08/05 19:00:34 ssuominen Exp $
+
+  05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> fox-1.6.40.ebuild,
+  +files/fox-1.6.40-libpng15.patch:
+  Fix building with libpng15.
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> fox-1.6.40.ebuild,
   fox-1.7.23.ebuild:

diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 7f0c9bb722db599d6a8d345e50973015ace6c9b5..13f035e15a5126797d45068edf56f039c156fd1d 100644 (file)
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fox-1.6.40-libpng15.patch 937 RMD160 e9ac4aa15650039881211903a97199dd292824a0 SHA1 9fe12d86d658ca03908909a5f9e05ba6788f7a35 SHA256 4cb7f95eb90607417c6ebae01fc680f498543f06be2e3ce60b55f988b07d2ebd
 DIST fox-1.6.40.tar.gz 4353981 RMD160 0f400034af9a307d8adda771504fd53d22d636d7 SHA1 0322287b2ce36809d2f56b9cd9e5fcc46ddba670 SHA256 19bcdb56f3985ef359adc1cf3a392d11cad0d097c646dd73c8ef1349faa1ba6f
 DIST fox-1.7.23.tar.gz 4924875 RMD160 1fe32afc8679f2c4f49658245b29d95b7835428c SHA1 6f73bfffa177ce05d43861d29cee3cdc59659cf2 SHA256 5fad49a8c06c6c8ecc5bda1c559577cad834523adbea0dd4e612fcda730f9652
-EBUILD fox-1.6.40.ebuild 921 RMD160 08b313c4f9ced0dbb05eb60a9913e0cadaa39d27 SHA1 e91652af7e3bf09cc37ca8f451e898c1ed550582 SHA256 b2fe392f124990f01da0f60d12114534814d67b7bebcccd66caa2f0205127e4a
+EBUILD fox-1.6.40.ebuild 1008 RMD160 032968fe7868bff25640d2c061188cc4abb5ca6c SHA1 0b97e2be044b7535cf5007411df4481a326651f4 SHA256 9c943622625314c4e929d797bd8bdeb4a70029acd49c1d71bc8febbd0df11eb4
 EBUILD fox-1.7.23.ebuild 1001 RMD160 74403d4a90024a4e531c82e46c6a3c30017cf752 SHA1 85a0151c3efb021174d7e676642449f485f267e9 SHA256 9d0f2a80d568548921fe1f2a4a302420c3b791bea30e558594c81e70a091271e
-MISC ChangeLog 18349 RMD160 a1e9a2e120856709d67342f80649465fd87e25d7 SHA1 aa6d3a639fa5e348b402a21a68e2521f9c9c9a8a SHA256 774b63277cd34d4ae5a510238b16ecd85e91f3070e204d823143d105c4f3422e
+MISC ChangeLog 18491 RMD160 9afe558f96c6563315cf51382d5106ecb230ecf3 SHA1 8e2f205254a9939ba88ff4e21d08e10f96b87d1d SHA256 c26edd52fa34a566f60823af5368e756832356e7cf861ea61824a067f099a42a
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk48PRgACgkQXkR9YqOcLPFZmgD+NZlA4d5GwznuHkH4+0jF1BOl
+YSssHcaPzGDw7ZR/qSEA/3jIl20vJdNMdn55Hqqd+ryNquKky1awSpdJcazuj4b5
+=vPGr
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/fox/files/fox-1.6.40-libpng15.patch b/x11-libs/fox/files/fox-1.6.40-libpng15.patch
new file mode 100644 (file)
index 0000000..2411226
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.6.40-libpng15.patch
@@ -0,0 +1,32 @@
+--- src/fxpngio.cpp
++++ src/fxpngio.cpp
+@@ -75,7 +75,11 @@
+ static void user_error_fn(png_structp png_ptr,png_const_charp){
+   FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
+   store->setError(FXStreamFormat);                      // Flag this as a format error in FXStream
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp(png_ptr->jmpbuf,1);                           // Bail out
++#else
++  png_longjmp(png_ptr,1);                               // Bail out
++#endif
+   }
+ 
+ 
+@@ -118,7 +122,7 @@
+     }
+ 
+   // Set error handling
+-  if(setjmp(png_ptr->jmpbuf)){
++  if(setjmp(png_jmpbuf(png_ptr))){
+ 
+     // Free all of the memory associated with the png_ptr and info_ptr
+     png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
+@@ -231,7 +235,7 @@
+     }
+ 
+   // Set error handling.
+-  if(setjmp(png_ptr->jmpbuf)){
++  if(setjmp(png_jmpbuf(png_ptr))){
+     png_destroy_write_struct(&png_ptr,&info_ptr);
+     return false;
+     }

diff --git a/x11-libs/fox/fox-1.6.40.ebuild b/x11-libs/fox/fox-1.6.40.ebuild
index a991d7c600d1fc0a88636c62c54e3767346e62b9..9a88e2a2fde58f1e9819c02617128d0df3a38299 100644 (file)
--- a/x11-libs/fox/fox-1.6.40.ebuild
+++ b/x11-libs/fox/fox-1.6.40.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.8 2011/02/26 22:34:32 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.9 2011/08/05 19:00:34 ssuominen Exp $
 
 EAPI="2"
 
-inherit fox
+inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
@@ -33,3 +33,8 @@ FOXCONF="$(use_enable bzip2 bz2lib) \
        $(use_enable tiff) \
        $(use_with truetype xft) \
        $(use_enable zlib)"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-libpng15.patch
+       fox_src_prepare
+}