diff options
| author | wiz <wiz> | 2011-01-24 09:33:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-24 09:33:32 +0000 |
| commit | 99ff3ea836adb7e3040f66b9ef68a57bbff1d2f1 (patch) | |
| tree | 89a6159d0f111a59b02e97282937fc6962d2bc95 /editors/emacs21 | |
| parent | 9e5e568c1b773be4a52ffc470636545d5507425b (diff) | |
| download | pkgsrc-99ff3ea836adb7e3040f66b9ef68a57bbff1d2f1.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'editors/emacs21')
| -rw-r--r-- | editors/emacs21/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs21/patches/patch-ax | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo index 503b721e378..ef067b96c30 100644 --- a/editors/emacs21/distinfo +++ b/editors/emacs21/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2010/02/21 12:26:47 wiz Exp $ +$NetBSD: distinfo,v 1.10 2011/01/24 09:42:40 wiz Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a @@ -26,6 +26,7 @@ SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263 SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0 +SHA1 (patch-ax) = 183dd9f3339564f0884f38be22080b333d85f58d SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326 SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25 diff --git a/editors/emacs21/patches/patch-ax b/editors/emacs21/patches/patch-ax new file mode 100644 index 00000000000..7a8c72a7fe6 --- /dev/null +++ b/editors/emacs21/patches/patch-ax @@ -0,0 +1,27 @@ +$NetBSD: patch-ax,v 1.1 2011/01/24 09:42:40 wiz Exp $ + +Fix build with png-1.5. + +--- src/xfns.c.orig 2002-12-06 17:05:35.000000000 +0000 ++++ src/xfns.c +@@ -8541,7 +8541,11 @@ my_png_error (png_ptr, msg) + { + xassert (png_ptr != NULL); + image_error ("PNG error: %s", build_string (msg), Qnil); ++#if (PNG_LIBPNG_VER < 10500) + longjmp (png_ptr->jmpbuf, 1); ++#else ++ png_longjmp (png_ptr, 1); ++#endif + } + + +@@ -8699,7 +8703,7 @@ png_load (f, img) + + /* 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) |