Update to 5.3.5

3 files changed, 9 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17a4bcf744ff..539a17a6701e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wyrmsun
 	pkgdesc = Real-time strategy game based on history, mythology and fiction
-	pkgver = 5.3.4
+	pkgver = 5.3.5
 	pkgrel = 1
 	url = http://andrettin.github.io/
 	arch = i686
@@ -14,11 +14,9 @@ pkgbase = wyrmsun
 	depends = qt5-multimedia
 	depends = sdl_mixer
 	depends = tolua++
-	source = wyrmsun-5.3.4.tar.gz::https://github.com/Andrettin/Wyrmsun/archive/v5.3.4.tar.gz
-	source = wyrmgus-5.3.4.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v5.3.4.tar.gz
-	source = 5_3_4_source_location.patch
-	md5sums = ce43520e9b2020fa1c341df4a8d4272d
-	md5sums = 7b578710922a10b807b3b56d144a76d6
-	md5sums = 530da5bea60ef115e66a7c491d99f9ce
+	source = wyrmsun-5.3.5.tar.gz::https://github.com/Andrettin/Wyrmsun/archive/v5.3.5.tar.gz
+	source = wyrmgus-5.3.5.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v5.3.5.tar.gz
+	md5sums = f519b26169499e52517196b24813d2ac
+	md5sums = 73b2e1bf4e29c0663af23d025c104f7c
 
 pkgname = wyrmsun
diff --git a/5_3_4_source_location.patch b/5_3_4_source_location.patch
deleted file mode 100644
index 79ea6684c51c..000000000000
--- a/5_3_4_source_location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --color --unified --recursive --text Wyrmgus-5.3.4/src/util/assert_util.h Wyrmgus-5.3.4_fix/src/util/assert_util.h
---- Wyrmgus-5.3.4/src/util/assert_util.h	2022-02-02 00:56:57.000000000 +0300
-+++ Wyrmgus-5.3.4_fix/src/util/assert_util.h	2022-02-09 12:17:11.199389421 +0300
-@@ -26,6 +26,9 @@
- 
- #pragma once
- 
-+#include <source_location>
-+#include <string>
-+
- namespace wyrmgus {
- 
- inline std::string get_source_relative_filepath_string(const std::string &filepath)
diff --git a/PKGBUILD b/PKGBUILD
index d8296da9e444..06ce49ee84ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: MCMic <come@chilliet.eu>
 
 pkgname=wyrmsun
-pkgver=5.3.4
+pkgver=5.3.5
 pkgrel=1
 pkgdesc="Real-time strategy game based on history, mythology and fiction"
 arch=('i686' 'x86_64')
@@ -17,18 +17,9 @@ depends=(
 )
 makedepends=('boost' 'cmake' 'glu')
 source=("wyrmsun-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmsun/archive/v${pkgver}.tar.gz"
-        "wyrmgus-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v${pkgver}.tar.gz"
-        '5_3_4_source_location.patch')
-md5sums=('ce43520e9b2020fa1c341df4a8d4272d'
-         '7b578710922a10b807b3b56d144a76d6'
-         '530da5bea60ef115e66a7c491d99f9ce')
-
-prepare() {
-  cd "${srcdir}/Wyrmgus-${pkgver}"
-
-  # https://github.com/Andrettin/Wyrmgus/issues/179
-  patch --forward --strip=1 --input="${srcdir}/5_3_4_source_location.patch"
-}
+        "wyrmgus-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v${pkgver}.tar.gz")
+md5sums=('f519b26169499e52517196b24813d2ac'
+         '73b2e1bf4e29c0663af23d025c104f7c')
 
 build() {
   cd "${srcdir}/Wyrmgus-${pkgver}"