Fix for GCC7

2 files changed, 9 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a755b7527f1..5c06356b777c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,9 @@ pkgbase = grass
 	optdepends = postgresql: PostgreSQL database interface
 	optdepends = sqlite: SQLite database interface
 	source = http://grass.osgeo.org/grass72/source/grass-7.2.1.tar.gz
+	source = https://trac.osgeo.org/grass/raw-attachment/ticket/3331/ctypesgencore_preprocessor_fix.diff
 	md5sums = 5c858c718d40a4f3e82741e60c9f7b97
+	md5sums = 2b70a7ddece3563dc5cf4b95b5b45665
 
 pkgname = grass
 
diff --git a/PKGBUILD b/PKGBUILD
index 6ece68d8fe22..40034ab7e9f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,12 +15,17 @@ depends=('cairo' 'fftw' 'fontconfig' 'freetype2' 'gcc-libs' 'gdal' 'geos' 'glibc
 makedepends=('libxt')
 optdepends=('postgresql: PostgreSQL database interface'
             'sqlite: SQLite database interface')
-source=("http://grass.osgeo.org/grass$_shortver/source/$pkgname-$pkgver.tar.gz")
-md5sums=('5c858c718d40a4f3e82741e60c9f7b97')
+source=("http://grass.osgeo.org/grass$_shortver/source/$pkgname-$pkgver.tar.gz"
+        "https://trac.osgeo.org/grass/raw-attachment/ticket/3331/ctypesgencore_preprocessor_fix.diff")
+md5sums=('5c858c718d40a4f3e82741e60c9f7b97'
+         '2b70a7ddece3563dc5cf4b95b5b45665')
 
 prepare() {
   cd $pkgname-$pkgver
 
+  # GCC7 patch
+  patch -Np0 -i ../ctypesgencore_preprocessor_fix.diff
+
   # Change everything to use python2
   sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
   sed -i '/os\.environ.*GRASS_PYTHON/ s/"python"/"python2"/' lib/init/grass.py