Update version and fix build.

3 files changed, 44 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d77671ba403..f85d5e94abfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = maptool
 	pkgdesc = An open source virtual tabletop program
-	pkgver = 1.7.0
+	pkgver = 1.9.3
 	pkgrel = 1
 	url = https://rptools.net/tools/maptool
+	install = maptool.install
 	arch = x86_64
 	license = AGPL3
 	makedepends = git
 	makedepends = dpkg
-	makedepends = jdk10
+	makedepends = jdk-openjdk
+	makedepends = gradle
+	makedepends = xdg-utils
+	makedepends = rpm-tools
+	depends = jre-openjdk
 	optdepends = gvfs: access virtual filesystem
-	provides = maptool
-	conflicts = maptool
-	source = git+https://github.com/RPTools/maptool.git#tag=1.7.0
+	source = git+https://github.com/RPTools/maptool.git#tag=1.9.3
 	sha256sums = SKIP
 
 pkgname = maptool
-
diff --git a/PKGBUILD b/PKGBUILD
index 541552bb0dff..854a753c89c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,46 @@
-# Maintainer: Mathias Walters <waltersm@protonmail.com>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Mathias Walters <waltersm@protonmail.com>
 
 pkgname=maptool
 _pkgname=MapTool
-pkgver=1.7.0
+pkgver=1.9.3
 pkgrel=1
 pkgdesc="An open source virtual tabletop program"
 arch=('x86_64')
 url="https://rptools.net/tools/maptool"
 license=('AGPL3')
-makedepends=('git' 'dpkg' 'jdk10')
+depends=('jre-openjdk')
+makedepends=('git' 'dpkg' 'jdk-openjdk' 'gradle' 'xdg-utils' 'rpm-tools')
 optdepends=('gvfs: access virtual filesystem')
-provides=('maptool')
-conflicts=('maptool')
-source=("git+https://github.com/RPTools/maptool.git#tag=${pkgver}")
+source=("git+https://github.com/RPTools/${pkgname}.git#tag=${pkgver}")
 sha256sums=('SKIP')
+install='maptool.install'
 
 build() {
+	cd "${pkgname}"
+	gradle --parallel jpackage
+}
 
-    ORIG_JAVA="$(archlinux-java get)"
-    sudo archlinux-java set java-10-jdk
-
-    cd ${pkgname}
-    ./gradlew deploy
-
-    if [ -n "$ORIG_JAVA" ]; then
-        sudo archlinux-java set $ORIG_JAVA
-    else
-        sudo archlinux-java unset
-    fi
+check() {
+	cd "${pkgname}"
+	gradle --parallel check
 }
 
 package() {
-
-    cd "${srcdir}/${pkgname}/releases/release-${pkgver}"
-    ar vx "${pkgname}-${pkgver}.deb"
-    tar -C "${pkgdir}" -xf data.tar.xz
-
-    install -Dm644 "${pkgdir}/opt/${_pkgname}/app/COPYING.AFFERO" -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-    install -Dm644 "${pkgdir}/opt/${_pkgname}/app/COPYING.LESSER" -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-    install -Dm644 "${pkgdir}/opt/${_pkgname}/${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
+	cd "${pkgdir}"
+	
+	dpkg-deb -x "${srcdir}/${pkgname}/releases/${pkgname}_${pkgver}-${pkgrel}_amd64.deb" .
+	mkdir -p "usr/share/licenses/${pkgname}"
+	mv "opt/${pkgname}/share/doc/copyright" "usr/share/licenses/${pkgname}/"
+	rm -rf "opt/${pkgname}/share"
+	
+	#rpmextract.sh "${srcdir}/${pkgname}/releases/${pkgname}-${pkgver}-${pkgrel}.x86_64.rpm"
+	#mv "usr/share/licenses/maptool-${pkgver}" "usr/share/licenses/${pkgname}"
+	
+	install -Dm644 "opt/${pkgname}/lib/${pkgname}-${_pkgname}.desktop" -t "usr/share/applications/"
+	
+	install -dm755 'usr/bin'
+	echo "#!/bin/bash" > "usr/bin/${pkgname}"
+	echo "/opt/${pkgname}/bin/MapTool \"\$@\"" >> "usr/bin/${pkgname}"
+	chmod 755 "usr/bin/${pkgname}"
 }
diff --git a/maptool.install b/maptool.install
new file mode 100644
index 000000000000..d6d6cceda467
--- /dev/null
+++ b/maptool.install
@@ -0,0 +1,7 @@
+post_install() {
+	xdg-mime install /opt/maptool/lib/maptool-MapTool-MimeInfo.xml
+}
+
+pre_remove() {
+	xdg-mime uninstall /opt/maptool/lib/maptool-MapTool-MimeInfo.xml
+}
\ No newline at end of file