Fix building with libpng14.

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

4 files changed, 25 insertions, 4 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index c764eaf42a20..ca31516f9168 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.23 2010/02/08 23:50:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.24 2010/03/10 14:13:41 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  freewrl-1.22.6-r1.ebuild, +files/freewrl-1.22.6-libpng14.patch:
+  Fix building with libpng14.
 
 *freewrl-1.22.6-r1 (08 Feb 2010)
 
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 8a8270394671..496830e2b99b 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,6 +1,7 @@
 AUX freewrl-1.16.1-disable-rpm.patch 591 RMD160 8b42f4094feb10fd188ce62cc83bee2df8b57ea8 SHA1 47eaf37377ecc5db0003f4fc7cc95832820b9577 SHA256 4f4bf14807f4166ef3a016db5a1699b38dbf88e4658ddb53b41e42d6134bce66
 AUX freewrl-1.16.1-plugin-install.patch 640 RMD160 2cbc260575798e0e319ebede484856c73f74d053 SHA1 2f367b974a89813f2d2911d70b2d15abc861b018 SHA256 4fc24e67e74c2fc97eedd094e8f10421816c860b67f7b305c6e6c560f6437880
 AUX freewrl-1.16.1-use-java-home.patch 1255 RMD160 ba020dca6f6be2f92b032418e35795c184450d5d SHA1 44a688eddeea77b8bf6031a6da0314a938215f99 SHA256 55c92277470ce0dcddac47758a4ea001c4b7ff9a44bf7dae20d51d0daa4945af
+AUX freewrl-1.22.6-libpng14.patch 438 RMD160 d6a2c42fd1f409957deee6625109e96e7c747262 SHA1 1904e7f5d3240d3d2f1ac780073c86f753f616ba SHA256 00fc60512ee2630c9053ebfa28d2587e0f2ae6e2fefc9b1fe217aa8c3fc32d26
 AUX freewrl-1.22.6-xulrunner192-fixes.patch 5730 RMD160 43a56dcf2fc50b4961c47504447424d22b63c74d SHA1 f8ef8775e190c778fa0dfa1331f603f52304bd41 SHA256 ab2da7f73867858c97e818a7bd2fbf5adb04df0357daf9e48a4baf707584c0d0
 AUX freewrl-makefile 4245 RMD160 45a2cd63f334a28df4404bb69eb368050f4def94 SHA1 f4af9556843e1024db78681090add2c5ba3651f9 SHA256 feb737b64a323ddeae9384d54e1a40b1a9fd371d034607dc266e9ceadd12045a
 DIST freewrl-1.16.1.tar.gz 3333751 RMD160 96643006d28a0aa54222829140fed41446d21a51 SHA1 b9c8b6455a343998dc6dc0a1343d3d58998a3679 SHA256 51baee1a326d78eac33700de3a9df8ace792785a95b5309fcfadc12ee3288625
@@ -14,7 +15,7 @@ EBUILD freewrl-1.18.10.ebuild 1743 RMD160 85d71dd90726f127f75443b8fc291cac5890a7
 EBUILD freewrl-1.18.14.ebuild 1705 RMD160 b6d88f90f0435025b60fe846795473cd531a58e1 SHA1 55d5a15dfc60eec0505cb27e64da589e8ae7efe7 SHA256 6fe5f137f4232decd6ff60ede45dccb58538a7157dff198c1e9e539093db3b5d
 EBUILD freewrl-1.19.1.ebuild 1704 RMD160 01a3a602412e3d7c0a847aae2bf9ee1caafea6ef SHA1 f93b15527fe5af15f8c8a76fe16a3c79e081aa55 SHA256 9d7b6fc20f5f906854c960daf2658be78a3106bbfdd04e7404cf11b6a71207a5
 EBUILD freewrl-1.22.5.ebuild 3979 RMD160 32d641d9e040dd3cd9f1214226b0661409194703 SHA1 b5ba4afb452397ba9a24b7baf5b33000fc24321a SHA256 dc85a122f9902607ba80625efe70251c01c246847ccd6c899d24ccb0dee80503
-EBUILD freewrl-1.22.6-r1.ebuild 4539 RMD160 4c94fe31299867de6c9366586a69d68f3be5f415 SHA1 89d74eb08312a399dae3b97fe85589c21b0e4196 SHA256 2af47890dabae092ddbf02f55fbe70accc5263fb838fa080d619adfaf2572c2e
+EBUILD freewrl-1.22.6-r1.ebuild 4584 RMD160 b761c7deccda1f46802b8fb11a0c574486465ce5 SHA1 68cc86d0709f6d6e4f776ffb486215532ecbc558 SHA256 17e82e25e5c6735de58bdd5f5e55c67d1721210afc7969a1b0117bcb25a4b3f2
 EBUILD freewrl-1.22.6.ebuild 3982 RMD160 e2411f9d44939aefc7862bffe96c51d2578d7a13 SHA1 4001ee7cd55a83199f2ce6f7200c5b35004df3ee SHA256 d2b4650505a61524fbb61a8b8728aa59de96a89bcd84a574a5d9b5fa37ef008f
-MISC ChangeLog 3393 RMD160 cc9955b7daf3f20e32ade364d0f8f2bd9192214d SHA1 5193675f53f3dcc91a984f2cb96ff4b5efc2bee5 SHA256 66332eff395cf112230c4c3c21eae2f758159f5a76273b2dc804615e1392413d
+MISC ChangeLog 3546 RMD160 4f20802e7e65b462be1f09fed6ccc373d3931db5 SHA1 b932f1b981304068b514d9a317b76ba7e7e957e0 SHA256 240afdc0d85c9cc2849e9795eef13e4107acfdfd30a7c85432a65e49c19e9b24
 MISC metadata.xml 503 RMD160 5bbf672ae7eed0972c89f35b88992ca08fc6c12a SHA1 bffee1c6d7993a7c1aaf6398b97a929a2513a42f SHA256 fe5c89809fcea77a155c9304c25a9bb0315adcf74d1c485caa66e67466b9f812
diff --git a/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch b/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch
new file mode 100644
index 000000000000..e8f55cbd4ced
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch
@@ -0,0 +1,14 @@
+http://repos.archlinux.org/wsvn/community/freewrl/trunk/
+http://repos.archlinux.org/wsvn/community/freewrl/trunk/build-fix.patch
+
+--- src/lib/scenegraph/readpng.c
++++ src/lib/scenegraph/readpng.c
+@@ -106,7 +106,7 @@
+      * have used slightly more general png_sig_cmp() function instead */
+ 
+     rv=fread(sig, 1, 8, infile);
+-    if (!png_check_sig(sig, 8))
++    if (!png_sig_cmp(sig, 0, 8))
+         return 1;   /* bad signature */
+ 
+ 
diff --git a/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild
index f15369ec1a6c..6f6dac604100 100644
--- a/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.6-r1.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/freewrl/freewrl-1.22.6-r1.ebuild,v 1.1 2010/02/08 23:50:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild,v 1.2 2010/03/10 14:13:41 ssuominen Exp $
 
 EAPI="2"
 
@@ -54,6 +54,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
 	# A hack to get around expat being grabbed from xulrunner
 	if use xulrunner && has_version ">=net-libs/xulrunner-1.9.2"; then
 		mkdir "${S}/src/lib/include";