[97043] trunk/dports/graphics/xsane

[cal at macports.org]

Revision: 97043
          https://trac.macports.org/changeset/97043
Author:   cal at macports.org
Date:     2012-08-25 05:08:37 -0700 (Sat, 25 Aug 2012)
Log Message:
-----------
xsane: add compatibility fix for libpng15

taken from https://bugs.gentoo.org/377363?id=377363

Modified Paths:
--------------
    trunk/dports/graphics/xsane/Portfile

Added Paths:
-----------
    trunk/dports/graphics/xsane/files/patch-src__xsane-save.c-libpng15-compat.diff

Modified: trunk/dports/graphics/xsane/Portfile
===================================================================
--- trunk/dports/graphics/xsane/Portfile	2012-08-25 08:47:38 UTC (rev 97042)
+++ trunk/dports/graphics/xsane/Portfile	2012-08-25 12:08:37 UTC (rev 97043)
@@ -16,7 +16,7 @@
                  Project.
 
 master_sites    ${homepage}download/ \
-                ftp://ftp.sane-project.org/pub/sane/xsane/ \
+                ftp://ftp2.sane-project.org/pub/sane/xsane/ \
                 ftp://ftp3.sane-project.org/pub/sane/xsane/ \
                 ftp://sunsite.uio.no/pub/sane/xsane/
 
@@ -30,7 +30,8 @@
                 port:sane-backends
 
 patchfiles      patch-sane-options-handling-fix.diff \
-                patch-gtk_adjustment_new.diff
+                patch-gtk_adjustment_new.diff \
+                patch-src__xsane-save.c-libpng15-compat.diff
 
 # gimp2 is not universal (#29165)
 
@@ -57,5 +58,5 @@
 }
 
 livecheck.type  regex
-livecheck.url   ftp://ftp.sane-project.org/pub/sane/xsane/
+livecheck.url   ftp://ftp2.sane-project.org/pub/sane/xsane/
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/graphics/xsane/files/patch-src__xsane-save.c-libpng15-compat.diff
===================================================================
--- trunk/dports/graphics/xsane/files/patch-src__xsane-save.c-libpng15-compat.diff	                        (rev 0)
+++ trunk/dports/graphics/xsane/files/patch-src__xsane-save.c-libpng15-compat.diff	2012-08-25 12:08:37 UTC (rev 97043)
@@ -0,0 +1,20 @@
+--- src/xsane-save.c.orig	2012-08-25 14:04:12.000000000 +0200
++++ src/xsane-save.c	2012-08-25 14:04:46.000000000 +0200
+@@ -4910,7 +4910,7 @@
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
+@@ -5100,7 +5100,7 @@
+     return -1; /* error */
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf))
++  if (setjmp(png_jmpbuf(png_ptr)))
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120825/662ff324/attachment.html>