Accepting request 52410 from home:coolo:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/52410
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=9

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++)

fvwm2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov  8 12:57:56 UTC 2010 - coolo@novell.com
+
+- remove support for pre-9.1
+
+-------------------------------------------------------------------
+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
 

fvwm2.spec

@@ -26,7 +26,7 @@ Provides:       fvwm fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
 AutoReqProv:    on
 Version:        2.5.26
-Release:        42
+Release:        43
 Summary:        Improved Version of FVWM Window Manager
 Url:            http://www.fvwm.org
 Source0:        fvwm-%{version}.tar.bz2
@@ -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.
@@ -57,21 +58,12 @@ Authors:
 --------
     The fvwm developers <fvwm-workers@fvwm.org>
 
-%if "%(xft-config --prefix)" == "/usr"
 %define _xorg7libs %_lib
 %define _xorg7bin bin
 %define _xorg7libs32 lib
 %define _xorg7libshare share
 %define _xorg7prefix /usr
 %define _xorg7mandir %_mandir
-%else
-%define _xorg7libs X11R6/%_lib
-%define _xorg7bin X11R6/bin
-%define _xorg7libshare X11R6/lib
-%define _xorg7libs32 X11R6/lib
-%define _xorg7prefix /usr/X11R6
-%define _xorg7mandir /usr/X11R6/man
-%endif
 
 %prep
 %setup -q -n fvwm-%{version}
@@ -80,6 +72,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
@@ -112,11 +105,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 #
 # default config
 install -d -m 755 $RPM_BUILD_ROOT/etc/X11/fvwm2
-%if "%(xft-config --prefix)" == "/usr"
 install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc
-%else
-install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc
-%endif
 #
 # some extra utils
 install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
@@ -184,15 +173,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
 %{_xorg7mandir}/man1/*
 %{_datadir}/xsessions/*desktop
-%if "%(xft-config --prefix)" == "/usr/X11R6"
-%dir %{_xorg7prefix}/share/locale/ar
-%dir %{_xorg7prefix}/share/locale/ar/LC_MESSAGES
-%dir %{_xorg7prefix}/share/locale/de
-%dir %{_xorg7prefix}/share/locale/de/LC_MESSAGES
-%dir %{_xorg7prefix}/share/locale/fr
-%dir %{_xorg7prefix}/share/locale/fr/LC_MESSAGES
-%dir %{_xorg7prefix}/share/locale/zh_CN
-%dir %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES
-%endif
 
 %changelog