aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-03-08 18:48:30 +0000
committerUlrich Müller <ulm@gentoo.org>2010-03-08 18:48:30 +0000
commit4616e0b296cb45759e958067ce72f22102dcd910 (patch)
treebb1cf240ec24d80e84c1c9c7b56d9a1fd2ef81db
parentUpdated patch for arm, bug 302357, thanks to armin76. (diff)
downloademacs-patches-4616e0b296cb45759e958067ce72f22102dcd910.tar.gz
emacs-patches-4616e0b296cb45759e958067ce72f22102dcd910.tar.bz2
emacs-patches-4616e0b296cb45759e958067ce72f22102dcd910.zip
-rw-r--r--emacs/21.4/21_all_libpng14.patch22
-rw-r--r--emacs/22.3/06_all_libpng14.patch49
-rw-r--r--emacs/23.1/05_all_libpng14.patch49
3 files changed, 120 insertions, 0 deletions
diff --git a/emacs/21.4/21_all_libpng14.patch b/emacs/21.4/21_all_libpng14.patch
new file mode 100644
index 0000000..cf16275
--- /dev/null
+++ b/emacs/21.4/21_all_libpng14.patch
@@ -0,0 +1,22 @@
+Fix building with libpng-1.4.
+
+--- emacs-21.4-orig/src/xfns.c
++++ emacs-21.4/src/xfns.c
+@@ -8641,7 +8641,7 @@
+
+ /* Check PNG signature. */
+ if (fread (sig, 1, sizeof sig, fp) != sizeof sig
+- || !png_check_sig (sig, sizeof sig))
++ || png_sig_cmp (sig, 0, sizeof sig))
+ {
+ image_error ("Not a PNG file: `%s'", file, Qnil);
+ UNGCPRO;
+@@ -8658,7 +8658,7 @@
+
+ /* Check PNG signature. */
+ if (tbr.len < sizeof sig
+- || !png_check_sig (tbr.bytes, sizeof sig))
++ || png_sig_cmp (tbr.bytes, 0, sizeof sig))
+ {
+ image_error ("Not a PNG image: `%s'", img->spec, Qnil);
+ UNGCPRO;
diff --git a/emacs/22.3/06_all_libpng14.patch b/emacs/22.3/06_all_libpng14.patch
new file mode 100644
index 0000000..53c5b73
--- /dev/null
+++ b/emacs/22.3/06_all_libpng14.patch
@@ -0,0 +1,49 @@
+http://repos.archlinux.org/wsvn/packages/emacs/trunk/libpng14.patch
+
+--- emacs-22.3-orig/src/image.c
++++ emacs-22.3/src/image.c
+@@ -6338,7 +6338,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);
+@@ -6369,7 +6369,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);
+@@ -6394,7 +6394,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
+@@ -6541,7 +6541,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;
+@@ -6558,7 +6558,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/23.1/05_all_libpng14.patch b/emacs/23.1/05_all_libpng14.patch
new file mode 100644
index 0000000..ea8721c
--- /dev/null
+++ b/emacs/23.1/05_all_libpng14.patch
@@ -0,0 +1,49 @@
+http://repos.archlinux.org/wsvn/packages/emacs/trunk/libpng14.patch
+
+--- emacs-23.1-orig/src/image.c
++++ emacs-23.1/src/image.c
+@@ -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;