fix build

4 files changed, 28 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cef4e43ab3fb..69fb0fccb95a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Sun Jun 25 18:41:16 UTC 2017
 pkgbase = gimp-plugin-mathmap
 	pkgdesc = A GIMP plug-in which allows distortion of images specified by mathematical formulae
 	pkgver = 1.3.5
@@ -22,13 +20,13 @@ pkgbase = gimp-plugin-mathmap
 	source = libpng15.patch
 	source = giflib-5.1.patch
 	source = mathmap-gsl2.patch
-	source = flexible_array_member.diff
-	md5sums = 6ff66d070ea410dee1a27283d05b8beb
-	md5sums = eca40de0ba0e6b8d34b7d1f904bc3d18
-	md5sums = 9780d6354b7380b772c4616253ecee54
-	md5sums = a4dae904ede98ee8d3104bcfd285cec5
-	md5sums = 34350e9d8edc451926298919a9300990
-	md5sums = 769f284e7c0388f11849509487f5275f
+	source = zero-length_array.diff
+	sha256sums = 1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172
+	sha256sums = 37d7f2f6339c13fa63402dba5a013f2b1c9927212662ee26978f641cbccdd2c1
+	sha256sums = 09427c25abe0a4eddf07e5ff799e42e752703a15e4e6228e8b783a2d944565f3
+	sha256sums = 8f129420264bd59e574890408089355d5f79331f23a9fe0cd28040f3a75570bd
+	sha256sums = 86c2661b5883738ee180527a32416e311c6b6ab95c325bfbc7f4563ff7b71fd9
+	sha256sums = 099cac639a20b84f2726ef3af62840e0aac61af903d9fc83b3d7dc40954a4f68
 
 pkgname = gimp-plugin-mathmap
 
diff --git a/PKGBUILD b/PKGBUILD
index 3cdc35c61c67..e58f740fd2cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,13 +15,13 @@ 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
-        flexible_array_member.diff)
-md5sums=('6ff66d070ea410dee1a27283d05b8beb'
-         'eca40de0ba0e6b8d34b7d1f904bc3d18'
-         '9780d6354b7380b772c4616253ecee54'
-         'a4dae904ede98ee8d3104bcfd285cec5'
-         '34350e9d8edc451926298919a9300990'
-         '769f284e7c0388f11849509487f5275f')
+        zero-length_array.diff)
+sha256sums=('1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172'
+            '37d7f2f6339c13fa63402dba5a013f2b1c9927212662ee26978f641cbccdd2c1'
+            '09427c25abe0a4eddf07e5ff799e42e752703a15e4e6228e8b783a2d944565f3'
+            '8f129420264bd59e574890408089355d5f79331f23a9fe0cd28040f3a75570bd'
+            '86c2661b5883738ee180527a32416e311c6b6ab95c325bfbc7f4563ff7b71fd9'
+            '099cac639a20b84f2726ef3af62840e0aac61af903d9fc83b3d7dc40954a4f68')
 
 prepare() {
   cd "$srcdir/mathmap-$pkgver"
@@ -34,8 +34,9 @@ prepare() {
   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
+  # flexible array members are not allowed in structures that are members of union
+  # zero-length arrays GCC extension allows this
+  patch -Np1 -i "$srcdir"/zero-length_array.diff
 }
 
 build() {
diff --git a/flexible_array_member.diff b/flexible_array_member.diff
deleted file mode 100644
index 119b589892cb..000000000000
--- a/flexible_array_member.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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 */
diff --git a/zero-length_array.diff b/zero-length_array.diff
new file mode 100644
index 000000000000..d9f37186b8dd
--- /dev/null
+++ b/zero-length_array.diff
@@ -0,0 +1,11 @@
+--- mathmap-1.3.5/drawable.h	2009-08-23 13:56:14.000000000 +0200
++++ mathmap-1.3.5.new/drawable.h	2018-04-01 21:59:30.774269173 +0200
+@@ -105,7 +105,7 @@ typedef struct _image_t
+ 	    mathmap_pools_t *pools;
+ 	    void *xy_vars;
+ 	    int num_args;
+-	    userval_t args[];
++	    userval_t args[0];
+ 	} closure;
+ 	struct {
+ 	    float ax;