Revert "Remove unnecessary dependency repos. Make explicit java8-openjfx."

This reverts commit a0f9dbf2d931a0b1abc293075b8121687517e37d.

2 files changed, 28 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ffe1521c5b0..b07fcddbea73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = mapton
 	pkgdesc = Some kind of map application
 	pkgver = 1.1.2
-	pkgrel = 2
+	pkgrel = 1
 	url = https://mapton.org
 	arch = any
 	license = Apache
 	makedepends = git
 	makedepends = jre8-openjdk
 	makedepends = jdk8-openjdk
-	makedepends = java8-openjfx
+	makedepends = java-openjfx
 	makedepends = maven
 	source = git+https://github.com/trixon/mapton.git#commit=1cb5a943593498ca92544b097a60e05351430487
 	source = mapton.desktop
+	source = git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
+	source = git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f
 	sha256sums = SKIP
 	sha256sums = 303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = mapton
 	depends = java-runtime>=8
-	depends = java8-openjfx
+	depends = java-openjfx
 
diff --git a/PKGBUILD b/PKGBUILD
index 5148cdd16eae..a6e0f5ad9185 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,47 @@
 
 pkgname=mapton
 pkgver=1.1.2
-pkgrel=2
+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')
+makedepends=('git' 'jre8-openjdk' 'jdk8-openjdk' 'java-openjfx' 'maven')
 
 _commit=1cb5a943593498ca92544b097a60e05351430487
 source=(git+https://github.com/trixon/mapton.git#commit=$_commit
-        mapton.desktop)
+        mapton.desktop
+        git+https://github.com/trixon/almond3.git#commit=2019f5ca723e4a7372fdf81ee9e0199c32da1204
+        git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f)
 sha256sums=('SKIP'
-            '303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7')
+            '303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7'
+            'SKIP'
+            'SKIP')
 
 export HOME=/nonexistent
 
+prepare() {
+	cd $pkgname
+	ln -sf ../almond3
+	ln -sf ../GMapsFX
+}
+
 build() {
 	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
 	mvn -e package -gs "$srcdir"/../settings.xml
 }
 
 package() {
-	depends=('java-runtime>=8' 'java8-openjfx')
+	depends=('java-runtime>=8' 'java-openjfx')
 	cd mapton/application/target/mapton
 
 	# Initial target directories