build from precompiled zip

the GCS_LIBRARY patch was accepted, so no need to recompile

4 files changed, 21 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a692f3acb0fb..5450c256fac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,17 @@
 pkgbase = gcs
 	pkgdesc = WYSIWYG editor for building character sheets for GURPS 4th Edition
-	pkgver = 4.4.1
-	pkgrel = 2
+	pkgver = 4.5.1
+	pkgrel = 1
 	url = http://gurpscharactersheet.com
 	arch = any
 	license = MPL
-	makedepends = git
-	makedepends = apache-ant
-	makedepends = java-environment=8
-	makedepends = imagemagick
 	depends = java-runtime=8
-	source = git://github.com/richardwilkes/apple_stubs.git
-	source = git://github.com/richardwilkes/gcs.git#tag=gcs-4.4.1
-	source = git://github.com/richardwilkes/toolkit.git#tag=gcs-4.4.1
+	source = http://gurpscharactersheet.com/downloads/4.5.1/gcs-4.5.1-linux.zip
 	source = gcs.sh
 	source = gcs.desktop
-	source = set_app_path_from_env.patch
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = a624fb16a1694c651b392cba91ff120b99ddf3dd1005b4174baca81770a8785c
+	sha256sums = 25042c6759fd814e23bf9139e6f6c5f93f67eec826f55825db052f4ff84ce241
 	sha256sums = 15f4bb0caaa0752cceba69c615e16848eba35f18b4d705caae0419a2aa0072f9
-	sha256sums = f0a4f484f006da3f70fc26af15647478f6e721de113557f2cb1a93522a5f6d59
 
 pkgname = gcs
 
diff --git a/PKGBUILD b/PKGBUILD
index ec0ee750620c..8d2b22f0e7ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,40 @@
 # Maintainer: Maxwell Anselm <silverhammermba+aur@gmail.com>
 
 pkgname=gcs
-pkgver=4.4.1
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc="WYSIWYG editor for building character sheets for GURPS 4th Edition"
 arch=('any')
 url="http://gurpscharactersheet.com"
 license=('MPL')
 depends=('java-runtime=8')
-makedepends=('git' 'apache-ant' 'java-environment=8' 'imagemagick')
 source=(
-	'git://github.com/richardwilkes/apple_stubs.git'
-	"git://github.com/richardwilkes/gcs.git#tag=gcs-$pkgver"
-	"git://github.com/richardwilkes/toolkit.git#tag=gcs-$pkgver"
+	"http://gurpscharactersheet.com/downloads/$pkgver/$pkgname-$pkgver-linux.zip"
 	'gcs.sh'
 	'gcs.desktop'
-	'set_app_path_from_env.patch'
 )
-sha256sums=('SKIP' 'SKIP' 'SKIP'
-	'a624fb16a1694c651b392cba91ff120b99ddf3dd1005b4174baca81770a8785c'
+sha256sums=(
+	'8a7c4fabc6ae7ec53a9b5981f6a29489c42ce5ef94733fe92460421ae4a1efe8'
+	'25042c6759fd814e23bf9139e6f6c5f93f67eec826f55825db052f4ff84ce241'
 	'15f4bb0caaa0752cceba69c615e16848eba35f18b4d705caae0419a2aa0072f9'
-	'f0a4f484f006da3f70fc26af15647478f6e721de113557f2cb1a93522a5f6d59'
 )
 
-prepare() {
-	cd "$srcdir/toolkit"
-	git apply "$srcdir/set_app_path_from_env.patch"
-}
-
-build() {
-	# Java needs to be version 8
-	java -version 2>&1 | grep 'version "1.8' >/dev/null
-
-	cd "$srcdir/apple_stubs"
-	ant
-	cd "$srcdir/toolkit"
-	ant
-	cd "$srcdir/gcs"
-	ant
-}
-
 package() {
+	pushd "$srcdir/$pkgname-$pkgver-linux"
+
 	# jars
 	install -d "$pkgdir/usr/share/java/gcs"
-	find "$srcdir" -name '*.jar' ! -name '*-src.*' -execdir install -m644 {} "$pkgdir/usr/share/java/gcs" \;
+	find support/jars -name '*.jar' -execdir install -m644 {} "$pkgdir/usr/share/java/gcs" \;
 
 	# library
 	install -d "$pkgdir/usr/share/gcs"
-	cp -dr --no-preserve=ownership "$srcdir/gcs/Library" "$pkgdir/usr/share/gcs"
+	cp -dr --no-preserve=ownership Library "$pkgdir/usr/share/gcs"
+
+	# icon
+	install -d "$pkgdir/usr/share/icons/hicolor/128x128/apps"
+	convert support/gcs.png -resize 128 "$pkgdir/usr/share/icons/hicolor/128x128/apps/gcs.png"
+
+	popd
 
 	# launcher
 	install -Dm755 "$srcdir/gcs.sh" "$pkgdir/usr/bin/gcs"
@@ -58,8 +45,4 @@ package() {
 
 	# remove version from filename
 	mv "$pkgdir/usr/share/java/gcs/gcs-${pkgver}.jar" "$pkgdir/usr/share/java/gcs/gcs.jar"
-
-	# convert icon
-	install -d "$pkgdir/usr/share/icons/hicolor/128x128/apps"
-	convert "$srcdir/gcs/src/com/trollworks/gcs/app/images/app_1024.png" -resize 128 "$pkgdir/usr/share/icons/hicolor/128x128/apps/gcs.png"
 }
diff --git a/gcs.sh b/gcs.sh
index 858c25908a45..b5a77303cbc4 100644
--- a/gcs.sh
+++ b/gcs.sh
@@ -4,4 +4,4 @@ then
 	echo "GURPS character sheet requires Java 8" >&2
 	exit 1
 fi
-GCS_HOME=/usr/share/gcs exec /usr/bin/java -jar '/usr/share/java/gcs/gcs.jar' "$@"
+GCS_LIBRARY=/usr/share/gcs exec /usr/bin/java -jar '/usr/share/java/gcs/gcs.jar' "$@"
diff --git a/set_app_path_from_env.patch b/set_app_path_from_env.patch
deleted file mode 100644
index 0d06036a733e..000000000000
--- a/set_app_path_from_env.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cde0278e1566909da78c60fe6043f328cb590134 Mon Sep 17 00:00:00 2001
-From: Max <silverhammermba@gmail.com>
-Date: Wed, 1 Oct 2014 09:35:57 -0400
-Subject: [PATCH] Set app path using GCS_HOME env var
-
----
- src/com/trollworks/toolkit/ui/App.java | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/src/com/trollworks/toolkit/ui/App.java b/src/com/trollworks/toolkit/ui/App.java
-index 87a81f1..c1b6d22 100644
---- a/src/com/trollworks/toolkit/ui/App.java
-+++ b/src/com/trollworks/toolkit/ui/App.java
-@@ -53,15 +53,7 @@ public class App implements KeyEventDispatcher, Runnable {
- 		BundleInfo.setDefault(new BundleInfo(theClass));
- 		Path path;
- 		try {
--			URI uri = theClass.getProtectionDomain().getCodeSource().getLocation().toURI();
--			path = Paths.get(uri).normalize().getParent().toAbsolutePath();
--			if (path.endsWith("support/jars")) { //$NON-NLS-1$
--				path = path.getParent().getParent();
--			}
--			if (path.endsWith("Contents/MacOS")) { //$NON-NLS-1$
--				// Note: we go up 3 levels, not 2, to account for the .app dir
--				path = path.getParent().getParent().getParent();
--			}
-+			path = Paths.get(System.getenv("GCS_HOME"));
- 		} catch (Throwable throwable) {
- 			path = Paths.get("."); //$NON-NLS-1$
- 		}
--- 
-2.1.1
-