Fix building with libpng14.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 4 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 2adba5632a82..328dace4bfac 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.149 2010/02/09 18:15:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.150 2010/03/11 15:59:52 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  fltk-2.0_pre6970.ebuild, +files/fltk-2.0_pre6970-libpng14.patch:
+  Fix building with libpng14.
 
 *fltk-2.0_pre6970 (09 Feb 2010)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index e9606477e613..a84149634070 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,6 +9,7 @@ AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca3
 AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147 SHA1 d470b0a87839d6cde6ee5f0034a4cfdb6bb87d73 SHA256 366dd980d8d0bcfd0e5b1010316caf9103437976a8a10a0dd7b12943782dc082
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7
+AUX fltk-2.0_pre6970-libpng14.patch 339 RMD160 a6fe78f6518b31fd93410df1859832681945e7a3 SHA1 7dc0edee28c336e6ee6ddf4a6a4a45c086e39912 SHA256 ff4b1a7da84cbf1dc3a974a2461a5e1c02965a61b13e6b2a34904f731854a4a6
 AUX fltk2-asneeded.patch 1902 RMD160 750e9ca9a57237f2c693d29422352778abf6135f SHA1 d7273b03085d69b35ae332cf2e2e215480ec4ad7 SHA256 aa532cba342f7315efd08578431acab746bb3a499eada984b35a44fe6b30580f
 AUX fltk2-fluid2.patch 948 RMD160 943d7843f7258ed9e26ca9ce281c226f75a30580 SHA1 44f94f7c823749f33feb11d8b93b85ee5ec33a3d SHA256 a5c5d7f2b24bb19ee5d4d03ccead551da4b668e35a21f9761983085ae0faa2c1
 AUX fltk2-gcc43.patch 726 RMD160 65670e4e9e8e05572a002319d6ecef1d046d416c SHA1 dc5a50b48cd2316a533adc14b621d56624fdef8d SHA256 4f975ac172ae0cfd4e2fc1d3edbacac7ad9eedfb3c1825fd390ec03444add6fa
@@ -30,6 +31,6 @@ EBUILD fltk-1.1.9.ebuild 3523 RMD160 828c6ef5cef73549e9c6b25ff12958d2f96e4f2c SH
 EBUILD fltk-2.0_pre6786-r1.ebuild 2450 RMD160 c75cd879f6c2ffe9afb1be44cce3091954bfecb7 SHA1 7b41522acb9718ddea49beecec32255b8c7a23d1 SHA256 7f9fdc758d13f5da5159d50bc2861485e348478e441a49addec67f6a4986baa6
 EBUILD fltk-2.0_pre6786-r2.ebuild 2511 RMD160 3812fc8227172e1cbd825abf905d40ce54826a46 SHA1 8a6235ab73d5c8be8561624ac7ec1ac953f85305 SHA256 71ab61a96646438dbee57b39732d2ce2d6970d8a1277816656c08acddb223523
 EBUILD fltk-2.0_pre6786.ebuild 2365 RMD160 5059444d13b972e3b4b6ab16eba0216f5149a32b SHA1 b76e516c4fe58eb8cd252fee880f26fb99e53827 SHA256 b460a491ca0d123b4b627f76f827f62a06e2667d5ffb5bbef159a4294821ea6e
-EBUILD fltk-2.0_pre6970.ebuild 2442 RMD160 3d652a7d3ddde6b509f72a4a472eb83ef2aaf053 SHA1 3afa48c8512cdc2532706b36f015c63be870738b SHA256 149c9aeddb8b02d3e4b73538cd72949cb14de838696aaa2914200ef144531183
-MISC ChangeLog 20288 RMD160 f55cffd1207fb92cc8efb7216dfbb1b272247b75 SHA1 e248309b87e49b5bc13f20149f92d4d93e2d3d55 SHA256 8ebffe4e3640033291b3f02291cc2d2a850fc2c0cb9d85f300f4be25e829b66f
+EBUILD fltk-2.0_pre6970.ebuild 2490 RMD160 772d819f2c36538e1e6bb9c99f83b338d85d994e SHA1 83b8d2ce8a86a03c46d51940f5177dd0521c9eff SHA256 ccf87cc7faea0e6516187108d30930de6346ac6834a51e0945a369988c98a850
+MISC ChangeLog 20446 RMD160 4e839a6a444a665639859336b009a06f0c76cbcd SHA1 2e2566ccda6da7fa0d4f596795bba885c1aadb67 SHA256 06ff3ddc2536a956ddbec48edfdfb2add46c1ff4af581aed1b5e4a02c9f3ca07
 MISC metadata.xml 730 RMD160 b71c483e2f90c8328a31e814ef7bf1cb62a75611 SHA1 4e5669b499c22fb4059161a0e8dd62735d460f06 SHA256 5695a1eced035e0f5c8d4160c855f68e85ad3b15978b9bf88d2df16a24e79e82
diff --git a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch
new file mode 100644
index 000000000000..bef3f7ae9008
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch
@@ -0,0 +1,13 @@
+http://repos.archlinux.org/wsvn/community/fltk2/trunk/libpng14.patch
+
+--- images/fl_png.cxx
++++ images/fl_png.cxx
+@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas, 
+ #if !HAVE_LIBPNG
+   return 0;
+ #else
+-  return png_check_sig((png_byte*)datas, (int)size)!=0;
++  return png_sig_cmp((png_byte*)datas, 0, (int)size)==0;
+ #endif
+ }
+ 
diff --git a/x11-libs/fltk/fltk-2.0_pre6970.ebuild b/x11-libs/fltk/fltk-2.0_pre6970.ebuild
index 7032d023a0ae..9d7f1bb9cc75 100644
--- a/x11-libs/fltk/fltk-2.0_pre6970.ebuild
+++ b/x11-libs/fltk/fltk-2.0_pre6970.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970.ebuild,v 1.1 2010/02/09 18:15:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970.ebuild,v 1.2 2010/03/11 15:59:52 ssuominen Exp $
 
 EAPI="2"
 inherit multilib autotools flag-o-matic
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/fltk2-gcc43.patch
 	epatch "${FILESDIR}"/fltk2-ldflags.patch  # bug 251233
 	epatch "${FILESDIR}"/fltk2-fluid2.patch  # bug 282472
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 	sed -i "/STRIP/d" fluid/Makefile  # don't pre-strip, bug 246694
 	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
 	eautoreconf