[arch-commits] Commit in gimp-plugin-mathmap/trunk (3 files)

[Lukas Jirkovsky]

    Date: Thursday, May 29, 2014 @ 11:36:27
  Author: stativ
Revision: 112066

gimp-plugni-mathmap: update giflib patch for giflib 5.1 rebuild.
Also move all patching to prepare()

Added:
  gimp-plugin-mathmap/trunk/giflib-5.1.patch
Modified:
  gimp-plugin-mathmap/trunk/PKGBUILD
Deleted:
  gimp-plugin-mathmap/trunk/giflib-5.0.patch

------------------+
 PKGBUILD         |   16 ++++++++++------
 giflib-5.0.patch |   12 ------------
 giflib-5.1.patch |   21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-29 07:47:47 UTC (rev 112065)
+++ PKGBUILD	2014-05-29 09:36:27 UTC (rev 112066)
@@ -4,7 +4,7 @@
 # Contributor: Serge Gielkens <gielkens.serge at mumeli.org>
 pkgname=gimp-plugin-mathmap
 pkgver=1.3.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
 arch=('i686' 'x86_64')
 url="http://www.complang.tuwien.ac.at/schani/mathmap/"
@@ -14,13 +14,13 @@
 provides=('gimp-mathmap')
 replaces=('gimp-mathmap')
 source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
-        fix_libnoise_build.patch libpng15.patch giflib-5.0.patch)
+        fix_libnoise_build.patch libpng15.patch giflib-5.1.patch)
 md5sums=('6ff66d070ea410dee1a27283d05b8beb'
          'eca40de0ba0e6b8d34b7d1f904bc3d18'
          '9780d6354b7380b772c4616253ecee54'
-         '9cc8eb13526056d8f3d06cc3e984a719')
+         'a4dae904ede98ee8d3104bcfd285cec5')
 
-build() {
+prepare() {
   cd "$srcdir/mathmap-$pkgver"
 
   # fix problem with building libnoise
@@ -27,9 +27,13 @@
   patch -Np1 < "$srcdir"/fix_libnoise_build.patch
   # fix for libpng 1.5
   patch -Np1 < "$srcdir"/libpng15.patch
-  # fix for giflib 5.0
-  patch -Np1 < "$srcdir"/giflib-5.0.patch
+  # fix for giflib 5.1
+  patch -Np1 < "$srcdir"/giflib-5.1.patch
+}
 
+build() {
+  cd "$srcdir/mathmap-$pkgver"
+
   make
 }
 

Deleted: giflib-5.0.patch
===================================================================
--- giflib-5.0.patch	2014-05-29 07:47:47 UTC (rev 112065)
+++ giflib-5.0.patch	2014-05-29 09:36:27 UTC (rev 112066)
@@ -1,12 +0,0 @@
-diff -rupN a/rwimg/rwgif.c b/rwimg/rwgif.c
---- a/rwimg/rwgif.c	2009-08-23 13:56:14.000000000 +0200
-+++ b/rwimg/rwgif.c	2013-07-30 10:59:45.391015754 +0200
-@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int
-     
-     assert(data != 0);
-     
--    data->file = DGifOpenFileName(filename);
-+    data->file = DGifOpenFileName(filename, NULL);
-     
-     assert(data->file !=0);
-         

Added: giflib-5.1.patch
===================================================================
--- giflib-5.1.patch	                        (rev 0)
+++ giflib-5.1.patch	2014-05-29 09:36:27 UTC (rev 112066)
@@ -0,0 +1,21 @@
+diff -rup mathmap-1.3.5/rwimg/rwgif.c mathmap-1.3.5.new/rwimg/rwgif.c
+--- mathmap-1.3.5/rwimg/rwgif.c	2009-08-23 13:56:14.000000000 +0200
++++ mathmap-1.3.5.new/rwimg/rwgif.c	2014-05-29 11:31:51.388388393 +0200
+@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int
+     
+     assert(data != 0);
+     
+-    data->file = DGifOpenFileName(filename);
++    data->file = DGifOpenFileName(filename, NULL);
+     
+     assert(data->file !=0);
+         
+@@ -137,7 +137,7 @@ open_gif_file (const char *filename, int
+     }
+     free(buffer);
+     
+-    assert(DGifCloseFile(data->file) == GIF_OK);
++    assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+     
+     return data;
+ }