packages: imlib/imlib.spec, imlib/imlib-libpng.patch (NEW), imlib2/imlib2.s...

[arekm]

Author: arekm                        Date: Mon Feb  8 16:16:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libpng fixes

---- Files affected:
packages/imlib:
   imlib.spec (1.125 -> 1.126) , imlib-libpng.patch (NONE -> 1.1)  (NEW)
packages/imlib2:
   imlib2.spec (1.73 -> 1.74) , imlib2-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/imlib/imlib.spec
diff -u packages/imlib/imlib.spec:1.125 packages/imlib/imlib.spec:1.126
--- packages/imlib/imlib.spec:1.125	Thu Jan 28 18:28:35 2010
+++ packages/imlib/imlib.spec	Mon Feb  8 17:16:15 2010
@@ -7,7 +7,7 @@
 Summary(pt_BR.UTF-8):	Biblioteca de carga e renderização para X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	13
+Release:	14
 Epoch:		1
 License:	LGPL v2
 Group:		X11/Libraries
@@ -24,6 +24,7 @@
 Patch7:		%{name}-16bit_depth_fix.patch
 Patch8:		%{name}-exa_fix.patch
 Patch9:		%{name}-ac.patch
+Patch10:	%{name}-libpng.patch
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	gettext-devel
@@ -152,6 +153,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p0
+%patch10 -p1
 
 %build
 %{__gettextize}
@@ -222,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2010/02/08 16:16:15  arekm
+- libpng fixes
+
 Revision 1.125  2010/01/28 17:28:35  arekm
 - release 13
 

================================================================
Index: packages/imlib/imlib-libpng.patch
diff -u /dev/null packages/imlib/imlib-libpng.patch:1.1
--- /dev/null	Mon Feb  8 17:16:21 2010
+++ packages/imlib/imlib-libpng.patch	Mon Feb  8 17:16:15 2010
@@ -0,0 +1,12 @@
+diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
+--- imlib-1.9.15-orig/Imlib/load.c	2010-01-18 20:58:27.000000000 -0500
++++ imlib-1.9.15/Imlib/load.c	2010-01-18 21:02:04.000000000 -0500
+@@ -1619,7 +1619,7 @@
+     return 0;
+   fread(buf, 1, 8, f);
+   rewind(f);
+-  return (int)png_check_sig(buf, 8);
++  return (int)png_sig_cmp(buf, 0, 8)==0;
+ #else
+   return 0;
+ #endif

================================================================
Index: packages/imlib2/imlib2.spec
diff -u packages/imlib2/imlib2.spec:1.73 packages/imlib2/imlib2.spec:1.74
--- packages/imlib2/imlib2.spec:1.73	Fri Jan 29 00:15:54 2010
+++ packages/imlib2/imlib2.spec	Mon Feb  8 17:16:15 2010
@@ -4,12 +4,13 @@
 Summary(pl.UTF-8):	Potężna biblioteka wczytująca i renderująca obrazki
 Name:		imlib2
 Version:	1.4.2
-Release:	3
+Release:	4
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
 # Source0-md5:	9f15568e76ebda9092c571e0df261f54
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-libpng.patch
 URL:		http://enlightenment.org/p.php?p=about/libs/imlib2
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
@@ -78,6 +79,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -141,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2010/02/08 16:16:15  arekm
+- libpng fixes
+
 Revision 1.73  2010/01/28 23:15:54  sparky
 - BR: pkgconfig
 

================================================================
Index: packages/imlib2/imlib2-libpng.patch
diff -u /dev/null packages/imlib2/imlib2-libpng.patch:1.1
--- /dev/null	Mon Feb  8 17:16:21 2010
+++ packages/imlib2/imlib2-libpng.patch	Mon Feb  8 17:16:15 2010
@@ -0,0 +1,12 @@
+diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c
+--- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c	2010-01-19 03:37:21.000000000 -0500
++++ imlib2-1.4.2/src/modules/loaders/loader_png.c	2010-01-19 03:38:51.000000000 -0500
+@@ -38,7 +38,7 @@
+ 
+         /* if we haven't read the header before, set the header data */
+         fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+-        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
++        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
+           {
+              fclose(f);
+              return 0;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imlib/imlib.spec?r1=1.125&r2=1.126&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imlib2/imlib2.spec?r1=1.73&r2=1.74&f=u