[arch-commits] Commit in gimp-plugin-mathmap/trunk (PKGBUILD mathmap-gsl2.patch)

[Antonio Rojas]

    Date: Sunday, February 21, 2016 @ 11:17:27
  Author: arojas
Revision: 162980

GSL 2.1 rebuild

Added:
  gimp-plugin-mathmap/trunk/mathmap-gsl2.patch
Modified:
  gimp-plugin-mathmap/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    9 ++++++---
 mathmap-gsl2.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-21 10:04:18 UTC (rev 162979)
+++ PKGBUILD	2016-02-21 10:17:27 UTC (rev 162980)
@@ -4,7 +4,7 @@
 # Contributor: Serge Gielkens <gielkens.serge at mumeli.org>
 pkgname=gimp-plugin-mathmap
 pkgver=1.3.5
-pkgrel=6
+pkgrel=7
 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,11 +14,12 @@
 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.1.patch)
+        fix_libnoise_build.patch libpng15.patch giflib-5.1.patch mathmap-gsl2.patch)
 md5sums=('6ff66d070ea410dee1a27283d05b8beb'
          'eca40de0ba0e6b8d34b7d1f904bc3d18'
          '9780d6354b7380b772c4616253ecee54'
-         'a4dae904ede98ee8d3104bcfd285cec5')
+         'a4dae904ede98ee8d3104bcfd285cec5'
+         '34350e9d8edc451926298919a9300990')
 
 prepare() {
   cd "$srcdir/mathmap-$pkgver"
@@ -29,6 +30,8 @@
   patch -Np1 < "$srcdir"/libpng15.patch
   # fix for giflib 5.1
   patch -Np1 < "$srcdir"/giflib-5.1.patch
+  # fix build with GSL 2
+  patch -Np1 -i "$srcdir"/mathmap-gsl2.patch
 }
 
 build() {

Added: mathmap-gsl2.patch
===================================================================
--- mathmap-gsl2.patch	                        (rev 0)
+++ mathmap-gsl2.patch	2016-02-21 10:17:27 UTC (rev 162980)
@@ -0,0 +1,11 @@
+--- mathmap-1.3.5/opmacros.h.orig	2016-02-21 10:14:31.347636550 +0000
++++ mathmap-1.3.5/opmacros.h	2016-02-21 10:15:03.544184507 +0000
+@@ -103,7 +103,7 @@
+ #define ELL_INT_F(phi,k)      gsl_sf_ellint_F((phi), (k), GSL_PREC_SINGLE)
+ #define ELL_INT_E(phi,k)      gsl_sf_ellint_E((phi), (k), GSL_PREC_SINGLE)
+ #define ELL_INT_P(phi,k,n)    gsl_sf_ellint_P((phi), (k), (n), GSL_PREC_SINGLE)
+-#define ELL_INT_D(phi,k,n)    gsl_sf_ellint_D((phi), (k), (n), GSL_PREC_SINGLE)
++#define ELL_INT_D(phi,k,n)    gsl_sf_ellint_D((phi), (k), GSL_PREC_SINGLE)
+ 
+ #define ELL_INT_RC(x,y)       gsl_sf_ellint_RC((x), (y), GSL_PREC_SINGLE)
+ #define ELL_INT_RD(x,y,z)     gsl_sf_ellint_RD((x), (y), (z), GSL_PREC_SINGLE)