Fix building with libpng14.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

3 files changed, 52 insertions, 4 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/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"