Switched gcc-10 dependency to removing -Werror - Try revision 1 if this produces issues for you

3 files changed, 14 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d0ade34618b..87c8adc897e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = umoria
 	pkgdesc = Rogue-like dungeon crawler
 	pkgver = 5.7.15
-	pkgrel = 1
+	pkgrel = 2
 	url = https://umoria.org
 	install = umoria.install
 	arch = i686
@@ -9,12 +9,11 @@ pkgbase = umoria
 	license = GPL
 	makedepends = gzip
 	makedepends = cmake
-	makedepends = gcc10
 	depends = ncurses
 	backup = usr/share/umoria/files/scores
 	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 = a88a8924011a8ee6532052092badc06fc50ca8cb94e3eff5a4f94ca51d72e5360bec4090dbd612ca636360b46d9563b787ed835bf6fcf49acdf2125ee96c927f
 	sha512sums = 9ef9723eb120e5180640d8aa52073df638e506e0c842dac7173643bebfd84c51ec1fe6e2b1fa84ad1dcef29dc6607639e6a19ac4fd47000c6ba241691c1c720c
 
 pkgname = umoria
diff --git a/PKGBUILD b/PKGBUILD
index 01e4c867fc54..35bc3e3a08a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 # Contributor: Beej Jorgensen <beej@beej.us>
 pkgname=umoria
 pkgver=5.7.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Rogue-like dungeon crawler"
 arch=('i686' 'x86_64')
 url="https://umoria.org"
 license=('GPL')
 depends=('ncurses')
-makedepends=('gzip' 'cmake' 'gcc10')
+makedepends=('gzip' 'cmake')
 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=('5e5daf79b076b8784ee22bd1c18b901a9f837d32a617f1fef066c2985a426bd63854ba022d8cc759b9be0cde1d4c81ff3909a06213abee5bdfda16b0fb031f66'
+sha512sums=('a88a8924011a8ee6532052092badc06fc50ca8cb94e3eff5a4f94ca51d72e5360bec4090dbd612ca636360b46d9563b787ed835bf6fcf49acdf2125ee96c927f'
             '9ef9723eb120e5180640d8aa52073df638e506e0c842dac7173643bebfd84c51ec1fe6e2b1fa84ad1dcef29dc6607639e6a19ac4fd47000c6ba241691c1c720c')
 
 prepare() {
@@ -25,8 +25,6 @@ prepare() {
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  export CC=$(which gcc-10)
-  export CXX=$(which g++-10)
   cmake .
   make
 }
diff --git a/umoria-5.7.15-aur.patch b/umoria-5.7.15-aur.patch
index ac17e2f346ad..9bcfd60a4cba 100644
--- a/umoria-5.7.15-aur.patch
+++ b/umoria-5.7.15-aur.patch
@@ -1,5 +1,5 @@
 --- umoria/src/config.cpp	2021-02-11 14:59:45.144360084 -0500
-+++ umoria-aur/src/config.cpp	2021-02-11 16:18:20.813930047 -0500
++++ umoria/src/config.cpp	2021-02-11 16:18:20.813930047 -0500
 @@ -13,18 +13,18 @@
      // Data files used by Umoria
      // NOTE: use relative paths to the executable binary.
@@ -32,13 +32,12 @@
  
      // 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)
++++ umoria/CMakeLists.txt	2021-06-21 15:46:20.751269954 -0400
+@@ -33,7 +33,6 @@
+ set(cxx_warnings "${cxx_warnings} -Wextra")
+ set(cxx_warnings "${cxx_warnings} -Wpedantic")
+ set(cxx_warnings "${cxx_warnings} -Wshadow")
+-set(cxx_warnings "${cxx_warnings} -Werror")
+ set(cxx_warnings "${cxx_warnings} -pedantic-errors")
+ set(cxx_warnings "${cxx_warnings} -Weffc++ ")