From fc3c9447da6cded0b6741cf3e6c2386c16493440 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 7 Apr 2021 19:43:09 +0200 Subject: 20210407.1 global branch merge. Signed-off-by: Matteo Bernardini --- games/brainparty/patches/gcc-6.patch | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 games/brainparty/patches/gcc-6.patch (limited to 'games/brainparty/patches/gcc-6.patch') diff --git a/games/brainparty/patches/gcc-6.patch b/games/brainparty/patches/gcc-6.patch new file mode 100644 index 0000000000..67dfadd540 --- /dev/null +++ b/games/brainparty/patches/gcc-6.patch @@ -0,0 +1,47 @@ +Description: Fix FTBFS on GCC 6 by removing use of hash_set class +Author: James Cowgill +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 + #include +-#include ++#include + +-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_set; ++typedef std::unordered_set 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++ + -- cgit v1.2.3