diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-04 00:30:53 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-05 19:32:45 +0200 |
commit | fc4738149f5cbaffc8e0b37bfb61e25fac0ecd67 (patch) | |
tree | 43976abd28f98a5121200818fa130958906347c1 /gnu/packages/patches | |
parent | b008a12ae78b533c14dd7e88f29df091eca3c0d7 (diff) | |
download | guix-fc4738149f5cbaffc8e0b37bfb61e25fac0ecd67.tar guix-fc4738149f5cbaffc8e0b37bfb61e25fac0ecd67.tar.gz |
gnu: Add bastet.
* gnu/packages/games.scm (bastet): New public variable.
* gnu/packages/patches/bastet-change-source-of-unordered_set.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/bastet-change-source-of-unordered_set.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/bastet-change-source-of-unordered_set.patch b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch new file mode 100644 index 0000000000..ef3970a3e2 --- /dev/null +++ b/gnu/packages/patches/bastet-change-source-of-unordered_set.patch @@ -0,0 +1,40 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Wed, 3 Oct 2018 23:30:42 +0200 +Subject: [PATCH] bastet: Change source of unordered_set. + +This allows building bastet 0.43.2 with boost >=1.66. +It was backported verbatim from the upstream master branch. + +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; |