From 23e36305d4c0fa6a2d4d58c419b4cac492f22305c90f1072ea0aa14f3425301d Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Sun, 4 Apr 2010 17:42:41 +0000
Subject: [PATCH] Accepting request 36896 from
 home:oertel:branches:openSUSE:Factory

Copy from home:oertel:branches:openSUSE:Factory/fvwm2 via accept of submit request 36896 revision 3.
Request was accepted with message:
forward

OBS-URL: https://build.opensuse.org/request/show/36896
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=7
---
 fvwm-2.5.26-libpng.patch | 58 ++++++++++++++++++++++++++++++++++++++++
 fvwm2.changes            |  5 ++++
 fvwm2.spec               |  2 ++
 3 files changed, 65 insertions(+)
 create mode 100644 fvwm-2.5.26-libpng.patch

diff --git a/fvwm-2.5.26-libpng.patch b/fvwm-2.5.26-libpng.patch
new file mode 100644
index 0000000..0659c11
--- /dev/null
+++ b/fvwm-2.5.26-libpng.patch
@@ -0,0 +1,58 @@
+--- 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)
+@@ -462,7 +462,7 @@
+ #define FPNG_FILLER_AFTER 5
+ #define FPNG_INFO_tRNS 7
+ 
+-#define Fpng_check_sig(a,b) 0
++#define Fpng_sig_cmp(a,b,c) 0
+ #define Fpng_create_read_struct(a,b,c,d) NULL
+ #define Fpng_create_info_struct(a) NULL
+ #define Fpng_destroy_read_struct(a,b,c)
+@@ -477,7 +477,7 @@
+ #define Fpng_set_packing(a)
+ #define Fpng_set_gray_to_rgb(a)
+ #define Fpng_get_bit_depth(a,b) 0
+-#define Fpng_set_gray_1_2_4_to_8(a)
++#define Fpng_set_expand_gray_1_2_4_to_8(a)
+ #define Fpng_get_valid(a,b,c) 0
+ #define Fpng_read_end(a,b)
+ #define Fpng_set_interlace_handling(a) 0
+--- 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++)
diff --git a/fvwm2.changes b/fvwm2.changes
index 8263c0c..1e2135b 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr  4 18:55:54 CEST 2010 - ro@suse.de
+
+- fix build with libpng14 (replace long deprecated functions) 
+
 -------------------------------------------------------------------
 Mon Dec 28 18:20:51 CET 2009 - vuntz@opensuse.org
 
diff --git a/fvwm2.spec b/fvwm2.spec
index e25ea8e..483fee9 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -43,6 +43,7 @@ Patch2:         fvwm-%{version}-ia64.patch
 Patch3:         fvwm-%{version}-sv_SE.patch
 Patch4:         fvwm-%{version}-utf_encoding.patch
 Patch5:         fvwm-%{version}-charset_in_title.patch
+Patch6:         fvwm-2.5.26-libpng.patch
 
 %description
 FVWM is a virtual desktop window manager for the X Window System.
@@ -80,6 +81,7 @@ Authors:
 %patch2
 %patch3
 %patch5
+%patch6
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2