Apply gcc6 patch

3 files changed, 8 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80812192dbf5..8ec09afa8a75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnudatalanguage
 	pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
 	pkgver = 0.9.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://gnudatalanguage.sourceforge.net/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 2840e800ba02..250508c95e14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gnudatalanguage
 pkgver=0.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
 arch=('i686' 'x86_64')
 url="http://gnudatalanguage.sourceforge.net/"
@@ -18,6 +18,12 @@ source=(http://downloads.sourceforge.net/gnudatalanguage/gdl-${pkgver}.tgz \
 md5sums=('0cd285d85e00e76e37b92310a76579c2'
          '40aa5fd8278cd8e80425c62a577563cc')
 
+prepare() {
+  sed -i '1d' gdl-template.patch
+  cd $srcdir/gdl-${pkgver}/
+  patch -p1 < ../gdl-template.patch
+}
+
 build() {
   cd $srcdir/gdl-${pkgver}
   if [[ -d build ]]; then
diff --git a/typedefs.patch b/typedefs.patch
deleted file mode 100644
index a1547b3853ba..000000000000
--- a/typedefs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- typedefs.hpp	2014/08/09 15:33:29	1.76
-+++ typedefs.hpp	2016/02/04 22:48:46	1.77
-@@ -235,7 +235,7 @@
-   
-   Guard& operator=( Guard& r)
-   {
--    if( &r == this) return;
-+    if( &r == this) return *this;
-     delete guarded;
-     guarded = r.guarded;
-     r.guarded = NULL;