summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormetamer2016-07-15 20:48:53 -0700
committermetamer2016-07-15 20:56:52 -0700
commit50c76bc68334939ef03a56a49f39809cdd024592 (patch)
tree3232601a9f2597413caeb35b2ff12142bf0f08f9
parent2bf3807ddb72001b48249d1abf5330073d394518 (diff)
downloadaur-50c76bc68334939ef03a56a49f39809cdd024592.tar.gz
updated to v18.2
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD25
-rw-r--r--rl-utils-numeric-include.patch10
-rw-r--r--room-numeric-include.patch10
4 files changed, 47 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf2b02926005..e12eadeddb53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Mar 21 18:39:14 UTC 2016
pkgbase = infra-arcana
pkgdesc = Roguelike game inspired by H.P. Lovecraft
- pkgver = 18.1
+ pkgver = 18.2
pkgrel = 1
url = https://sites.google.com/site/infraarcana/home
install = infra-arcana.install
@@ -12,11 +10,15 @@ pkgbase = infra-arcana
depends = sdl2_image
depends = sdl2_mixer
depends = hicolor-icon-theme
- source = https://github.com/InfraArcana/ia/archive/v18.1.zip
+ source = git+https://github.com/martin-tornqvist/ia.git#tag=v18.2
+ source = rl-utils-numeric-include.patch
+ source = room-numeric-include.patch
source = infra-arcana.install
source = infra-arcana.desktop
source = infra-arcana.sh
- md5sums = fc6561591d30b7af0d86390ee547bd4a
+ md5sums = SKIP
+ md5sums = fd8cacaa622c4363787cff2e575a8938
+ md5sums = 3c05836d84ad451d5d8034267b21ade8
md5sums = 2bc0fb64e8593e25009b1dc50e642cd8
md5sums = 2e28c2803d7d2cd4376dcd3aa6512774
md5sums = 87294b81f5a2f98a78d318a5dcec7caf
diff --git a/PKGBUILD b/PKGBUILD
index dc1d792739cb..f1a288d06757 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: metamer <metamer at openmailbox dot org>
pkgname=infra-arcana
-pkgver=18.1
+pkgver=18.2
pkgrel=1
epoch=
pkgdesc="Roguelike game inspired by H.P. Lovecraft"
@@ -13,22 +13,37 @@ depends=('sdl2_image' 'sdl2_mixer' 'hicolor-icon-theme')
backup=()
options=()
install=${pkgname}.install
-source=("https://github.com/InfraArcana/ia/archive/v${pkgver}.zip"
+source=( "git+https://github.com/martin-tornqvist/ia.git"#"tag=v${pkgver}"
+ "rl-utils-numeric-include.patch"
+ "room-numeric-include.patch"
"${pkgname}.install"
"${pkgname}.desktop"
"${pkgname}.sh")
-md5sums=('fc6561591d30b7af0d86390ee547bd4a'
+md5sums=('SKIP'
+ 'fd8cacaa622c4363787cff2e575a8938'
+ '3c05836d84ad451d5d8034267b21ade8'
'2bc0fb64e8593e25009b1dc50e642cd8'
'2e28c2803d7d2cd4376dcd3aa6512774'
'87294b81f5a2f98a78d318a5dcec7caf')
+prepare(){
+ cd $srcdir/"ia"
+ cd src
+ patch -uN room.cpp $srcdir/room-numeric-include.patch
+ cd $srcdir/"ia"
+ git submodule init
+ git submodule update
+ cd rl_utils/src
+ patch -uN rl_utils.cpp $srcdir/rl-utils-numeric-include.patch
+}
+
build() {
- cd "ia-${pkgver}"
+ cd $srcdir/"ia"
make
}
package() {
- cd "ia-$pkgver"
+ cd "ia"
#install licenses
install -DTm644 "target/license.txt"\
"${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
diff --git a/rl-utils-numeric-include.patch b/rl-utils-numeric-include.patch
new file mode 100644
index 000000000000..0489cd073e38
--- /dev/null
+++ b/rl-utils-numeric-include.patch
@@ -0,0 +1,10 @@
+--- rl_utils.cpp.old 2016-07-15 20:52:28.946108667 -0700
++++ rl_utils.cpp 2016-07-15 20:54:15.415983666 -0700
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <cassert>
+ #include <sstream>
++#include <numeric>
+
+ #include "mersenne_twister.hpp"
+
diff --git a/room-numeric-include.patch b/room-numeric-include.patch
new file mode 100644
index 000000000000..597a84ce434f
--- /dev/null
+++ b/room-numeric-include.patch
@@ -0,0 +1,10 @@
+--- room.cpp.old 2016-07-15 20:51:40.885423667 -0700
++++ room.cpp 2016-07-15 20:51:50.536913667 -0700
+@@ -2,6 +2,7 @@
+
+ #include <algorithm>
+ #include <climits>
++#include <numeric>
+
+ #include "init.hpp"
+ #include "map.hpp"