The following commit has been merged in the master branch:
commit 121a3d78b4e9fae60ff8ccbccd8229a83c1e5eb9
Author: Antonio Valentino <antonio.valent...@tiscali.it>
Date: Tue Nov 26 09:43:26 2013 +0000
New patch for fixing compatibility issues with gcc-4.8
diff --git a/debian/changelog b/debian/changelog
index 5fe4b0e..11693ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
doris (4.06~beta2+dfsg-3) UNRELEASED; urgency=low
* All patches have been refreshed using gbp-pq
+ * New patch (0005-compatibility-with-gcc-4.8.x.patch) for fixing
+ compatibility issues with gcc-4.8.x
-- Antonio Valentino <antonio.valent...@tiscali.it> Tue, 26 Nov 2013
09:18:12 +0000
diff --git a/debian/patches/0005-compatibility-with-gcc-4.8.x.patch
b/debian/patches/0005-compatibility-with-gcc-4.8.x.patch
new file mode 100644
index 0000000..4600321
--- /dev/null
+++ b/debian/patches/0005-compatibility-with-gcc-4.8.x.patch
@@ -0,0 +1,26 @@
+From: Antonio Valentino <antonio.valent...@tiscali.it>
+Date: Tue, 26 Nov 2013 09:14:36 +0000
+Subject: compatibility with g++4.8.x
+
+---
+ src/ioroutines.cc | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/ioroutines.cc b/src/ioroutines.cc
+index b36eed9..e01138a 100755
+--- a/src/ioroutines.cc
++++ b/src/ioroutines.cc
+@@ -2526,8 +2526,11 @@ void toupper(char *s)
+ #ifdef WIN32
+ s = _strupr(s);// Jia
+ #else
+- while (*s != '\0')
+- *s++ = toupper(*s); // cctype
++ while (*s != '\0') {
++ //*s++ = toupper(*s); // [AV] do not works correctly with g++ 4.8
++ *s = std::toupper(*s); // cctype
++ ++s;
++ }
+ #endif
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index b47f13a..f21d1a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
0002-configure.patch
0003-tools-build.patch
0004-csh-path.patch
+0005-compatibility-with-gcc-4.8.x.patch
+
--
Packaging for DORIS (InSAR processor)
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
