[libterralib] 05/05: * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6
in repository libterralib.

commit 1a66d5bd04ea1d666dcc022f6a43843daaab9177
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 2 18:57:40 2016 +0100

    * Add patch for g++6 (-std11) changes.
    * Build -std11 in prep. for g++-6
    * Standards-Version: 3.9.8
---
 debian/changelog                 |  8 ++++++++
 debian/control                   |  2 +-
 debian/patches/g++-6-fixes.patch | 18 ++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  2 +-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f55fb9..53b73a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium
+
+  * Add patch for g++6 (-std11) changes.
+  * Build -std11 in prep. for g++-6
+  * Standards-Version: 3.9.8
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 02 May 2016 16:46:24 +0100
+
 libterralib (4.3.0+dfsg.2-6) unstable; urgency=medium
 
   * Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857.
diff --git a/debian/control b/debian/control
index b28b17e..9e4ad62 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
                libmysqlclient-dev,
                libpq-dev,
                firebird-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libterralib.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/libterralib.git
 Homepage: http://www.terralib.org/
diff --git a/debian/patches/g++-6-fixes.patch b/debian/patches/g++-6-fixes.patch
new file mode 100644
index 0000000..6abced6
--- /dev/null
+++ b/debian/patches/g++-6-fixes.patch
@@ -0,0 +1,18 @@
+Description: C++ -std11 fix needed for magics
+ Disambiguate isnan() for users of TeDefines.h
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Update: 2016-05-02
+Forwarded: no
+Index: libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h
+===================================================================
+--- libterralib-4.3.0+dfsg.2.orig/src/terralib/kernel/TeDefines.h
++++ libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h
+@@ -205,7 +205,7 @@ const std::string TeDBVERSION = "4.0.0";
+   #define TeISNAN( x ) _isnan( x )
+ #elif TePLATFORM == TePLATFORMCODE_LINUX || TePLATFORM == TePLATFORMCODE_AIX
+   #include <math.h>
+-  #define TeISNAN( x ) isnan( x )
++#define TeISNAN( x ) std::isnan( x )
+ #else
+   #error "ERROR: Unsupported platform"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index b38b04c..f166f0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ kfreebsd-build.patch
 clang-fix.patch
 build-fix.patch
 archs.patch
+g++-6-fixes.patch
diff --git a/debian/rules b/debian/rules
index 02f7fbe..75ccaec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ DEB_BUILD_MAINT_OPTIONS:= hardening=+all
 DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
 export DEB_BUILD_MAINT_OPTIONS
 export DEB_CFLAGS_MAINT_APPEND
-CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std11
 CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff -I/usr/include/dxflib -I/usr/include/qwt'
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git