Fix building with libpng14.

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

4 files changed, 110 insertions, 16 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 792c97c18aa3..7cb0c59fdc53 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.53 2010/01/23 09:35:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.54 2010/03/11 13:19:42 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pilot-link-0.12.3-r2.ebuild, +files/pilot-link-0.12.3-libpng14.patch:
+  Fix building with libpng14.
 
   23 Jan 2010; Jonathan Callen <abcd@gentoo.org>
   pilot-link-0.12.3-r2.ebuild:
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 52e6dd4c3bb4..3129ed9177cf 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pilot-link-0.11.8-gcc43.patch 315 RMD160 10883a1fc53afeeef25a98bd8a432f22c698eb94 SHA1 e61d5305141eea75cc8664a18a1f1daa615be7f9 SHA256 8672a1ddc8ef21d3b359d0148bbb3796929329f3dccfb33877313aa629ce08c1
 AUX pilot-link-0.11.8-java_compile_amd64.patch 579 RMD160 7dba17a59a303154acbd640e78f9028b54de0507 SHA1 6903a1624d566733c7336735b3ddbc92c8610e6f SHA256 e2e6ce08665b39c4f945eae58c2554ad9f2bdbf13c8f19cc3cbf01f8f319bf07
 AUX pilot-link-0.11.8-java_fPIC_fix.patch 580 RMD160 e6baf868f3474ee35f9de7f655c337d881e025e5 SHA1 85884951133dc58baccb3a9c0bb3e33f12b5ea73 SHA256 b6ebf250b977fa0dc33ed7c72bf9f0624a36b388cd0078159ff6c88f62c7df45
@@ -22,6 +19,7 @@ AUX pilot-link-0.12.3-distutils.patch 448 RMD160 aa89793bdea302d80ea8602bd8e60c5
 AUX pilot-link-0.12.3-glibc-open.patch 603 RMD160 dfbff4fe19f702f88f66e10be0c75dfbb16ad3f4 SHA1 aa7b1282f6497a1016c99420a3f6b0a035087da4 SHA256 f413b77319dde9e8a75d705317b3f0f656c5c0dc0f5c2439c066028960b095c4
 AUX pilot-link-0.12.3-int_types.patch 547 RMD160 28381f51c8d200fc65bcc9382cf06e7b1277991c SHA1 85385f31dab548e5d4549f0ee7983bdf3bc75f50 SHA256 903efdb98552f44ac0006f58b11631111b8634e1084d3122f15131af8b4c09bf
 AUX pilot-link-0.12.3-java-install.patch 823 RMD160 e6999723dd9a71f95f56d704ba6a1f4f1de2e77c SHA1 4bb887091f18c44b3b344d309d673ef56f4096dd SHA256 60f6c9cd3a03adcef22e598f6d497f3095c1e702ac1d4fcac91e84affbc2fe8f
+AUX pilot-link-0.12.3-libpng14.patch 2316 RMD160 2616da76adf2b2a5132b7ce898ad72825efd9fa8 SHA1 da6cc70e99b9cff1d021bb5d299c677d71a63ee0 SHA256 8a92aeb401c32c3e7c6eb4cd96c735bddc7ae38e2f06280f3b62e0405b133d1a
 AUX pilot-link-0.12.3-libusb-compat-usb_open.patch 715 RMD160 7932c65dfa046d9ebc10f08f8b87c04d55bb2685 SHA1 b0fce59c2b2c7f7eab6855854562aec554680780 SHA256 e60ce64f1501692b3397b7f1e83a8b6f2927fc68e8f74d52f2cc726003f879c5
 AUX pilot-link-0.12.3-png.patch 2166 RMD160 77fbe6b8923b37c7427d396e6b70a5fab702a1ea SHA1 05656782504d716f8bae485ef2dae3ad09f1ab15 SHA256 8f4781f1c88f374b03de28a2952eacdc0efd2d3f8d244b93b1c13cdf7293da42
 AUX pilot-link-0.12.3-respect-javacflags.patch 589 RMD160 7d6f01c53d4741ac914cc1faf99d91e69c49d1ac SHA1 33f91b8333e9525ca67eb6e95ba91f64528affc6 SHA256 6b21cbbb2bde72ca176b0c97531a67fdecb200d7fd35d9eb5c7a67eb731f2386
@@ -30,14 +28,7 @@ DIST pilot-link-0.12.3.tar.bz2 960812 RMD160 938f367a38572d456b37e62ab0d309139b5
 EBUILD pilot-link-0.11.8-r1.ebuild 2352 RMD160 6cf5e7c22d9170a9a73c3cdbeb44bea821f77e1e SHA1 822b82a957cba0502db6c5b128ee61cb718e0059 SHA256 4421ac75d75d013f726c5d3e84e202cf129c1e59204ccd50fc3b45ae5f0f0acc
 EBUILD pilot-link-0.11.8.ebuild 1915 RMD160 675605c1533dbae7fa0717374f03e7660d3c8cd5 SHA1 013e6c03cf25bcdc2dd6411d251a414746219a8d SHA256 94c8849b2a388f1726c10834bfcbf62f160eaed29c044437884ac54a5f3b7638
 EBUILD pilot-link-0.12.3-r1.ebuild 3550 RMD160 eb47d2a6cf6a2b2027a3ac39f9dbcb2f823ca78e SHA1 23550810db07c8008ddec4f70340c95059c3d1c9 SHA256 ad258a75d07e55091ec079566dcf55c4c61b3976b9c0d09923269651eade74f0
-EBUILD pilot-link-0.12.3-r2.ebuild 3681 RMD160 8b998320def648218f964a76a79b1dc5c292b7fb SHA1 ce6720954d1e996d79098f06c8d72da755cd2ba7 SHA256 c5a190f1bf2fbaf3372a4c9eaf3d13e11b06aadb592ae2cd172218aa85eed25b
+EBUILD pilot-link-0.12.3-r2.ebuild 3721 RMD160 2ca914f3e617edad57dc29b3a35dca79906c378b SHA1 a01f8d2aad5d726d800e4fb8041ad39d40bf1b09 SHA256 641699bde611e664c2d02e9b205fb1bd2a7937e39ffcd3509d671ebf339ce54e
 EBUILD pilot-link-0.12.3.ebuild 3488 RMD160 749c9a8c89fed3b86d675a271f2bc7e2371c491b SHA1 18d568c46ee9c5f13752d88fedbf0fe6debe95c6 SHA256 868b94f2a225b328916df04ebb8cd2fc5dfb0c95e5fa45f1e18a5114477435df
-MISC ChangeLog 12265 RMD160 6bf2480600aaa0df96128c230722fe6055489dd3 SHA1 6e14a26aef0f912d20931ed7539e8d598db5033e SHA256 33bc7d32ff9c2f488a8ac1c77096cc49f3499945dfc4bad5df9392e306dfcb7f
+MISC ChangeLog 12427 RMD160 e55971731657bc8e1091b20e551119f58804226a SHA1 ddb842f6c8c977c58e21dd89fb8a2fb4f1e970ce SHA256 df19b1ed6e81806e792f273843c55e3a2a936b3c2e4f38d044341cfca9725f41
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktawt8ACgkQOypDUo0oQOo8cACgtMyCmXzgsuCVzTjfEI1yVrb2
-aR4AoJDw+zYmp/aoghblkIrvNMhPufZo
-=SoVO
------END PGP SIGNATURE-----
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch
new file mode 100644
index 000000000000..14b8c16ac3b1
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch
@@ -0,0 +1,98 @@
+http://repos.archlinux.org/wsvn/packages/pilot-link/trunk/pilot-link-png14.patch
+
+--- src/pilot-read-notepad.c
++++ src/pilot-read-notepad.c
+@@ -39,10 +39,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -166,8 +162,8 @@
+    width = n->body.width + 8;
+ 
+    png_ptr = png_create_write_struct
+-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-       png_error_ptr_NULL, png_error_ptr_NULL);
++     ( PNG_LIBPNG_VER_STRING, NULL,
++       NULL, NULL);
+ 
+    if(!png_ptr)
+      return;
+--- src/pilot-read-palmpix.c
++++ src/pilot-read-palmpix.c
+@@ -42,10 +42,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -223,8 +219,8 @@
+ 	png_infop info_ptr;
+ 
+ 	png_ptr = png_create_write_struct
+-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		( PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if(!png_ptr)
+ 		return;
+--- src/pilot-read-screenshot.c
++++ src/pilot-read-screenshot.c
+@@ -40,10 +40,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -87,8 +83,8 @@
+ 		gray_buf = malloc( state->w );
+ 
+ 	png_ptr = png_create_write_struct
+-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		(PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if (!png_ptr)
+ 		return;
+--- src/pilot-read-veo.c
++++ src/pilot-read-veo.c
+@@ -41,10 +41,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -856,8 +852,8 @@
+    png_infop info_ptr;
+ 
+    png_ptr = png_create_write_struct
+-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-	  png_error_ptr_NULL, png_error_ptr_NULL);
++	 (PNG_LIBPNG_VER_STRING, NULL,
++	  NULL, NULL);
+ 
+    if (!png_ptr)
+ 	 return;
diff --git a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
index aafbe620bd2e..4d1848267abb 100644
--- a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.3-r2.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/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild,v 1.6 2010/01/23 09:35:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild,v 1.7 2010/03/11 13:19:42 ssuominen Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ BOTH_DEPEND="virtual/libiconv
 	>=dev-libs/popt-1.10.7
 	perl? ( >=dev-lang/perl-5.8.8-r2 )
 	python? ( >=dev-lang/python-2.4.4-r4 )
-	png? ( >=media-libs/libpng-1.2.18-r1 )
+	png? ( >=media-libs/libpng-1.2.40 )
 	readline? ( >=sys-libs/readline-5.2_p4 )
 	usb? ( virtual/libusb:0 )
 	bluetooth? ( || ( >=net-wireless/bluez-libs-3.10 net-wireless/bluez ) )"
@@ -36,7 +36,8 @@ src_prepare() {
 	# Fixing some broken configure switches and automagic deps.
 	epatch "${FILESDIR}/${PN}-0.12.2-readline.patch"
 	epatch "${FILESDIR}/${PN}-0.12.2-threads.patch"
-	epatch "${FILESDIR}/${P}-png.patch"
+	epatch "${FILESDIR}"/${P}-png.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 
 	# Upstream's check for Werror was wrong. Fixes bug 194921.
 	epatch "${FILESDIR}/${PN}-0.12.2-werror_194921.patch"