[polybori] 01/02: Apply upstream patch to fix FTBFS with GCC 6.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository polybori.

commit 93642651f3fbfeef8d30a62b218e1c71c2c88831
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Jan 1 21:50:54 2017 +0000

    Apply upstream patch to fix FTBFS with GCC 6.
---
 debian/changelog                     |  8 ++++
 debian/patches/fix_ftbfs_gcc-6.patch | 75 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  3 --
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5d9b75..0b7bdf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+brial (0.8.5-4) UNRELEASED; urgency=medium
+
+  * Add fix_ftbfs_gcc-6.patch:
+    Upstream patch to fix FTBFS with gcc 6.
+  * Remove -std=c++98 flag, obsolete with new patch.
+
+ -- Tobias Hansen <thansen at debian.org>  Sun, 01 Jan 2017 22:17:07 +0100
+
 brial (0.8.5-3) unstable; urgency=medium
 
   * Add Breaks and Replaces to old polybori for the dev packages.
diff --git a/debian/patches/fix_ftbfs_gcc-6.patch b/debian/patches/fix_ftbfs_gcc-6.patch
new file mode 100644
index 0000000..f7f956c
--- /dev/null
+++ b/debian/patches/fix_ftbfs_gcc-6.patch
@@ -0,0 +1,75 @@
+From 63f747626822f5e0fa2bf975f7801fcc988eb530 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <francois.bissey at canterbury.ac.nz>
+Date: Mon, 2 Jan 2017 09:46:08 +1300
+Subject: [PATCH] only use either standard map or unordered map for more recent
+ C++
+
+---
+ configure.ac                                    |  8 +------
+ libbrial/include/polybori/routines/pbori_func.h | 30 ++++++-------------------
+ 2 files changed, 8 insertions(+), 30 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,13 +19,7 @@
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(long)
+ 
+-AC_CHECK_HEADER([unordered_map],[AC_DEFINE([PBORI_HAVE_UNORDERD_MAP],[],[has unordered map])])
+-if ! test "x$ac_cv_header_unordered_map" = xyes; then
+-    AC_CHECK_HEADER([tr1/unordered_map],[AC_DEFINE([PBORI_HAVE_TR1_UNORDERED_MAP],[],[has tr1 unordered map])])
+-    if ! test "x$ac_cv_header_tr1_unordered_map" = xyes; then
+-        AC_CHECK_HEADER([ext/hash_map],[AC_DEFINE([PBORI_HAVE_HASH_MAP],[],[has hash map])])
+-    fi
+-fi
++AC_CHECK_HEADER([unordered_map],[AC_DEFINE([PBORI_HAVE_UNORDERED_MAP],[],[has unordered map])])
+ 
+ PKG_CHECK_MODULES([M4RI], m4ri, [AC_DEFINE([PBORI_HAVE_M4RI],[],[has m4ri])])
+ AC_EGREP_CPP([pbori_have_m4ri_png],
+--- a/libbrial/include/polybori/routines/pbori_func.h
++++ b/libbrial/include/polybori/routines/pbori_func.h
+@@ -26,18 +26,10 @@
+ #include <sstream>
+ 
+ 
+-#ifdef PBORI_HAVE_TR1_UNORDERED_MAP
+-#  include <tr1/unordered_map>
+-#else 
+-#  ifdef PBORI_HAVE_UNORDERED_MAP
+-#    include <unordered_map>
+-#  else
+-#    ifdef PBORI_HAVE_HASH_MAP
+-#      include <ext/hash_map>
+-#    else
+-#     include <map>
+-#    endif
+-#  endif
++#ifdef PBORI_HAVE_UNORDERED_MAP
++#include <unordered_map>
++#else
++#include <map>
+ #endif
+ 
+ BEGIN_NAMESPACE_PBORI
+@@ -630,18 +622,10 @@
+ public:
+   /// Type for index maps
+ 
+-#ifdef PBORI_HAVE_TR1_UNORDERED_MAP
+-  typedef std::tr1::unordered_map<Type, idx_type, hashes<Type> > type;
++#ifdef PBORI_HAVE_UNORDERED_MAP
++   typedef std::unordered_map<Type, idx_type, hashes<Type> > type;
+ #else
+-#  ifdef PBORI_HAVE_UNORDERED_MAP
+-     typedef std::unordered_map<Type, idx_type, hashes<Type> > type;
+-#  else
+-#    ifdef PBORI_HAVE_HASH_MAP
+-       typedef __gnu_cxx::hash_map<Type, idx_type, hashes<Type> > type;
+-#    else
+-       typedef std::map<Type, idx_type, Comparator> type;
+-#    endif
+-#  endif
++   typedef std::map<Type, idx_type, Comparator> type;
+ #endif
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c82a8a8..52387c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0003-Protect-CErrorInfo-from-invalid-array-access.patch
 fix-testsuite.patch
 testsuite-boost-1.62.patch
+fix_ftbfs_gcc-6.patch
diff --git a/debian/rules b/debian/rules
index 5abc3d3..4fd46cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@ SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-export CXXFLAGS+=-std=c++98
-# workaround for https://github.com/BRiAl/BRiAl/issues/11
-
 %:
 	dh $@ --parallel --with autoreconf --with python2
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polybori.git