summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel de Val-Borro2016-06-06 16:52:34 -0400
committerMiguel de Val-Borro2016-06-06 16:55:03 -0400
commitdcb9b6ac8a79b4e6ede645e3a43e6ecea5e0369a (patch)
tree27827388fdbef6a17569c3ad522f62f1f0c9f2c2
parent90631b02b1f1e2267f15145a6faebec823e9c885 (diff)
downloadaur-dcb9b6ac8a79b4e6ede645e3a43e6ecea5e0369a.tar.gz
added gdl patches
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD18
-rw-r--r--gdl-template.patch20
-rw-r--r--typedefs.patch11
4 files changed, 51 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3692b9739e5..cefd0418d18 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.6
- pkgrel = 4
+ pkgrel = 5
url = http://gnudatalanguage.sourceforge.net/
arch = i686
arch = x86_64
@@ -25,8 +25,12 @@ pkgbase = gnudatalanguage
options = !makeflags
source = http://downloads.sourceforge.net/gnudatalanguage/gdl-0.9.6v2.tgz
source = gdl.profile
+ source = gdl-template.patch
+ source = typedefs.patch
md5sums = 6e97c4b005c1850e4b844fd3b8d96098
md5sums = 40aa5fd8278cd8e80425c62a577563cc
+ md5sums = 00f15c08d58033fcc6eb458524ca3433
+ md5sums = 70d375261e0f83f39332d379f5c0b4a3
pkgname = gnudatalanguage
diff --git a/PKGBUILD b/PKGBUILD
index 4f9ccdebbf9..37b31340733 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gnudatalanguage
pkgver=0.9.6
-pkgrel=4
+pkgrel=5
pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
arch=('i686' 'x86_64')
url="http://gnudatalanguage.sourceforge.net/"
@@ -14,9 +14,21 @@ depends=('python2' 'python2-numpy' 'plplot510' 'gsl' 'readline' 'hdf5' 'netcdf'
makedepends=('cmake')
options=('!makeflags')
source=(http://downloads.sourceforge.net/gnudatalanguage/gdl-${pkgver}v2.tgz \
- gdl.profile)
+ gdl.profile \
+ gdl-template.patch \
+ typedefs.patch)
md5sums=('6e97c4b005c1850e4b844fd3b8d96098'
- '40aa5fd8278cd8e80425c62a577563cc')
+ '40aa5fd8278cd8e80425c62a577563cc'
+ '00f15c08d58033fcc6eb458524ca3433'
+ '70d375261e0f83f39332d379f5c0b4a3')
+
+prepare() {
+ sed -i '1d' gdl-template.patch
+ cd $srcdir/gdl-${pkgver}/
+ patch -p1 < ../gdl-template.patch
+ cd src/
+ patch -p0 < ../../typedefs.patch
+}
build() {
cd $srcdir/gdl-${pkgver}
diff --git a/gdl-template.patch b/gdl-template.patch
new file mode 100644
index 00000000000..67610f194e8
--- /dev/null
+++ b/gdl-template.patch
@@ -0,0 +1,20 @@
+diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
+--- gdl-0.9.6/src/specializations.hpp.gcc6 2015-08-24 15:26:47.000000000 -0600
++++ gdl-0.9.6/src/specializations.hpp 2016-03-03 16:30:46.694379312 -0700
+@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
+
+ // default_io.cpp
+ template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_);
+-template<>
+-std::istream& operator>>(std::istream& is, Data_<SpDString>& data_);
+-template<>
+ std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
+ template<>
+ std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
diff --git a/typedefs.patch b/typedefs.patch
new file mode 100644
index 00000000000..a1547b3853b
--- /dev/null
+++ b/typedefs.patch
@@ -0,0 +1,11 @@
+--- 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;