diff options
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | jdkhome.patch | 8 |
3 files changed, 29 insertions, 30 deletions
@@ -1,23 +1,24 @@ pkgbase = mapton pkgdesc = Some kind of map application - pkgver = 1.1.3 + pkgver = 2.1.0 pkgrel = 1 url = https://mapton.org arch = any license = Apache makedepends = git - makedepends = jre8-openjdk - makedepends = jdk8-openjdk - makedepends = java8-openjfx + makedepends = jdk11-openjdk + makedepends = java11-openjfx makedepends = maven - source = git+https://github.com/trixon/mapton.git#tag=v1.1.3 + source = git+https://github.com/trixon/mapton.git#tag=v2.1.0 source = mapton.desktop source = jdkhome.patch - sha256sums = SKIP - sha256sums = 303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7 - sha256sums = 16a6788545ecc091bc56057def2362db0de3cea4705d675ee769070136b40f40 + source = settings.xml + b2sums = SKIP + b2sums = 514d31d2d2f17f53382624f390e02469e19d0a60cd44aa52db1011429b2fa313038c9c04b262b5b29393e38ce6bc7a702d5c23058a5790ad053c7e5ae74e19bd + b2sums = 5dab7052dfe1c612eb6563178bf7ba7ba8245411c6b60428b302c4f570f552ef96a1fcf08b873e39c7e8f8195a1de0c9dee115f0434950452c4d4fe2c152e0cb + b2sums = 703df64460b6f8868c2b2be2b3323e6db14f63a5c4b3f2d3ea0b6249c727b48893472a4baf718516df2a129ff16ac14345b0666843c8f36bfb0fd48fb2898c80 pkgname = mapton - depends = java-runtime>=8 - depends = java8-openjfx + depends = java-runtime>=11 + depends = java11-openjfx @@ -1,22 +1,22 @@ -# Maintainer: Jonathon Fernyhough <jonathon_at_manjaro dot+org> +# Maintainer: Jonathon Fernyhough <jonathon_at_m2x dotdev> pkgname=mapton -pkgver=1.1.3 +pkgver=2.1.0 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' 'jdk11-openjdk' 'java11-openjfx' 'maven') source=(git+https://github.com/trixon/mapton.git#tag=v$pkgver mapton.desktop - jdkhome.patch) -sha256sums=('SKIP' - '303620b07b9a48324acfa2541a1f93fe5630cca7919cd5b5b1141f0ffe7b6cd7' - '16a6788545ecc091bc56057def2362db0de3cea4705d675ee769070136b40f40') - -export HOME=/nonexistent + jdkhome.patch + settings.xml) +b2sums=('SKIP' + '514d31d2d2f17f53382624f390e02469e19d0a60cd44aa52db1011429b2fa313038c9c04b262b5b29393e38ce6bc7a702d5c23058a5790ad053c7e5ae74e19bd' + '5dab7052dfe1c612eb6563178bf7ba7ba8245411c6b60428b302c4f570f552ef96a1fcf08b873e39c7e8f8195a1de0c9dee115f0434950452c4d4fe2c152e0cb' + '703df64460b6f8868c2b2be2b3323e6db14f63a5c4b3f2d3ea0b6249c727b48893472a4baf718516df2a129ff16ac14345b0666843c8f36bfb0fd48fb2898c80') prepare() { cd $pkgname @@ -24,18 +24,16 @@ prepare() { } build() { - # Requires JDK8 - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk - - MAVENCACHE="${SRCDEST:-$srcdir}" - export MAVENCACHE + export HOME="$srcdir" # Try to prevent maven from escaping the build root + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk # Requires JDK11 + export MAVENCACHE="${SRCDEST:-$srcdir}" # Cache maven artefacts where possible cd $pkgname - mvn -e package -gs "$srcdir"/../settings.xml + mvn -e package -gs "$srcdir"/settings.xml } package() { - depends=('java-runtime>=8' 'java8-openjfx') + depends=('java-runtime>=11' 'java11-openjfx') cd mapton/application/target/mapton # Initial target directories diff --git a/jdkhome.patch b/jdkhome.patch index 7d81c75f17d3..84e3b63d0e2f 100644 --- a/jdkhome.patch +++ b/jdkhome.patch @@ -2,12 +2,12 @@ diff --git a/application/src/main/resources/mapton.conf b/application/src/main/r 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 - +@@ -37,7 +37,7 @@ + default_options="--branding mapton -J-Xss2m -J-Dnetbeans.logger.console=true -J--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.collections=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED -J--add-exports=javafx.web/com.sun.webkit=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED" + #default_options="--branding mapton --nosplash -J-Xss2m -J-Dnetbeans.logger.console=true -J-ea -J-Djdk.gtk.version=2.2 -J--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.collections=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED -J--add-exports=javafx.web/com.sun.webkit=ALL-UNNAMED -J--add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED" # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch -#jdkhome="/path/to/jdk" -+jdkhome="/usr/lib/jvm/java-8-openjdk" ++jdkhome="/usr/lib/jvm/java-11-openjdk" # clusters' paths separated by path.separator (semicolon on Windows, colon on Unices) #extra_clusters= |