Fix building with libpng14.

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

4 files changed, 24 insertions, 5 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 3417e5f3f56f..314f43b22036 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.84 2010/02/12 13:47:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.85 2010/03/11 16:03:08 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dillo-2.2.ebuild,
+  +files/dillo-2.2-libpng14.patch:
+  Fix building with libpng14.
 
   12 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> dillo-2.1.1.ebuild,
   dillo-2.2.ebuild, dillo-9999.ebuild:
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index b1d840e26e55..ec385bfd05b0 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,5 +1,6 @@
 AUX dillo-0.8.6-gentoo.patch 590 RMD160 46b8d54bffca8368c6b02bcb100c02a34c8fe506 SHA1 39c33ae752d1226ddf1e9e58f1fcfadc2d3acf5d SHA256 d279a3257a1b6ce1070d60b3aab8a235880e01fe98cd907a9ea5b73c76732cca
 AUX dillo-2.0-enable-ssl.patch 221 RMD160 8a0ff040d439b24db575b5ed7d86b6e5d8f51779 SHA1 c2972863ff2154f1e5673bb991ddd757c2454246 SHA256 82eabbd0aa2a003713551d199e847f79e4d0a2ecaa945314cad2e2ffb4c5d1a7
+AUX dillo-2.2-libpng14.patch 574 RMD160 2c5ceaa5e95a81101409b9bc118f501c8071c10f SHA1 2c435deba26efaaafce8235528f5ea1c97063eee SHA256 3161e6abc0a09cf2efe6461cc15d32ed22b2a06262393e62599b43d1207dfa6d
 AUX dillo-ac_subst.patch 517 RMD160 277b3d55d7f99ba612eb2263002e4888d62f5d9d SHA1 60ef12ca8217d0370614967d2e74afec1c9d2131 SHA256 753fc722a2947c46ffc2bda6ef84f90c0cd2f880381c874636ea201cb8f4a49a
 AUX dillo-asneeded.patch 1894 RMD160 892d979625bb338802d038c370422c33d9501edb SHA1 c6ac90247a6f344cee5dde70dbc55ad6e449b458 SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633
 AUX dillo-build-fix.patch 631 RMD160 06930ca452554bd4dcc140eb85a9cc9016c4107b SHA1 2eb478e3b05de223c574de925be9d9f1de71f6df SHA256 a6ae597926744dcb48e670da5ee24daade11631ddbca728bc8b2775af9277571
@@ -8,7 +9,7 @@ AUX dillo2-inbuf.patch 393 RMD160 e1b976f0ceb0693d2e39c0ee1f8a68db3af4f7bb SHA1
 DIST dillo-2.1.1.tar.bz2 612711 RMD160 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6 SHA1 eb252663b9480e53e0376d75b81130404ccf40ce SHA256 8eec025872030fc1419fb93ee41dbdf380a6d1f75f4d51aec5eee9a9a4aa4477
 DIST dillo-2.2.tar.bz2 630259 RMD160 050f5bcd46042764c9bba536e6e5fd97453e1d6f SHA1 06b325a246a639d936dabfc73d005f951d23c151 SHA256 f4352970bda70404faa66d1fc90e1dcd1e3417266bf4e29759674d48804ac2ba
 EBUILD dillo-2.1.1.ebuild 1499 RMD160 943ad68b04c512d565cb8ad96d0054564b919051 SHA1 8cdc4c6995681c70da17da90602732631214c722 SHA256 6ae0f703df92bffd73ea3bb9b9ba4f5602488b3884b879f8d4d974a49e577a9d
-EBUILD dillo-2.2.ebuild 1504 RMD160 6c5128f2c6cbe2e82f01ab11244c54155480052d SHA1 13794f720a6cdd687e75824c4884a20d2cd818d5 SHA256 fcaeb35949acf4d2cd1e508983e0e4f27337ca140591f8bd5c7182f7f172edb2
+EBUILD dillo-2.2.ebuild 1542 RMD160 8149b502a185164da53151eae56cb51c75f3d8fc SHA1 6e2cbc05836731d80a32f1cd75ba53dc75667c58 SHA256 4e78651f62a0d8e123f1114270c0d54ada71c6f8f298d12360d5b19746573836
 EBUILD dillo-9999.ebuild 1491 RMD160 5d16a0219bacc531187eedbf2ea8a77f3e73a910 SHA1 13ed9233c22f94541b02221ff35eddf72ef2087c SHA256 68e991537c60074c2e3a68148a86eb67aa9ddf7663100b27c124ea9f85b98ea6
-MISC ChangeLog 18828 RMD160 91a414af5205ac946b7726fba4216cf6a921d811 SHA1 c89cf43edb641620a29af04ea676998e8979859c SHA256 682e8fa55622fa3f7beae398deab27a80b7cf75d9d188ac178ecf0385f05c6c5
+MISC ChangeLog 18966 RMD160 ee451a948fd948af3b0ffec24ec221c3b760354c SHA1 0c21d43b17f5fa9b8bd38f3fc9146270a7ff51bc SHA256 992179bf904ef08b9152e646c474c2c91b910bc3f9d615baa857c3d771100c5a
 MISC metadata.xml 265 RMD160 d03285bfab732286bde355fe0ec756e0cb88a6dd SHA1 93226e7e58879e1dd0200d6df5f8ad8d0143def1 SHA256 0aa5b2b231654873313aba9afebdb90a273b222741c4787d9386973af3c1d575
diff --git a/www-client/dillo/dillo-2.2.ebuild b/www-client/dillo/dillo-2.2.ebuild
index 698b54b73f03..ba26e2086c00 100644
--- a/www-client/dillo/dillo-2.2.ebuild
+++ b/www-client/dillo/dillo-2.2.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/www-client/dillo/dillo-2.2.ebuild,v 1.2 2010/02/12 13:47:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.3 2010/03/11 16:03:08 ssuominen Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib
@@ -23,7 +23,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/dillo2-inbuf.patch
+	epatch "${FILESDIR}"/dillo2-inbuf.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {
diff --git a/www-client/dillo/files/dillo-2.2-libpng14.patch b/www-client/dillo/files/dillo-2.2-libpng14.patch
new file mode 100644
index 000000000000..f4af67e4b196
--- /dev/null
+++ b/www-client/dillo/files/dillo-2.2-libpng14.patch
@@ -0,0 +1,13 @@
+http://repos.archlinux.org/wsvn/community/dillo/trunk/libpng14.patch
+
+--- src/png.c
++++ src/png.c
+@@ -345,7 +345,7 @@ static void Png_write(DilloPng *png, voi
+             return;            /* need MORE data */
+          }
+          /* check the image signature - DON'T update ipbufstart! */
+-         if (!png_check_sig(png->ipbuf, DATASIZE)) {
++         if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) {
+             /* you lied to me about it being a PNG image */
+             MSG_WARN("\"%s\" is not a PNG file.\n", URL_STR(png->url));
+             png->state = IS_finished;