summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Harjunpää2018-07-15 10:22:46 +0300
committerJesse Harjunpää2018-07-15 10:22:46 +0300
commit1b06179a70e58b0752ac93df959afc61336c65f2 (patch)
treedb56cb53357343b91064cabb8e69049ff438c2d8
parent28d1a5a1355e5492cd5f3a1ce84d6db13d1083ed (diff)
downloadaur-1b06179a70e58b0752ac93df959afc61336c65f2.tar.gz
Updated new maintainer, added a patch to fx building
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--fix_build_new_boost.patch21
3 files changed, 34 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 849f36f4b52..2ac4a63cfa1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Jun 11 22:07:49 UTC 2017
pkgbase = bastet
pkgdesc = Tetris(r) clone with 'bastard' block-choosing AI
pkgver = 0.43.2
- pkgrel = 1
+ pkgrel = 2
url = http://fph.altervista.org/prog/bastet.html
arch = i686
arch = x86_64
@@ -13,7 +11,9 @@ pkgbase = bastet
depends = ncurses
backup = var/games/bastet.scores2
source = bastet-0.43.2.tar.gz::https://github.com/fph/bastet/archive/0.43.2.tar.gz
+ source = fix_build_new_boost.patch
md5sums = aee009b77b8cf9516d686bd24673800e
+ md5sums = 8009e922bd24dd89b896a95ac7004a8a
pkgname = bastet
diff --git a/PKGBUILD b/PKGBUILD
index ad71c0a1d42..e4fe093fb64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Jens Adam <jra@byte.cx>
+# Maintainer: Jesse Harjunpää <harjuje1@gmail.com>
+# Contributor: Jens Adam <jra@byte.cx>
pkgname=bastet
pkgver=0.43.2
-pkgrel=1
+pkgrel=2
pkgdesc="Tetris(r) clone with 'bastard' block-choosing AI"
url="http://fph.altervista.org/prog/bastet.html"
license=('GPL3')
@@ -10,8 +11,13 @@ arch=('i686' 'x86_64')
depends=('boost-libs' 'ncurses')
makedepends=('boost')
backup=('var/games/bastet.scores2')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/fph/bastet/archive/${pkgver}.tar.gz")
-md5sums=('aee009b77b8cf9516d686bd24673800e')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/fph/bastet/archive/${pkgver}.tar.gz" "fix_build_new_boost.patch")
+md5sums=('aee009b77b8cf9516d686bd24673800e' '8009e922bd24dd89b896a95ac7004a8a')
+
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/fix_build_new_boost.patch
+}
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/fix_build_new_boost.patch b/fix_build_new_boost.patch
new file mode 100644
index 00000000000..b43ad7259f8
--- /dev/null
+++ b/fix_build_new_boost.patch
@@ -0,0 +1,21 @@
+--- a/BastetBlockChooser.hpp 2015-08-30 10:04:24.000000000 +0300
++++ b/BastetBlockChooser.hpp 2018-07-15 08:44:39.163445025 +0300
+@@ -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 @@
+ 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;