diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /games-puzzle/bastet/files | |
parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) |
gentoo resync : 05.04.2019
Diffstat (limited to 'games-puzzle/bastet/files')
3 files changed, 66 insertions, 15 deletions
diff --git a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch b/games-puzzle/bastet/files/bastet-0.43-gentoo.patch deleted file mode 100644 index db7671592224..000000000000 --- a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.old 2010-12-02 15:43:29.000000000 +0100 -+++ Makefile 2010-12-02 15:47:18.000000000 +0100 -@@ -11,10 +11,10 @@ - depend: *.hpp $(SOURCES) - $(CXX) -MM $(SOURCES) > depend - --include depend -+-include depend - - $(PROGNAME): $(SOURCES:.cpp=.o) -- $(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options -+ $(CXX) ${CXXFLAGS} -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options - - clean: - rm -f $(SOURCES:.cpp=.o) $(PROGNAME) 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; |