[arch-commits] Commit in plotutils/trunk (PKGBUILD plotutils-2.6-libpng-1.5.patch)

[Eric Bélanger]

    Date: Sunday, November 18, 2012 @ 03:51:38
  Author: eric
Revision: 171505

upgpkg: plotutils 2.6-3

Fix png patch (close FS#32418)

Modified:
  plotutils/trunk/PKGBUILD
  plotutils/trunk/plotutils-2.6-libpng-1.5.patch

--------------------------------+
 PKGBUILD                       |    8 +++++---
 plotutils-2.6-libpng-1.5.patch |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-18 08:12:30 UTC (rev 171504)
+++ PKGBUILD	2012-11-18 08:51:38 UTC (rev 171505)
@@ -4,7 +4,7 @@
 
 pkgname=plotutils
 pkgver=2.6
-pkgrel=2
+pkgrel=3
 arch=('x86_64' 'i686')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
@@ -12,9 +12,11 @@
 depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
 options=('!libtool')
 install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
+source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} 
+        plotutils-2.6-libpng-1.5.patch)
 sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
-          '426f6ee04186af5059ab54322efaf0a6a976682b')
+          'ab78e2d06402aaac367da7a0e5810439d5b9853f'
+          '492f0e04f8265ab50d9ba0905a0f5adf3ec06ab8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: plotutils-2.6-libpng-1.5.patch
===================================================================
--- plotutils-2.6-libpng-1.5.patch	2012-11-18 08:12:30 UTC (rev 171504)
+++ plotutils-2.6-libpng-1.5.patch	2012-11-18 08:51:38 UTC (rev 171505)
@@ -7,7 +7,7 @@
  
    /* cleanup after libpng errors (error handler does a longjmp) */
 -  if (setjmp (png_ptr->jmpbuf))
-+  if (png_jmpbuf (png_ptr))
++  if (setjmp (png_jmpbuf (png_ptr)))
      {
        png_destroy_write_struct (&png_ptr, (png_info **)NULL);
        return -1;
@@ -16,7 +16,7 @@
      }
  
 -  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
++  png_longjmp (png_ptr, 1);
  }
  
  static void 
@@ -25,7 +25,7 @@
      }
  
 -  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
++  png_longjmp (png_ptr, 1);
  }
  
  static void