[gentoo-commits] repo/gentoo:master commit in: games-puzzle/brainparty/, games-puzzle/brainparty/files/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/brainparty/, games-puzzle/brainparty/files/

[David Seifert]

commit:     fab43f983be105df1d882e762a8d835529601276
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 24 16:52:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 12:47:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab43f98

games-puzzle/brainparty: Fix GCC-6 build

Bug: https://bugs.gentoo.org/show_bug.cgi?id=612654
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4220

 games-puzzle/brainparty/brainparty-0.61.ebuild                |  5 +++--
 .../brainparty/files/brainparty-0.61-gnu_cxx-hash.patch       | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/brainparty/brainparty-0.61.ebuild b/games-puzzle/brainparty/brainparty-0.61.ebuild
index 3271d1a09dc..9cc441ad80e 100644
--- a/games-puzzle/brainparty/brainparty-0.61.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,7 +34,8 @@ src_prepare() {
 		main.cpp || die
 	epatch \
 		"${FILESDIR}"/${P}-savegame.patch \
-		"${FILESDIR}"/${P}-gcc49.patch
+		"${FILESDIR}"/${P}-gcc49.patch \
+		"${FILESDIR}"/${P}-gnu_cxx-hash.patch
 
 }
 

diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch b/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
new file mode 100644
index 00000000000..8d933462673
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
@@ -0,0 +1,11 @@
+--- a/WordList.h
++++ b/WordList.h
+@@ -35,7 +35,7 @@
+ 	};
+ }
+ 
+-typedef hash_set<string, hash<string> > string_hash_set;
++typedef hash_set<string, __gnu_cxx::hash<string> > string_hash_set;
+ 
+ class WordList {
+ private:

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/brainparty/, games-puzzle/brainparty/files/

[Sergei Trofimovich]

commit:     fdb3061a9f6f618246ec3d1efd392026bf75f6a5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 08:50:09 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 08:56:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb3061a

games-puzzle/brainparty: tweak for gcc-11

Reported-by: Kobboi
Closes: https://bugs.gentoo.org/768204
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 games-puzzle/brainparty/brainparty-0.61-r1.ebuild          |  1 +
 games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
index fc43bec69a8..2400e1405d1 100644
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-savegame.patch
 	"${FILESDIR}"/${P}-gcc49.patch
 	"${FILESDIR}"/${P}-gnu_cxx-hash.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
 )
 
 src_prepare() {

diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
new file mode 100644
index 00000000000..695fc0b674c
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
@@ -0,0 +1,14 @@
+gcc-11 needs const operator()
+
+https://bugs.gentoo.org/768204
+--- a/BPGame.h
++++ b/BPGame.h
+@@ -53,7 +53,7 @@ class BPMiniGame;
+ class SpriteFont;
+ 
+ struct cmp_str {
+-	bool operator()(char const *a, char const *b) {
++	bool operator()(char const *a, char const *b) const {
+ 		return std::strcmp(a, b) < 0;
+ 	}
+ };