aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-09-27 16:00:24 +0000
committerUlrich Müller <ulm@gentoo.org>2011-09-27 16:00:24 +0000
commitdb9f6d8b3c0845e018a71d5589a140ebe35021b8 (patch)
tree9eaae31ad7289ae762bfef1e2972d2e57eabb763
parentInitial patchset for Emacs 23.3 (diff)
downloademacs-patches-db9f6d8b3c0845e018a71d5589a140ebe35021b8.tar.gz
emacs-patches-db9f6d8b3c0845e018a71d5589a140ebe35021b8.tar.bz2
emacs-patches-db9f6d8b3c0845e018a71d5589a140ebe35021b8.zip
Fix compilation with libpng-1.5, bug 384553.emacs-22.3-patches-8emacs-21.4-patches-12
-rw-r--r--emacs/21.4/23_all_libpng15.patch22
-rw-r--r--emacs/22.3/10_all_libpng15.patch22
2 files changed, 44 insertions, 0 deletions
diff --git a/emacs/21.4/23_all_libpng15.patch b/emacs/21.4/23_all_libpng15.patch
new file mode 100644
index 0000000..4516b19
--- /dev/null
+++ b/emacs/21.4/23_all_libpng15.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/384553
+
+--- emacs-21.4-orig/src/xfns.c
++++ emacs-21.4/src/xfns.c
+@@ -8546,7 +8546,7 @@
+ {
+ xassert (png_ptr != NULL);
+ image_error ("PNG error: %s", build_string (msg), Qnil);
+- longjmp (png_ptr->jmpbuf, 1);
++ longjmp (png_jmpbuf (png_ptr), 1);
+ }
+
+
+@@ -8704,7 +8704,7 @@
+
+ /* Set error jump-back. We come back here when the PNG library
+ detects an error. */
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (png_ptr)))
+ {
+ error:
+ if (png_ptr)
diff --git a/emacs/22.3/10_all_libpng15.patch b/emacs/22.3/10_all_libpng15.patch
new file mode 100644
index 0000000..d16a7da
--- /dev/null
+++ b/emacs/22.3/10_all_libpng15.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/384553
+
+--- emacs-22.3-orig/src/image.c
++++ emacs-22.3/src/image.c
+@@ -6427,7 +6427,7 @@
+ {
+ xassert (png_ptr != NULL);
+ image_error ("PNG error: %s", build_string (msg), Qnil);
+- longjmp (png_ptr->jmpbuf, 1);
++ longjmp (png_jmpbuf (png_ptr), 1);
+ }
+
+
+@@ -6603,7 +6603,7 @@
+
+ /* Set error jump-back. We come back here when the PNG library
+ detects an error. */
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (png_ptr)))
+ {
+ error:
+ if (png_ptr)