New bugfix release 1.1.3. Explicitly set and use Java 8 for build and runtime.

3 files changed, 28 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fb900a5357d..ff62527fae3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mapton
 	pkgdesc = Some kind of map application
-	pkgver = 1.1.2
-	pkgrel = 2
+	pkgver = 1.1.3
+	pkgrel = 1
 	url = https://mapton.org
 	arch = any
 	license = Apache
@@ -10,14 +10,12 @@ pkgbase = mapton
 	makedepends = jdk8-openjdk
 	makedepends = java8-openjfx
 	makedepends = maven
-	source = git+https://github.com/trixon/mapton.git#commit=1cb5a943593498ca92544b097a60e05351430487
+	source = git+https://github.com/trixon/mapton.git#tag=v1.1.3
 	source = mapton.desktop
-	source = git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
-	source = git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f
+	source = jdkhome.patch
 	sha256sums = SKIP
 	sha256sums = 303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 16a6788545ecc091bc56057def2362db0de3cea4705d675ee769070136b40f40
 
 pkgname = mapton
 	depends = java-runtime>=8
diff --git a/PKGBUILD b/PKGBUILD
index 3bcee7ca3b2e..70951bc0644e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,36 @@
 # Maintainer: Jonathon Fernyhough <jonathon_at_manjaro dot+org>
 
 pkgname=mapton
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Some kind of map application"
 arch=(any)
 url="https://mapton.org"
 license=('Apache')
 makedepends=('git' 'jre8-openjdk' 'jdk8-openjdk' 'java8-openjfx' 'maven')
 
-_commit=1cb5a943593498ca92544b097a60e05351430487
-source=(git+https://github.com/trixon/mapton.git#commit=$_commit
+source=(git+https://github.com/trixon/mapton.git#tag=v$pkgver
         mapton.desktop
-        git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
-        git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f)
+        jdkhome.patch)
 sha256sums=('SKIP'
             '303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7'
-            'SKIP'
-            'SKIP')
+            '16a6788545ecc091bc56057def2362db0de3cea4705d675ee769070136b40f40')
 
 export HOME=/nonexistent
 
 prepare() {
 	cd $pkgname
-	ln -sf ../almond3
-	ln -sf ../GMapsFX
+	patch -Np1 -i ../jdkhome.patch
 }
 
 build() {
+	# Requires JDK8
+	export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+
 	MAVENCACHE="${SRCDEST:-$srcdir}"
 	export MAVENCACHE
 
-	cd "$srcdir"/$pkgname/almond3
-	mvn clean install -gs "$srcdir"/../settings.xml
-
-	cd "$srcdir"/$pkgname/GMapsFX/GMapsFX
-	mvn clean install -gs "$srcdir"/../settings.xml -Dmaven.javadoc.skip=true
-
-	cd "$srcdir"/$pkgname
+	cd $pkgname
 	mvn -e package -gs "$srcdir"/../settings.xml
 }
 
diff --git a/jdkhome.patch b/jdkhome.patch
new file mode 100644
index 000000000000..7d81c75f17d3
--- /dev/null
+++ b/jdkhome.patch
@@ -0,0 +1,13 @@
+diff --git a/application/src/main/resources/mapton.conf b/application/src/main/resources/mapton.conf
+index dc30143..26913b0 100644
+--- a/application/src/main/resources/mapton.conf
++++ b/application/src/main/resources/mapton.conf
+@@ -10,7 +10,7 @@ default_options="--branding mapton -J-Xss2m -J-Dnetbeans.logger.console=true -J-
+ # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
+ 
+ # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
+-#jdkhome="/path/to/jdk"
++jdkhome="/usr/lib/jvm/java-8-openjdk"
+ 
+ # clusters' paths separated by path.separator (semicolon on Windows, colon on Unices)
+ #extra_clusters=