From 554c281b67cedf7b4c6faad1c7c4380d74a49bd3 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Fri, 14 Jan 2011 11:06:52 +0000
Subject: Port Thomas Klausner's "png" build fix from the "emacs23" package to
 this emacs version.

---
 editors/emacs22/distinfo         |  4 ++--
 editors/emacs22/patches/patch-af | 31 ++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'editors/emacs22')

diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
index 819e973aada..387cff814f0 100644
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2010/06/24 22:19:24 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/01/14 11:06:52 tron Exp $
 
 SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492
 SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
-SHA1 (patch-af) = 0ed58bc8c5c7c15e1f17ceb39708ee4aeabe0c97
+SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe
 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
 SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
 SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
diff --git a/editors/emacs22/patches/patch-af b/editors/emacs22/patches/patch-af
index 9fbad4ea85a..427047d3c95 100644
--- a/editors/emacs22/patches/patch-af
+++ b/editors/emacs22/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2010/06/24 22:19:24 wiz Exp $
+$NetBSD: patch-af,v 1.2 2011/01/14 11:06:52 tron Exp $
 
-Workaround for systems coming with another copy of libpng (see PR 43485).
+Build fix for newer versions of "libpng".
 
---- src/image.c.orig	2008-08-25 22:18:33.000000000 +0000
-+++ src/image.c
-@@ -6328,11 +6328,7 @@ png_image_p (object)
+--- src/image.c.orig	2008-08-25 23:18:33.000000000 +0100
++++ src/image.c	2011-01-14 10:54:46.000000000 +0000
+@@ -6328,11 +6328,7 @@
  
  #ifdef HAVE_PNG
  
@@ -16,3 +16,24 @@ Workaround for systems coming with another copy of libpng (see PR 43485).
  
  #ifdef HAVE_NTGUI
  /* PNG library details.  */
+@@ -6427,7 +6423,11 @@
+ {
+   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
+ }
+ 
+ 
+@@ -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)
-- 
cgit v1.2.3