summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
-rw-r--r--freecol-git.sh4
3 files changed, 14 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08d663be7dde..f8f614554d8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = freecol-git
pkgdesc = A turn-based strategy game based on Colonization, git version
- pkgver = 0.16534.3c9127262
- pkgrel = 1
+ pkgver = 0.16652.031fa8159
+ pkgrel = 2
url = http://www.freecol.org/
arch = any
- license = GPL
+ license = GPL-2.0-or-later
makedepends = git
makedepends = ant
makedepends = junit
@@ -13,7 +13,7 @@ pkgbase = freecol-git
source = freecol-git::git+https://git.code.sf.net/p/freecol/git
source = freecol-git.sh
sha512sums = SKIP
- sha512sums = 1534ddff8427045577aaf14277142e4fbf6857a4ecf6221fcf4e42b747ac2cbd307a9a54a75b110bd0577e7b033ef2a66574d6e7f648c2966d9a5d3cfb0e2027
+ sha512sums = ddaf6ee6841fc99143b5cb53e88f3d377143c84c7785d2564d864040da47f086d16c443188377139d164aac49ea57a78fd355676949cb93e5e3c9678b59128fd
pkgname = freecol-git
depends = java-runtime-openjdk>=11
diff --git a/PKGBUILD b/PKGBUILD
index d1dc14561643..1502aab90ef5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,18 @@
# java 11 is current minimum & recommended version for building/playing freecol, but at runtime newer versions should work also.
pkgname=freecol-git
-pkgver=0.16534.3c9127262
-pkgrel=1
+pkgver=0.16652.031fa8159
+pkgrel=2
pkgdesc="A turn-based strategy game based on Colonization, git version"
arch=('any')
url="http://www.freecol.org/"
-license=('GPL')
+license=('GPL-2.0-or-later')
makedepends=('git' 'ant' 'junit' 'texlive-core' 'java-environment-openjdk=11')
source=("$pkgname::git+https://git.code.sf.net/p/freecol/git"
- 'freecol-git.sh')
+ 'freecol-git.sh'
+)
sha512sums=('SKIP'
- '1534ddff8427045577aaf14277142e4fbf6857a4ecf6221fcf4e42b747ac2cbd307a9a54a75b110bd0577e7b033ef2a66574d6e7f648c2966d9a5d3cfb0e2027')
+ 'ddaf6ee6841fc99143b5cb53e88f3d377143c84c7785d2564d864040da47f086d16c443188377139d164aac49ea57a78fd355676949cb93e5e3c9678b59128fd')
pkgver() {
cd $pkgname
diff --git a/freecol-git.sh b/freecol-git.sh
index 150570e190e3..c5b149349e5c 100644
--- a/freecol-git.sh
+++ b/freecol-git.sh
@@ -1,5 +1,9 @@
#!/bin/bash
export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
+# While freecol can be run with openjdk11 or later, running it with openjdk 11 is preferred.
+# The above export PATH ensures that if openjdk 11 is present it will be found & used.
_FC_PATH=/usr/share/java/freecol-git
exec java -Xms4096M -Xmx4096M -jar $_FC_PATH/FreeCol.jar --freecol-data $_FC_PATH/data "$@"
+# freecol used to run slow and with problems on systems where it didn't get enough memory.
+# This has been improved in recent versions but it still runs better with more memory available.