From b42a3e9607dec37cb3eea824907dd38780cc7c89 Mon Sep 17 00:00:00 2001
From: tiziodcaio <daniele05.bass@gmail.com>
Date: Sat, 18 Dec 2021 19:52:15 +0100
Subject: [PATCH] Update to latest version

---
 .SRCINFO | 14 +++++++-------
 PKGBUILD | 17 ++++++++---------
 Unciv.sh |  1 -
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 33401e2dc7d80..2a1dadb5d30a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = unciv-bin
 	pkgdesc = Open-source remake of Civilization V
-	pkgver = 3.18.9_patch1
+	pkgver = 3.18.10_patch1
 	pkgrel = 1
 	url = https://github.com/yairm210/Unciv
 	arch = any
 	license = MPL-2.0
-	depends = jre8-openjdk
+	depends = java-environment>8
 	depends = bash
 	depends = xorg-xrandr
 	provides = unciv
 	conflicts = unciv
-	noextract = Unciv-3.18.9-patch1.jar
-	source = Unciv-3.18.9-patch1.jar::https://github.com/yairm210/Unciv/releases/download/3.18.9-patch1/Unciv.jar
-	source = unciv-3.18.9-patch1.png::https://raw.githubusercontent.com/yairm210/Unciv/3.18.9-patch1/extraImages/Unciv%20icon%20v4.png
+	noextract = Unciv-3.18.10-patch1.jar
+	source = Unciv.jar::https://github.com/yairm210/Unciv/releases/download/3.18.10-patch1/Unciv.jar
+	source = unciv-3.18.10-patch1.png::https://raw.githubusercontent.com/yairm210/Unciv/3.18.10-patch1/extraImages/Unciv%20icon%20v4.png
 	source = Unciv.sh
 	source = Unciv.desktop
-	md5sums = f3874851f8503728bf4e84d2d0e35084
+	md5sums = 68c2841a28c7892639659eb82e4e7138
 	md5sums = 5aca7fc33f121fcf901fef14f784731a
-	md5sums = f8eab098f20681b8db232cc5709713d3
+	md5sums = b5c3190a1616e545df32536920e07c98
 	md5sums = 42d5f7ea8ee48d2d643d070786f039ba
 
 pkgname = unciv-bin
diff --git a/PKGBUILD b/PKGBUILD
index 90e9a9216fd8d..fefc68cbe6428 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,33 @@
 
 pkgname=unciv-bin
 _pkgname=Unciv
-_pkgver=3.18.9-patch1
+_pkgver=3.18.10-patch1
 pkgver=${_pkgver//-/_}
 pkgrel=1
 pkgdesc="Open-source remake of Civilization V"
 url="https://github.com/yairm210/Unciv"
 license=('MPL-2.0')
-depends=('jre8-openjdk' 'bash' 'xorg-xrandr')
+depends=('java-runtime>=8' 'bash' 'xorg-xrandr')
 provides=('unciv')
 conflicts=('unciv')
 arch=('any')
 source=(
-  "$_pkgname-$_pkgver.jar::https://github.com/yairm210/Unciv/releases/download/$_pkgver/Unciv.jar"
-  "unciv-$_pkgver.png::https://raw.githubusercontent.com/yairm210/Unciv/$_pkgver/extraImages/Unciv%20icon%20v4.png"
+  "$_pkgname.jar::https://github.com/yairm210/$_pkgname/releases/download/$_pkgver/$_pkgname.jar"
+  "unciv-$_pkgver.png::https://raw.githubusercontent.com/yairm210/$_pkgname/$_pkgver/extraImages/Unciv%20icon%20v4.png"
   "$_pkgname.sh"
   "$_pkgname.desktop"
 )
 noextract=(
 	"$_pkgname-$_pkgver.jar"
 )
-md5sums=('f3874851f8503728bf4e84d2d0e35084'
+md5sums=('68c2841a28c7892639659eb82e4e7138'
          '5aca7fc33f121fcf901fef14f784731a'
-         'f8eab098f20681b8db232cc5709713d3'
+         'b5c3190a1616e545df32536920e07c98'
          '42d5f7ea8ee48d2d643d070786f039ba')
 
 package() {
   install -Dm755 $_pkgname.sh "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 unciv-$_pkgver.png "$pkgdir/usr/share/pixmaps/unciv.png"
-  install -Dm644 $_pkgname-$_pkgver.jar "$pkgdir/usr/share/$_pkgname/$_pkgname.jar"
+  install -Dm644 unciv-$_pkgver.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 $_pkgname.jar "$pkgdir/usr/share/$_pkgname/$_pkgname.jar"
 }
-
diff --git a/Unciv.sh b/Unciv.sh
index 22e51b2b99bb0..7e2d95ca5efeb 100644
--- a/Unciv.sh
+++ b/Unciv.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
 CONFIG_DIR="$HOME/.local/share/Unciv"
 
 USAGE="Unciv [--help | -h | --config-dir PATH]