upgpkg: unknown-horizons 2019.1-5

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88e6e87d4790..9424f0ce3d00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = unknown-horizons
 	pkgdesc = 2D realtime strategy simulation with an emphasis on economy and city building.
 	pkgver = 2019.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.unknown-horizons.org/
 	changelog = .CHANGELOG
 	arch = any
@@ -19,9 +19,11 @@ pkgbase = unknown-horizons
 	source = unknown-horizons-2019.1.src.tar.gz::https://github.com/unknown-horizons/unknown-horizons/archive/2019.1.tar.gz
 	source = unknown-horizons-[PATCH]-replace-deprecated-to-distro-package-(#2910).patch::https://github.com/unknown-horizons/unknown-horizons/commit/2fdb225f62f66bf474e19d9b1bcfbaf691672c43.patch
 	source = unknown-horizons-[PATCH]-SyntaxWarning:-"is"-with-a-literal.-(#2924).patch::https://github.com/unknown-horizons/unknown-horizons/commit/05267e0d7f1223ddd0517f4f02c4d8444668f559.patch
+	source = unknown-horizons-[PATCH]-fixs-for-Phyton-3.9-(#2955).patch::https://github.com/unknown-horizons/unknown-horizons/commit/7f6f613826aef9810999c1599c8354e8a78fbdb4.patch
 	sha512sums = 87ae37442ee0b80130c7a75c7eeb7c0ef6c50f3e6b2616db32e6381ace5068729ab7086edefc00eefd3b89e85f9a05fb6c4d05f2a2adc46fa928e5c2a29b72db
 	sha512sums = c5f046b88921d39870bffc0d7883d9541026243d02031f371de155e375794af825e57f67b5ef39dc8a24e8f63d407d1e25ac2f99e7096a304d25acc94f01ea9e
 	sha512sums = 59d2508b67e304857d8f29cde2bd195ee2dd06270b84c1d2bddeb7cb4737bcfa4894f2493630e21b4ac63db76c206c94786a642a9ca4d077f914a8fa8658bbc3
+	sha512sums = 8cabb33b3cd8139df7db5da4c235be0e8eb3439abb825b65b18ce0db3b61a4e6217f4b3a06eff71f9596deafb7fec56ebf13ac080ade16be81065549d0f75e4b
 
 pkgname = unknown-horizons
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a3152a87557..db63aedece3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,11 @@
 # Contributor: andy123 < ajs AT online DOT de >
 # Contributor: Deather <deather.jeuxlinux@gmail.com>
 # Contributor: Ronan Rabouin <darkbaboon@gmail.com>
+# shellcheck disable=SC2034,2154
 
 pkgname=unknown-horizons
 pkgver=2019.1
-pkgrel=4
+pkgrel=5
 pkgdesc="2D realtime strategy simulation with an emphasis on economy and city building."
 arch=('any')
 url="http://www.unknown-horizons.org/"
@@ -19,28 +20,32 @@ makedepends=('intltool' 'python-setuptools' 'python-distro')
 conflicts=('unknown-horizons-git')
 source=("$pkgname-$pkgver.src.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz"
         "$pkgname-[PATCH]-replace-deprecated-to-distro-package-(#2910).patch::https://github.com/$pkgname/$pkgname/commit/2fdb225f62f66bf474e19d9b1bcfbaf691672c43.patch"
-        "$pkgname-[PATCH]-SyntaxWarning:-\"is\"-with-a-literal.-(#2924).patch::https://github.com/$pkgname/$pkgname/commit/05267e0d7f1223ddd0517f4f02c4d8444668f559.patch")
+        "$pkgname-[PATCH]-SyntaxWarning:-\"is\"-with-a-literal.-(#2924).patch::https://github.com/$pkgname/$pkgname/commit/05267e0d7f1223ddd0517f4f02c4d8444668f559.patch"
+        "$pkgname-[PATCH]-fixs-for-Phyton-3.9-(#2955).patch::https://github.com/$pkgname/$pkgname/commit/7f6f613826aef9810999c1599c8354e8a78fbdb4.patch")
 sha512sums=('87ae37442ee0b80130c7a75c7eeb7c0ef6c50f3e6b2616db32e6381ace5068729ab7086edefc00eefd3b89e85f9a05fb6c4d05f2a2adc46fa928e5c2a29b72db'
             'c5f046b88921d39870bffc0d7883d9541026243d02031f371de155e375794af825e57f67b5ef39dc8a24e8f63d407d1e25ac2f99e7096a304d25acc94f01ea9e'
-            '59d2508b67e304857d8f29cde2bd195ee2dd06270b84c1d2bddeb7cb4737bcfa4894f2493630e21b4ac63db76c206c94786a642a9ca4d077f914a8fa8658bbc3')
+            '59d2508b67e304857d8f29cde2bd195ee2dd06270b84c1d2bddeb7cb4737bcfa4894f2493630e21b4ac63db76c206c94786a642a9ca4d077f914a8fa8658bbc3'
+            '8cabb33b3cd8139df7db5da4c235be0e8eb3439abb825b65b18ce0db3b61a4e6217f4b3a06eff71f9596deafb7fec56ebf13ac080ade16be81065549d0f75e4b')
 
 prepare() {
-    cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver" || exit
     patch --forward --strip=1 \
         --input="$srcdir/$pkgname-[PATCH]-replace-deprecated-to-distro-package-(#2910).patch"
     patch --forward --strip=1 \
         --input="$srcdir/$pkgname-[PATCH]-SyntaxWarning:-\"is\"-with-a-literal.-(#2924).patch"
+    patch --forward --strip=1 \
+    --input="$srcdir/$pkgname-[PATCH]-fixs-for-Phyton-3.9-(#2955).patch"
 }
 
 # unknown-horizons build system misses a few files if the build step is seperated from the install
 # step
 build() {
-    cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver" || exit
     # UH_USER_DIR="UH_USER_DIR" python setup.py build
     UH_USER_DIR="UH_USER_DIR" python horizons/engine/generate_atlases.py 2048
 }
 
 package() {
-    cd "$pkgname-$pkgver"
+    cd "$pkgname-$pkgver" || exit
     UH_USER_DIR="UH_USER_DIR" python setup.py install --root="$pkgdir/" --optimize=1 #--skip-build
 }