upgpkg: unknown-horizons 2019.1-6

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9424f0ce3d00..fe68f2efa18b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = unknown-horizons
 	pkgdesc = 2D realtime strategy simulation with an emphasis on economy and city building.
 	pkgver = 2019.1
-	pkgrel = 5
-	url = http://www.unknown-horizons.org/
+	pkgrel = 6
+	url = https://unknown-horizons.org/
 	changelog = .CHANGELOG
 	arch = any
 	license = GPL
@@ -16,14 +16,15 @@ pkgbase = unknown-horizons
 	depends = python-yaml
 	depends = python-future
 	conflicts = unknown-horizons-git
-	source = unknown-horizons-2019.1.src.tar.gz::https://github.com/unknown-horizons/unknown-horizons/archive/2019.1.tar.gz
+	source = unknown-horizons-2019.1.src.tar.gz::https://github.com/unknown-horizons/unknown-horizons/archive/refs/tags/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
+	source = unknown-horizons-[PATCH]-Python-Pillow-10-compatibility-(#2962)::https://github.com/unknown-horizons/unknown-horizons/commit/d543cd4d57afcf8dc24b2bac4b124b4a2a8cc658.patch
 	sha512sums = 87ae37442ee0b80130c7a75c7eeb7c0ef6c50f3e6b2616db32e6381ace5068729ab7086edefc00eefd3b89e85f9a05fb6c4d05f2a2adc46fa928e5c2a29b72db
-	sha512sums = c5f046b88921d39870bffc0d7883d9541026243d02031f371de155e375794af825e57f67b5ef39dc8a24e8f63d407d1e25ac2f99e7096a304d25acc94f01ea9e
-	sha512sums = 59d2508b67e304857d8f29cde2bd195ee2dd06270b84c1d2bddeb7cb4737bcfa4894f2493630e21b4ac63db76c206c94786a642a9ca4d077f914a8fa8658bbc3
-	sha512sums = 8cabb33b3cd8139df7db5da4c235be0e8eb3439abb825b65b18ce0db3b61a4e6217f4b3a06eff71f9596deafb7fec56ebf13ac080ade16be81065549d0f75e4b
+	sha512sums = d9d9fece7f7f18590027d1094ab7b86241ea17870414f5e56205e269d2084f0ee7a31f050412135a678cbc15e57e5ec618afb1b89c13b7a3fe4f858b69e01dde
+	sha512sums = 0c131311eab19d4f5a45726187f4e87dd1a1af25e75559078df1836f2c13d013bfdfd32a8c57cfe1e571a4a2109730865dcd32f19ed618892e44a3377c6ade1b
+	sha512sums = fe47ea81f353fa26987f609c05a77729369b234a12903f9f977614eaa7dabeb720fa369901e8898ce094e36ecb350773aca48ba3addc6617a34c913cb3b895b0
+	sha512sums = 2503710df7dcec1ba1e399cbe724f1fbe650515961f0bb940957ce2358b99746876b0818f4c4052fcd81b34c9c964b0d3f9319287388b531495af41a5fade573
 
 pkgname = unknown-horizons
-
diff --git a/PKGBUILD b/PKGBUILD
index db63aedece3e..227d4cd4a0e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,27 +5,30 @@
 # Contributor: andy123 < ajs AT online DOT de >
 # Contributor: Deather <deather.jeuxlinux@gmail.com>
 # Contributor: Ronan Rabouin <darkbaboon@gmail.com>
-# shellcheck disable=SC2034,2154
+# shellcheck shell=bash
+# shellcheck disable=SC2034,SC2154
 
 pkgname=unknown-horizons
 pkgver=2019.1
-pkgrel=5
+pkgrel=6
 pkgdesc="2D realtime strategy simulation with an emphasis on economy and city building."
 arch=('any')
-url="http://www.unknown-horizons.org/"
+url="https://unknown-horizons.org/"
 license=('GPL' 'CCPL')
 changelog=.CHANGELOG
 depends=('fife' 'python' 'python-pillow' 'python-yaml' 'python-future')
 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"
+source=("$pkgname-$pkgver.src.tar.gz::https://github.com/$pkgname/$pkgname/archive/refs/tags/$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]-fixs-for-Phyton-3.9-(#2955).patch::https://github.com/$pkgname/$pkgname/commit/7f6f613826aef9810999c1599c8354e8a78fbdb4.patch")
+        "$pkgname-[PATCH]-fixs-for-Phyton-3.9-(#2955).patch::https://github.com/$pkgname/$pkgname/commit/7f6f613826aef9810999c1599c8354e8a78fbdb4.patch"
+        "$pkgname-[PATCH]-Python-Pillow-10-compatibility-(#2962)::https://github.com/$pkgname/$pkgname/commit/d543cd4d57afcf8dc24b2bac4b124b4a2a8cc658.patch")
 sha512sums=('87ae37442ee0b80130c7a75c7eeb7c0ef6c50f3e6b2616db32e6381ace5068729ab7086edefc00eefd3b89e85f9a05fb6c4d05f2a2adc46fa928e5c2a29b72db'
-            'c5f046b88921d39870bffc0d7883d9541026243d02031f371de155e375794af825e57f67b5ef39dc8a24e8f63d407d1e25ac2f99e7096a304d25acc94f01ea9e'
-            '59d2508b67e304857d8f29cde2bd195ee2dd06270b84c1d2bddeb7cb4737bcfa4894f2493630e21b4ac63db76c206c94786a642a9ca4d077f914a8fa8658bbc3'
-            '8cabb33b3cd8139df7db5da4c235be0e8eb3439abb825b65b18ce0db3b61a4e6217f4b3a06eff71f9596deafb7fec56ebf13ac080ade16be81065549d0f75e4b')
+            'd9d9fece7f7f18590027d1094ab7b86241ea17870414f5e56205e269d2084f0ee7a31f050412135a678cbc15e57e5ec618afb1b89c13b7a3fe4f858b69e01dde'
+            '0c131311eab19d4f5a45726187f4e87dd1a1af25e75559078df1836f2c13d013bfdfd32a8c57cfe1e571a4a2109730865dcd32f19ed618892e44a3377c6ade1b'
+            'fe47ea81f353fa26987f609c05a77729369b234a12903f9f977614eaa7dabeb720fa369901e8898ce094e36ecb350773aca48ba3addc6617a34c913cb3b895b0'
+            '2503710df7dcec1ba1e399cbe724f1fbe650515961f0bb940957ce2358b99746876b0818f4c4052fcd81b34c9c964b0d3f9319287388b531495af41a5fade573')
 
 prepare() {
     cd "$pkgname-$pkgver" || exit
@@ -34,11 +37,12 @@ prepare() {
     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"
+        --input="$srcdir/$pkgname-[PATCH]-fixs-for-Phyton-3.9-(#2955).patch"
+    patch --forward --strip=1 \
+        --input="$srcdir/$pkgname-[PATCH]-Python-Pillow-10-compatibility-(#2962)"
 }
 
-# unknown-horizons build system misses a few files if the build step is seperated from the install
-# step
+# unknown-horizons build system misses a few files if the build step is seperated from the install step
 build() {
     cd "$pkgname-$pkgver" || exit
     # UH_USER_DIR="UH_USER_DIR" python setup.py build