[brainparty] 01/02: Fix FTBFS with GCC 6.

[James Cowgill]

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

jcowgill pushed a commit to branch master
in repository brainparty.

commit 9fe67535389687d894fccdb86c2eb4756568ad67
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jul 2 21:43:28 2016 +0200

    Fix FTBFS with GCC 6.
    
    Closes: #811885
---
 debian/patches/gcc-6.patch | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 48 insertions(+)

diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
new file mode 100644
index 0000000..67dfadd
--- /dev/null
+++ b/debian/patches/gcc-6.patch
@@ -0,0 +1,47 @@
+Description: Fix FTBFS on GCC 6 by removing use of hash_set class
+Author: James Cowgill <jcowgill at debian.org>
+Bug-Debian: https://bugs.debian.org/811885
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/WordList.h
++++ b/WordList.h
+@@ -18,24 +18,11 @@
+ #ifndef __WORDLIST_H__
+ #define __WORDLIST_H__
+ 
++#include <string>
+ #include <vector>
+-#include <ext/hash_set>
++#include <unordered_set>
+ 
+-using namespace std;
+-using namespace __gnu_cxx;
+-
+-namespace __gnu_cxx
+-{
+-	template<> struct hash< std::string >
+-	{
+-		size_t operator()( const std::string& x ) const
+-		{
+-			return hash< const char* >()( x.c_str() );
+-		}
+-	};
+-}
+-
+-typedef hash_set<string, hash<string> > string_hash_set;
++typedef std::unordered_set<std::string> string_hash_set;
+ 
+ class WordList {
+ private:
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,9 @@ else
+ 	OSXCOMPAT = 
+ endif
+ 
++# enable c++11
++CXXFLAGS += -std=c++11
++
+ # object files have corresponding source files
+ CXX = g++
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3075f32..3fe0639 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ unbundle-ttf.patch
 disable-fistrun-prompt.patch
 fix-FTBFS-with-GCC-4.9.patch
 reproducible-build.patch
+gcc-6.patch

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