packages: emacs/emacs.spec, emacs/emacs-libpng.patch (NEW) - libpng fixes

[arekm]

Author: arekm                        Date: Tue Feb  2 09:23:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libpng fixes

---- Files affected:
packages/emacs:
   emacs.spec (1.95 -> 1.96) , emacs-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/emacs/emacs.spec
diff -u packages/emacs/emacs.spec:1.95 packages/emacs/emacs.spec:1.96
--- packages/emacs/emacs.spec:1.95	Fri Jul 31 10:46:49 2009
+++ packages/emacs/emacs.spec	Tue Feb  2 10:23:46 2010
@@ -31,6 +31,7 @@
 Source9:	%{name}-nox.desktop
 Patch0:		%{name}-tinfo.patch
 Patch1:		%{name}-lib64.patch
+Patch2:		%{name}-libpng.patch
 URL:		http://www.gnu.org/software/emacs/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -376,6 +377,7 @@
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -807,6 +809,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2010/02/02 09:23:46  arekm
+- libpng fixes
+
 Revision 1.95  2009/07/31 08:46:49  arekm
 - 23.1; files need update
 

================================================================
Index: packages/emacs/emacs-libpng.patch
diff -u /dev/null packages/emacs/emacs-libpng.patch:1.1
--- /dev/null	Tue Feb  2 10:23:52 2010
+++ packages/emacs/emacs-libpng.patch	Tue Feb  2 10:23:46 2010
@@ -0,0 +1,48 @@
+diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c
+--- emacs-23.1-orig/src/image.c	2010-01-17 23:12:10.000000000 -0500
++++ emacs-23.1/src/image.c	2010-01-17 23:18:16.000000000 -0500
+@@ -5793,7 +5793,7 @@
+ /* PNG library details.  */
+ 
+ DEF_IMGLIB_FN (png_get_io_ptr);
+-DEF_IMGLIB_FN (png_check_sig);
++DEF_IMGLIB_FN (png_sig_cmp);
+ DEF_IMGLIB_FN (png_create_read_struct);
+ DEF_IMGLIB_FN (png_create_info_struct);
+ DEF_IMGLIB_FN (png_destroy_read_struct);
+@@ -5824,7 +5824,7 @@
+     return 0;
+ 
+   LOAD_IMGLIB_FN (library, png_get_io_ptr);
+-  LOAD_IMGLIB_FN (library, png_check_sig);
++  LOAD_IMGLIB_FN (library, png_sig_cmp);
+   LOAD_IMGLIB_FN (library, png_create_read_struct);
+   LOAD_IMGLIB_FN (library, png_create_info_struct);
+   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
+@@ -5849,7 +5849,7 @@
+ #else
+ 
+ #define fn_png_get_io_ptr		png_get_io_ptr
+-#define fn_png_check_sig		png_check_sig
++#define fn_png_sig_cmp		png_sig_cmp
+ #define fn_png_create_read_struct	png_create_read_struct
+ #define fn_png_create_info_struct	png_create_info_struct
+ #define fn_png_destroy_read_struct	png_destroy_read_struct
+@@ -5996,7 +5996,7 @@
+ 
+       /* Check PNG signature.  */
+       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
+-	  || !fn_png_check_sig (sig, sizeof sig))
++	  || fn_png_sig_cmp (sig, 0, sizeof sig))
+ 	{
+ 	  image_error ("Not a PNG file: `%s'", file, Qnil);
+ 	  UNGCPRO;
+@@ -6013,7 +6013,7 @@
+ 
+       /* Check PNG signature.  */
+       if (tbr.len < sizeof sig
+-	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
++	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
+ 	{
+ 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
+ 	  UNGCPRO;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emacs/emacs.spec?r1=1.95&r2=1.96&f=u