Fix building with libpng14.

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

4 files changed, 55 insertions, 6 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index e25c2754a701..caa87fd65096 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.170 2009/12/31 16:11:54 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.171 2010/03/11 00:03:11 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> fvwm-2.5.28.ebuild,
+  +files/fvwm-2.5.28-libpng14.patch:
+  Fix building with libpng14.
 
   31 Dec 2009; Brent Baude <ranger@gentoo.org> fvwm-2.5.28.ebuild:
   Marking fvwm-2.5.28 ppc64 for bug 290126
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f46c44933cc0..2991b9ece96b 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,10 +1,11 @@
 AUX README.translucency 3723 RMD160 f09c9cb205731ae97781dd8a59a9b1633851ef36 SHA1 d41ac01641797012ec9673d5233421d89914fb91 SHA256 099c57f9f323ba44e03b9edcfc17da7da08b0438dd5be3c6830f283030e75fe6
 AUX fvwm-2.5.27-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
+AUX fvwm-2.5.28-libpng14.patch 1515 RMD160 2df72393e96515f90bb53c125f06e57fbf11e3f4 SHA1 38f529913774b5097ac3673cc96509f0a5aacb94 SHA256 f4e34c3127e8cbdb570b78a28de5aa7a21b63c3b72282bdd3a97b9ff560e1515
 AUX fvwm-menu-directory-security.diff 651 RMD160 4c33671109d1d1f0927bbb755b86691040535bfc SHA1 9b2609a33c85e72c7735de1b3d5fa0fd866819bb SHA256 5ad90a20f6d5f32d718e54347dde66f863971f46a05f6c83c9a294a74cfc24df
 AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
 DIST fvwm-2.5.27.tar.bz2 2524965 RMD160 3b08849931d026619a45583f26528088efc51f6f SHA1 52a3300c5f13468fa61205477a07f0e5d4767a6b SHA256 149fc5a0a170473b6bea79127eb9f2a19c507929500fd6560162d7a12461c855
 DIST fvwm-2.5.28.tar.bz2 2521994 RMD160 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1 SHA1 26b83b88656faa3d21ab55544269954e534abe08 SHA256 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb
 EBUILD fvwm-2.5.27-r1.ebuild 4652 RMD160 024fdbf789b260e7d222658fd5da62116a8b72fa SHA1 c018fe6c08723bf7c68c2af4a17060384c524b11 SHA256 ebb723fc0868b12a0f556e6234869831cf1bcb9119f441c8041fd8265ccb0bd7
-EBUILD fvwm-2.5.28.ebuild 4584 RMD160 f3e6d1d7a9af8702b68d334dc4d6d6fa4d96b939 SHA1 37c42c363dede2b5393c7942726f8e2287f52975 SHA256 782caae775fc22fc96483cb6ec50048d3928f8728a671af2b2634fd0a4c021f4
-MISC ChangeLog 26569 RMD160 a094308aed00b482ee7c6546418af93e093f02fc SHA1 d018da6ea45122220b98ec3bed3575e0910a0d33 SHA256 8151cabc33a53c87c031c377a37d3c96e9e8c7e075117b931436f3bb07a52a74
+EBUILD fvwm-2.5.28.ebuild 4630 RMD160 6cedc9e822d48b6fbeeebf22cd3a07588336539d SHA1 47787546b9333d991800b1a1dfebdeb3d50c2a07 SHA256 804bbae59f12250aba84a8199bdf954c479d3935142b023a35dca44b68ffef0e
+MISC ChangeLog 26714 RMD160 33fe4d338fc08b099906714cef79f8b00fda4a3c SHA1 aa41f88410c7767bb3be152e1fafb26bd8c01f53 SHA256 0bde8c216d64fc378ec1b03ccf2f0fadb9fff80b9fea28fc3df6ec4ea740d688
 MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0
diff --git a/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch b/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch
new file mode 100644
index 000000000000..6fef901faa27
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.28-libpng14.patch
@@ -0,0 +1,42 @@
+http://repos.archlinux.org/wsvn/packages/fvwm-devel/trunk/libpng-1.4.patch
+
+--- libs/PictureImageLoader.c
++++ libs/PictureImageLoader.c
+@@ -417,7 +417,7 @@
+ 		return False;
+ 	}
+ 	fread(buf, 1, FPNG_BYTES_TO_CHECK, f);
+-	if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK))
++	if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK))
+ 	{
+ 		fclose(f);
+ 		return False;
+@@ -503,7 +503,7 @@
+ 		Fpng_set_gray_to_rgb(Fpng_ptr);
+ 		if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8)
+ 		{
+-			Fpng_set_gray_1_2_4_to_8(Fpng_ptr);
++			Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr);
+ 		}
+ 	}
+ 	for (i = 0; i < h; i++)
+--- libs/Fpng.h
++++ libs/Fpng.h
+@@ -429,7 +429,7 @@
+ #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
+ #define FPNG_INFO_tRNS PNG_INFO_tRNS
+ 
+-#define Fpng_check_sig(a,b) png_check_sig(a,b)
++#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c)
+ #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
+ #define Fpng_create_info_struct(a) png_create_info_struct(a)
+ #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
+@@ -444,7 +444,7 @@
+ #define Fpng_set_packing(a) png_set_packing(a)
+ #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
+ #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
+-#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
++#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
+ #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
+ #define Fpng_read_end(a,b) png_read_end(a,b)
+ #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/x11-wm/fvwm/fvwm-2.5.28.ebuild b/x11-wm/fvwm/fvwm-2.5.28.ebuild
index 21cc9f37c3d0..f9ee59a48cbe 100644
--- a/x11-wm/fvwm/fvwm-2.5.28.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.7 2009/12/31 16:11:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.8 2010/03/11 00:03:11 ssuominen Exp $
 
 EAPI=2
 
@@ -67,6 +67,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
 	if ! use vanilla; then
 		# Enables fast translucent menus; patch from fvwm-user mailing list.
 		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"