Fix building with libpng14.

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

diff --git a/media-gfx/xli/ChangeLog b/media-gfx/xli/ChangeLog
index 93d6f018453fcbca22da50f673d4028f3fdb9da3..c4bad57926b7620dc3c570cdae874cd8989ea588 100644 (file)
--- a/media-gfx/xli/ChangeLog
+++ b/media-gfx/xli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xli
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.54 2010/02/21 04:31:18 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.55 2010/03/09 21:15:19 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> xli-1.17.0-r4.ebuild,
+  +files/xli-1.17.0-libpng14.patch:
+  Fix building with libpng14.
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> xli-1.17.0-r4.ebuild:
   Transfer prefix keywords, add fix for systems that declare "zopen" in

diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 9f3b593bf604cb966d621371199048f51d41009e..389dfd4d08b8496d841da03b1597f1cfdcd30d19 100644 (file)
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Xli.ad 123 RMD160 c4770e6a5d941e42956eb934bf3774efcb546cc8 SHA1 312c18bbd45bdec7ec1d95f95aaa1120fe6d2599 SHA256 a26e3c36c81d124a08d143e9ebfabfbd2507ffb9e48f077ea3e837eacd3f3bd9
 AUX xli-1.17.0-fix-scale-zoom.patch 1942 RMD160 59551f074cdc96eda6fc2d44e56e5cdbe62f494e SHA1 bb02a78213bc9c8996dd0906c850b35c3dad499e SHA256 109af5c20d234650b99411fcd94c329cb7162e60e0349e46ee4fc5148bb1a67f
+AUX xli-1.17.0-libpng14.patch 241 RMD160 0865f39235397a7ae87f94f2866fa63121a17b2a SHA1 711a3ea98d5a4f85db0d05229a824b289bcd753c SHA256 03b74b2bc1063a087bdec93f6f9b85eb4b4c7236ddd3bfe7d7742d19df6dc9d9
 AUX xli-security-gentoo.diff 6940 RMD160 fbc25a1d43cba52ba1fe5444d2b74891a0927271 SHA1 d87139cb2f84574ec7722a2513b7ef9a7a530447 SHA256 d2d427f4eb0659786e18fb70aebb312e980e638a0034a24073e21c2e7b58e90a
 DIST xli-2005-02-27.tar.gz 201011 RMD160 fc83fa5173befa73a0eeb56ad323dad148ef1426 SHA1 977d8ece0edd41f3ec606310496cf3231f046d88 SHA256 442dcf5ac75841e648c3bffed795d9301a6a485dc55f7998d0acfc2b8daad2bc
-EBUILD xli-1.17.0-r4.ebuild 1998 RMD160 0f04574bf1f64f6a803c01977e910e276687db07 SHA1 f5e1dde08a33d2e5b211f6e085538579454b236f SHA256 db601b6461000191004d3625473bf4ed7670ecf5720c29b850b663b93b4e821c
-MISC ChangeLog 6336 RMD160 183cc94801fe894ad06a5a0b29a8306e78baba62 SHA1 80241acc56687b35899b54a8263295b32a9934c9 SHA256 d2e1bd6881ee6a3cb8690e4483dcd37c8190a53c99e97aabc55ad10c4185246c
+EBUILD xli-1.17.0-r4.ebuild 2041 RMD160 f4c890156716fd58dc6cc502afacb25537516c0e SHA1 56803c9618a78f99ab8531cec58f938e17b62b29 SHA256 ff63a6b2b01d7f74dd4eade9781838b6a01bfb656dbcc613744d703535b4d8c2
+MISC ChangeLog 6484 RMD160 cbb675ab06155bdc95c9295b71632381b11cbea7 SHA1 785808cbed31fa14bbc1d6904c55ec31c5391424 SHA256 ae6744f913cbfc509ec70f3aefea556b57b63c4e93068963e49ab5f7ce76d07b
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuAtxwACgkQOypDUo0oQOqhegCffK1i+WeXtHFTvhFLBPQdU4GN
-4jAAnirvvh1D5H1+jrUiaYjptthHvOSl
-=uJ10
------END PGP SIGNATURE-----

diff --git a/media-gfx/xli/files/xli-1.17.0-libpng14.patch b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
new file mode 100644 (file)
index 0000000..afb4b24
--- /dev/null
+++ b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
@@ -0,0 +1,14 @@
+http://aur.archlinux.org/packages.php?ID=1676
+http://archwyrm.net/~me/xli-libpng.diff
+
+--- png.c
++++ png.c
+@@ -27,7 +27,7 @@
+       if (ret != 8)
+               return 0;
+ 
+-      ret = png_check_sig(buf, 8);
++      ret = !png_sig_cmp(buf, 0, 8);
+ 
+       return (ret);
+ }

diff --git a/media-gfx/xli/xli-1.17.0-r4.ebuild b/media-gfx/xli/xli-1.17.0-r4.ebuild
index af1d32934b417a44addffb06df68331d5b1d9654..a357ca0487d40201f44d18165c1b830b16b28592 100644 (file)
--- a/media-gfx/xli/xli-1.17.0-r4.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r4.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/media-gfx/xli/xli-1.17.0-r4.ebuild,v 1.12 2010/02/21 04:31:18 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r4.ebuild,v 1.13 2010/03/09 21:15:19 ssuominen Exp $
 
 EAPI=1
 inherit eutils
@@ -52,7 +52,8 @@ src_unpack() {
        EPATCH_OPTS="-F3 -l" epatch "${FILESDIR}"/xli-security-gentoo.diff
 
        # Fix scale per bug 282979
-       epatch "${FILESDIR}"/${P}-fix-scale-zoom.patch
+       epatch "${FILESDIR}"/${P}-fix-scale-zoom.patch \
+               "${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_compile() {