summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRojikku2021-06-20 14:22:12 -0400
committerRojikku2021-06-20 14:22:12 -0400
commit701ab60b0b8312fe410f478ea21662f9706de895 (patch)
tree3bb0c0a48e4722898380a7c2315a1253837de97a
parent3d54023d0c0cf542849ddb98a1d8f9e6873bfa1f (diff)
downloadaur-701ab60b0b8312fe410f478ea21662f9706de895.tar.gz
Updated to 5.7.15, added dependency gcc-10 to build
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD10
-rw-r--r--umoria-5.7.15-aur.patch (renamed from umoria-5.7.14-aur.patch)11
3 files changed, 23 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d094170d5f2c..8d0ade34618b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = umoria
pkgdesc = Rogue-like dungeon crawler
- pkgver = 5.7.14
+ pkgver = 5.7.15
pkgrel = 1
url = https://umoria.org
install = umoria.install
@@ -9,12 +9,12 @@ pkgbase = umoria
license = GPL
makedepends = gzip
makedepends = cmake
+ makedepends = gcc10
depends = ncurses
backup = usr/share/umoria/files/scores
- source = umoria-5.7.14-aur.patch
- source = umoria-5.7.14.tar.gz::https://github.com/dungeons-of-moria/umoria/archive/v5.7.14.tar.gz
- sha512sums = 281275858ce39b5fe07f856e4e126f80fa6a864ada259d1d30c8d97e4dc853ffa6efa805bc1950ab2abd49d1cf0b4f54d60384ffa67f70fa93845628ece145e8
- sha512sums = 5c99ed314a29684d2fc18a1429fb7609553a78fd053eac8d61189e0af8c72777d481910153514dfe544a8939be24ed9725fc2b31e89e5d6e26f0b1df5ad4c3e0
+ source = umoria-5.7.15-aur.patch
+ source = umoria-5.7.15.tar.gz::https://github.com/dungeons-of-moria/umoria/archive/v5.7.15.tar.gz
+ sha512sums = 5e5daf79b076b8784ee22bd1c18b901a9f837d32a617f1fef066c2985a426bd63854ba022d8cc759b9be0cde1d4c81ff3909a06213abee5bdfda16b0fb031f66
+ sha512sums = 9ef9723eb120e5180640d8aa52073df638e506e0c842dac7173643bebfd84c51ec1fe6e2b1fa84ad1dcef29dc6607639e6a19ac4fd47000c6ba241691c1c720c
pkgname = umoria
-
diff --git a/PKGBUILD b/PKGBUILD
index e4bef227505b..01e4c867fc54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
# Maintainer: Rojikku <RojikkuNoKami at gmail dot com>
# Contributor: Beej Jorgensen <beej@beej.us>
pkgname=umoria
-pkgver=5.7.14
+pkgver=5.7.15
pkgrel=1
pkgdesc="Rogue-like dungeon crawler"
arch=('i686' 'x86_64')
url="https://umoria.org"
license=('GPL')
depends=('ncurses')
-makedepends=('gzip' 'cmake')
+makedepends=('gzip' 'cmake' 'gcc10')
backup=("usr/share/${pkgname}/files/scores")
source=(
"${pkgname}-${pkgver}-aur.patch"
${pkgname}-${pkgver}.tar.gz::https://github.com/dungeons-of-moria/${pkgname}/archive/v${pkgver}.tar.gz
)
install=${pkgname}.install
-sha512sums=('281275858ce39b5fe07f856e4e126f80fa6a864ada259d1d30c8d97e4dc853ffa6efa805bc1950ab2abd49d1cf0b4f54d60384ffa67f70fa93845628ece145e8'
- '5c99ed314a29684d2fc18a1429fb7609553a78fd053eac8d61189e0af8c72777d481910153514dfe544a8939be24ed9725fc2b31e89e5d6e26f0b1df5ad4c3e0')
+sha512sums=('5e5daf79b076b8784ee22bd1c18b901a9f837d32a617f1fef066c2985a426bd63854ba022d8cc759b9be0cde1d4c81ff3909a06213abee5bdfda16b0fb031f66'
+ '9ef9723eb120e5180640d8aa52073df638e506e0c842dac7173643bebfd84c51ec1fe6e2b1fa84ad1dcef29dc6607639e6a19ac4fd47000c6ba241691c1c720c')
prepare() {
cd "$srcdir/${pkgname}-$pkgver"
@@ -25,6 +25,8 @@ prepare() {
build() {
cd "$srcdir/${pkgname}-$pkgver"
+ export CC=$(which gcc-10)
+ export CXX=$(which g++-10)
cmake .
make
}
diff --git a/umoria-5.7.14-aur.patch b/umoria-5.7.15-aur.patch
index 30ad2695c502..ac17e2f346ad 100644
--- a/umoria-5.7.14-aur.patch
+++ b/umoria-5.7.15-aur.patch
@@ -31,3 +31,14 @@
} // namespace files
// Game options as set on startup and with `=` set options command -CJS-
+--- umoria/CMakeLists.txt 2021-06-02 10:04:31.000000000 -0400
++++ umoria/CMakeLists.txt 2021-06-20 14:14:30.510073801 -0400
+@@ -20,7 +20,7 @@
+ endif ()
+
+ # Compiler settings (this must come before calling project)
+-set(CMAKE_CXX_COMPILER g++)
++set(CMAKE_CXX_COMPILER g++-10)
+ set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED on)
+