- libpng fixes

Changed files:
    emacs-libpng.patch -> 1.1
    emacs.spec -> 1.96

diff --git a/emacs-libpng.patch b/emacs-libpng.patch
new file mode 100644 (file)
index 0000000..8eeae15
--- /dev/null
+++ b/emacs-libpng.patch
@@ -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;

diff --git a/emacs.spec b/emacs.spec
index cda0f5fb844e67d3c87ecafb6c12597fa23cecea..3d86cbe8d52dd82dd3ac41cf40a031e4365ac528 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -30,6 +30,7 @@ Source8:      %{name}-motif.desktop
 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
@@ -375,6 +376,7 @@ exit 1
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .