diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2019-03-24 00:27:33 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-03-24 00:32:23 +0100 |
commit | 88e045a01d140bcdc6bbc539b66c91df2f6fd0ec (patch) | |
tree | c9981c33a3e2b95dfc91fad68e187c5f7584c845 /games-puzzle/bastet/files | |
parent | lxde-base/lxdm: Add basic systemd and elogind support (diff) | |
download | gentoo-88e045a01d140bcdc6bbc539b66c91df2f6fd0ec.tar.gz gentoo-88e045a01d140bcdc6bbc539b66c91df2f6fd0ec.tar.bz2 gentoo-88e045a01d140bcdc6bbc539b66c91df2f6fd0ec.zip |
games-puzzle/bastet: Bump to vesion 0.43.2
Fixed build with sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/628878
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'games-puzzle/bastet/files')
-rw-r--r-- | games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch | 33 | ||||
-rw-r--r-- | games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch | 33 |
2 files changed, 66 insertions, 0 deletions
diff --git a/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch b/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch new file mode 100644 index 000000000000..d3cac50adc2b --- /dev/null +++ b/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch @@ -0,0 +1,33 @@ +--- bastet-0.43.2/Makefile ++++ bastet-0.43.2/Makefile +@@ -2,8 +2,10 @@ + MAIN=main.cpp + TESTS=Test.cpp + PROGNAME=bastet ++PKG_CONFIG?=pkg-config + BOOST_PO?=-lboost_program_options +-LDFLAGS+=-lncurses $(BOOST_PO) ++NCURSES_LIBS=$(shell $(PKG_CONFIG) --libs ncurses) ++LIBS=$(NCURSES_LIBS) $(BOOST_PO) + #CXXFLAGS+=-ggdb -Wall + CXXFLAGS+=-DNDEBUG -Wall + #CXXFLAGS+=-pg +@@ -12,15 +14,15 @@ + all: $(PROGNAME) $(TESTS:.cpp=) + + Test: $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) +- $(CXX) -ggdb -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) $(LIBS) + + depend: *.hpp $(SOURCES) $(MAIN) $(TESTS) + $(CXX) -MM $(SOURCES) $(MAIN) $(TESTS)> depend + +-include depend ++-include depend + + $(PROGNAME): $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) +- $(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) $(LIBS) + + clean: + rm -f $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(MAIN:.cpp=.o) $(PROGNAME) diff --git a/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch b/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch new file mode 100644 index 000000000000..d1c8d5774cc0 --- /dev/null +++ b/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch @@ -0,0 +1,33 @@ +From 0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1 Mon Sep 17 00:00:00 2001 +From: Federico Poloni <fpoloni@di.unipi.it> +Date: Wed, 4 Oct 2017 19:35:01 +0200 +Subject: [PATCH] Changed source of unordered_set (should hopefully fix #6 + without reopening #1) + +--- + BastetBlockChooser.hpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp +index 992e556..7ee3b7c 100644 +--- a/BastetBlockChooser.hpp ++++ b/BastetBlockChooser.hpp +@@ -23,8 +23,7 @@ + + #include "Well.hpp" + +-#include <boost/tr1/tr1/unordered_set> +-#include <set> ++#include <boost/unordered_set.hpp> + #include <boost/functional/hash.hpp> + + namespace Bastet{ +@@ -75,7 +74,7 @@ namespace Bastet{ + public: + Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); + private: +- std::tr1::unordered_set<Vertex> _visited; ++ boost::unordered_set<Vertex> _visited; + //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts + BlockType _block; + const Well *_well; |