packages: WindowMaker/WindowMaker.spec, WindowMaker/WindowMaker-libpng14.pa...

[baggins]

Author: baggins                      Date: Sat Feb  6 01:50:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 12
- fix for libpng-1.4.x

---- Files affected:
packages/WindowMaker:
   WindowMaker.spec (1.189 -> 1.190) , WindowMaker-libpng14.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/WindowMaker/WindowMaker.spec
diff -u packages/WindowMaker/WindowMaker.spec:1.189 packages/WindowMaker/WindowMaker.spec:1.190
--- packages/WindowMaker/WindowMaker.spec:1.189	Fri Jan 29 21:47:36 2010
+++ packages/WindowMaker/WindowMaker.spec	Sat Feb  6 02:50:34 2010
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	WindowMaker - віконний менеджер для X11
 Name:		WindowMaker
 Version:	0.92.0
-Release:	11
+Release:	12
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -35,13 +35,14 @@
 Patch11:	%{name}-0.91.0-translucency-1.patch
 Patch12:	%{name}-gnustep.patch
 Patch13:	%{name}-wine.patch
+Patch14:	%{name}-libpng14.patch
 URL:		http://www.windowmaker.info/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	libjpeg-devel >= 6b
-BuildRequires:	libpng-devel >= 1.0.8
+BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	perl-base
@@ -233,6 +234,7 @@
 %patch11 -p1
 %patch12 -p0
 %patch13 -p1
+%patch14 -p1
 
 for f in WindowMaker/*menu*; do
 	sed -i s,/GNUstep/Apps,/GNUstep/Applications, $f
@@ -240,7 +242,6 @@
 	sed -i s,/usr/local/GNUstep/,%{_libdir}/GNUstep/, $f
 done
 
-
 mv -f po/{no,nb}.po
 
 %build
@@ -400,6 +401,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.190  2010/02/06 01:50:34  baggins
+- rel 12
+- fix for libpng-1.4.x
+
 Revision 1.189  2010/01/29 20:47:36  arekm
 - release 11
 

================================================================
Index: packages/WindowMaker/WindowMaker-libpng14.patch
diff -u /dev/null packages/WindowMaker/WindowMaker-libpng14.patch:1.1
--- /dev/null	Sat Feb  6 02:50:39 2010
+++ packages/WindowMaker/WindowMaker-libpng14.patch	Sat Feb  6 02:50:34 2010
@@ -0,0 +1,11 @@
+--- WindowMaker-0.92.0/wrlib/load.c~	2004-10-12 20:21:31.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/load.c	2010-02-06 02:46:45.676390539 +0100
+@@ -348,7 +348,7 @@
+ 
+ #ifdef USE_PNG
+     /* check for PNG */
+-    if (png_check_sig(buffer, 8))
++    if (png_sig_cmp(buffer, 0, 8))
+         return IM_PNG;
+ #endif
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/WindowMaker/WindowMaker.spec?r1=1.189&r2=1.190&f=u