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

[Lukas Jirkovsky]

    Date: Wednesday, November 9, 2016 @ 21:24:04
  Author: stativ
Revision: 195253

upgpkg: gimp-plugin-mathmap 1.3.5-8

rebuild, fix build with current gcc

Added:
  gimp-plugin-mathmap/trunk/flexible_array_member.diff
Modified:
  gimp-plugin-mathmap/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   12 ++++++++----
 flexible_array_member.diff |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-09 21:08:57 UTC (rev 195252)
+++ PKGBUILD	2016-11-09 21:24:04 UTC (rev 195253)
@@ -4,7 +4,7 @@
 # Contributor: Serge Gielkens <gielkens.serge at mumeli.org>
 pkgname=gimp-plugin-mathmap
 pkgver=1.3.5
-pkgrel=7
+pkgrel=8
 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/"
@@ -13,13 +13,15 @@
 makedepends=('doxygen' 'unzip')
 provides=('gimp-mathmap')
 replaces=('gimp-mathmap')
-source=(https://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
-        fix_libnoise_build.patch libpng15.patch giflib-5.1.patch mathmap-gsl2.patch)
+source=(https://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz
+        fix_libnoise_build.patch libpng15.patch giflib-5.1.patch mathmap-gsl2.patch
+        flexible_array_member.diff)
 md5sums=('6ff66d070ea410dee1a27283d05b8beb'
          'eca40de0ba0e6b8d34b7d1f904bc3d18'
          '9780d6354b7380b772c4616253ecee54'
          'a4dae904ede98ee8d3104bcfd285cec5'
-         '34350e9d8edc451926298919a9300990')
+         '34350e9d8edc451926298919a9300990'
+         '769f284e7c0388f11849509487f5275f')
 
 prepare() {
   cd "$srcdir/mathmap-$pkgver"
@@ -32,6 +34,8 @@
   patch -Np1 < "$srcdir"/giflib-5.1.patch
   # fix build with GSL 2
   patch -Np1 -i "$srcdir"/mathmap-gsl2.patch
+  # fix build, GCC doesn't like flexible array members in unions
+  patch -Np1 -i "$srcdir"/flexible_array_member.diff
 }
 
 build() {

Added: flexible_array_member.diff
===================================================================
--- flexible_array_member.diff	                        (rev 0)
+++ flexible_array_member.diff	2016-11-09 21:24:04 UTC (rev 195253)
@@ -0,0 +1,37 @@
+diff -rup mathmap-1.3.5/drawable.h mathmap-1.3.5.new/drawable.h
+--- mathmap-1.3.5/drawable.h	2009-08-23 13:56:14.000000000 +0200
++++ mathmap-1.3.5.new/drawable.h	2016-11-09 22:15:44.264585707 +0100
+@@ -98,16 +98,6 @@ typedef struct _image_t
+     {
+ 	struct _input_drawable_t *drawable;
+ 	struct {
+-	    /* for rendering */
+-	    struct _mathfuncs_t *funcs;
+-	    /* for getting single pixels - never called for the root closure */
+-	    filter_func_t func;
+-	    mathmap_pools_t *pools;
+-	    void *xy_vars;
+-	    int num_args;
+-	    userval_t args[];
+-	} closure;
+-	struct {
+ 	    float ax;
+ 	    float bx;
+ 	    float ay;
+@@ -119,6 +109,16 @@ typedef struct _image_t
+ 	    float x_factor;
+ 	    float y_factor;
+ 	} resize;
++	struct {
++	    /* for rendering */
++	    struct _mathfuncs_t *funcs;
++	    /* for getting single pixels - never called for the root closure */
++	    filter_func_t func;
++	    mathmap_pools_t *pools;
++	    void *xy_vars;
++	    int num_args;
++	    userval_t args[];
++	} closure;
+     } v;
+ } image_t;
+ /* END */