New snapshot. Build from source.

4 files changed, 61 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ed01e6d35c4..bb887a1a805d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
 pkgbase = mapton
 	pkgdesc = Some kind of map application
 	pkgver = 0.8.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://mapton.org
 	arch = any
-	license = GPL
-	source = https://mapton.org/files/mapton-0.8.0-SNAPSHOT.zip
+	license = Apache
+	makedepends = git
+	makedepends = maven
+	depends = java-runtime>=8
+	depends = java-openjfx
+	source = git+https://github.com/trixon/mapton.git#commit=ba1ca79f23ffc96404997e4ae1cbe8dffab0c732
 	source = mapton.desktop
-	sha256sums = dc5dd79257768765bc7b28a3cf3084d78a94f797c7f1defeecde1c3bb264abfc
-	sha256sums = a51a83f390dc75fd8164f94954dc2a28fa7efe8e2274c9ded45412a2bc2bd169
+	source = git+https://github.com/trixon/almond3.git#commit=dd953cd8dd6da0faee1a82d334e200bbe02a37eb
+	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 = java-openjfx
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a247f7af603..1f8e272a5738 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,61 @@
 
 pkgname=mapton
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Some kind of map application"
 arch=(any)
 url="https://mapton.org"
 license=('Apache')
-source=("$url/files/$pkgname-$pkgver-SNAPSHOT.zip"
-        mapton.desktop)
-sha256sums=('dc5dd79257768765bc7b28a3cf3084d78a94f797c7f1defeecde1c3bb264abfc'
-            'a51a83f390dc75fd8164f94954dc2a28fa7efe8e2274c9ded45412a2bc2bd169')
+depends=('java-runtime>=8' 'java-openjfx')
+makedepends=('git' 'maven')
+
+_commit=ba1ca79f23ffc96404997e4ae1cbe8dffab0c732
+source=(git+https://github.com/trixon/mapton.git#commit=$_commit
+        mapton.desktop
+        git+https://github.com/trixon/almond3.git#commit=dd953cd8dd6da0faee1a82d334e200bbe02a37eb
+        git+https://github.com/rterp/GMapsFX.git#commit=4623d3f768e8ad78fc50ee32dd204d236e01059f)
+sha256sums=('SKIP'
+            '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' 'java-openjfx')
+	cd mapton/application/target/mapton
 
 	# Initial target directories
-	install -d $pkgdir/opt/mapton $pkgdir/usr/bin
+	install -d "$pkgdir"/opt/mapton "$pkgdir"/usr/bin
 
 	# Majority of files, ensure file permissions are correct
-	cp -r mapton/{etc,extra,mapton,platform} $pkgdir/opt/mapton
-	rm -f $pkgdir/opt/mapton/bin/*.exe
-	chmod -R u=rwX,go=rX $pkgdir/opt
+	cp -r {etc,extra,mapton,platform} "$pkgdir"/opt/mapton
+	rm -f "$pkgdir"/opt/mapton/bin/*.exe
+	chmod -R u=rwX,go=rX "$pkgdir"/opt
 
 	# Executables and launchers
-	install -D mapton/bin/mapton $pkgdir/opt/mapton/bin/mapton
-	ln -s /opt/mapton/bin/mapton $pkgdir/usr/bin/mapton
-	install -D mapton.desktop $pkgdir/usr/share/applications/mapton.desktop
+	install -D bin/mapton "$pkgdir"/opt/mapton/bin/mapton
+	ln -s /opt/mapton/bin/mapton "$pkgdir"/usr/bin/mapton
+	install -D "$srcdir"/mapton.desktop "$pkgdir"/usr/share/applications/mapton.desktop
+	install -Dm644 "$srcdir"/mapton/mapton.png "$pkgdir"/usr/share/pixmaps/mapton.png
 }
 
diff --git a/mapton.desktop b/mapton.desktop
index 601da799bea9..4d976c252269 100755
--- a/mapton.desktop
+++ b/mapton.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Mapton
 Comment=Some kind of map application
 Exec=mapton
-Icon=gnome-maps
+Icon=mapton
 Terminal=false
 Categories=Application;Education;
 StartupNotify=true
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000000..8418db3c4cc4
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,3 @@
+<settings>
+	<localRepository>${env.MAVENCACHE}/maptoncache</localRepository>
+</settings>