diff options
| author | wiz <wiz> | 2011-01-14 10:32:28 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-14 10:32:28 +0000 |
| commit | ad080481ed53c11f537e9f669de6149db7334f37 (patch) | |
| tree | e92aebede95a9f88ac9cfacbb523ee2dda68d69e /editors/emacs | |
| parent | cb81dd95073ea330d3f5e929fda28477aded7d48 (diff) | |
| download | pkgsrc-ad080481ed53c11f537e9f669de6149db7334f37.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ac | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index f9649fe9a9a..a326c70ed9d 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.47 2010/10/21 12:05:48 obache Exp $ +$NetBSD: distinfo,v 1.48 2011/01/14 10:32:28 wiz Exp $ SHA1 (emacs-23.2.tar.gz) = 2f99c7111c232cf04410607698d2db842e305c82 RMD160 (emacs-23.2.tar.gz) = 6d25f8d12cfa23e413ea353933ed871a3d3aa08e Size (emacs-23.2.tar.gz) = 46831697 bytes SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50 SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e +SHA1 (patch-ac) = b34a86962c2d3dc684a80e2c67054ca51dba5a5a SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac new file mode 100644 index 00000000000..d6351bf0c40 --- /dev/null +++ b/editors/emacs/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.20 2011/01/14 10:32:28 wiz Exp $ + +Fix build with png-1.5. + +--- src/image.c.orig 2010-04-03 22:26:07.000000000 +0000 ++++ src/image.c +@@ -5648,7 +5648,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 + } + + +@@ -5824,7 +5828,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) |