2020.0.1

4 files changed, 28 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73074843d2d1..554f34ee3829 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pdfstudioviewer
 	pkgdesc = Review, annotate, and edit PDF Documents
-	pkgver = 2019.2.3
+	pkgver = 2020.0.1
 	pkgrel = 1
 	url = https://www.qoppa.com/pdfstudioviewer
 	arch = i686
@@ -10,11 +10,13 @@ pkgbase = pdfstudioviewer
 	depends = desktop-file-utils
 	depends = sane
 	source = pdfstudioviewer.desktop
-	sha256sums = b4116929f568878acf5539837f5a213bb557d45db3431b5841969c9806babea7
-	source_i686 = pdfstudioviewer-2019.2.3_linux.deb::https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux.deb
-	sha256sums_i686 = b72e62a0dfa624163a2397bc950b5d9fc634372410749745e04636bba824c5b3
-	source_x86_64 = pdfstudioviewer-2019.2.3_linux64.deb::https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb
-	sha256sums_x86_64 = 5f6f7f9d573913a358c83f98964f2b8cfa4dcff50df27bc68fb042af2992ddcf
+	source = pdfstudioviewer.sh
+	sha256sums = 531354a4fe61e8b16ad3123cd49df7140d4ac1ef3c5e75520b9250d55c398481
+	sha256sums = 4b8c8711726bca47d41097862631168298fccece605222397ff0aa7b8765617c
+	source_i686 = pdfstudioviewer-2020.0.1_linux.deb::https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux.deb
+	sha256sums_i686 = ac339aae772f6b74a95d8f4dc06c2b372c83a646bad14e4c4d28fc3ccd0d9bc9
+	source_x86_64 = pdfstudioviewer-2020.0.1_linux64.deb::https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb
+	sha256sums_x86_64 = 38f7bcfa8bf7f4c43c3345c22fe076939f93816c09811a7b7dfdc581d6039e3a
 
 pkgname = pdfstudioviewer
 
diff --git a/PKGBUILD b/PKGBUILD
index 83466cf07a78..e10d17858321 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,41 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=pdfstudioviewer
-_pkgname=pdfstudioviewer2019
-pkgver=2019.2.3
+_pkgname=pdfstudioviewer2020
+pkgver=2020.0.1
 pkgrel=1
 pkgdesc="Review, annotate, and edit PDF Documents"
 arch=('i686' 'x86_64')
 url="https://www.qoppa.com/pdfstudioviewer"
 license=('custom')
 depends=('java-runtime=8' 'desktop-file-utils' 'sane')
+source=("$pkgname.desktop"
+        "$pkgname.sh")
 source_i686=("${pkgname}-${pkgver}_linux.deb::https://download.qoppa.com/$pkgname/PDFStudioViewer_linux.deb")
 source_x86_64=("${pkgname}-${pkgver}_linux64.deb::https://download.qoppa.com/$pkgname/PDFStudioViewer_linux64.deb")
-source=("$pkgname.desktop")
-sha256sums=('b4116929f568878acf5539837f5a213bb557d45db3431b5841969c9806babea7')
-sha256sums_i686=('b72e62a0dfa624163a2397bc950b5d9fc634372410749745e04636bba824c5b3')
-sha256sums_x86_64=('5f6f7f9d573913a358c83f98964f2b8cfa4dcff50df27bc68fb042af2992ddcf')
+sha256sums=('531354a4fe61e8b16ad3123cd49df7140d4ac1ef3c5e75520b9250d55c398481'
+            '4b8c8711726bca47d41097862631168298fccece605222397ff0aa7b8765617c')
+sha256sums_i686=('ac339aae772f6b74a95d8f4dc06c2b372c83a646bad14e4c4d28fc3ccd0d9bc9')
+sha256sums_x86_64=('38f7bcfa8bf7f4c43c3345c22fe076939f93816c09811a7b7dfdc581d6039e3a')
 
 prepare() {
-	bsdtar xf data.tar.gz
+	mkdir -p "$pkgname-$pkgver"
+	bsdtar xf data.tar.gz -C "$pkgname-$pkgver"
+
+	cd "$pkgname-$pkgver"
 	bsdtar xf "opt/$_pkgname/lib/pdfstudio.jar" resources/license.html
 
+	# Remove bundled JRE
 	rm -rf "opt/$_pkgname/jre"
 }
 
 package() {
+	cd "$pkgname-$pkgver"
 	install -dm755 "$pkgdir/opt/$pkgname"
 	cp -r "opt/$_pkgname/." "$pkgdir/opt/$pkgname/"
 
-	install -Dm644 "$pkgname.desktop" -t "$pkgdir/usr/share/applications"
 	install -Dm644 "opt/$_pkgname/.install4j/$_pkgname.png" \
 		"$pkgdir/usr/share/pixmaps/$pkgname.png"
 	install -Dm644 resources/license.html -t "$pkgdir/usr/share/licenses/$pkgname"
-
-	install -d "$pkgdir/usr/bin"
-	ln -sf "/opt/$pkgname/$_pkgname" "$pkgdir/usr/bin/$pkgname"
+	install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications"
+	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/pdfstudioviewer.desktop b/pdfstudioviewer.desktop
index 139f9c41ca3e..f00d8984d489 100644
--- a/pdfstudioviewer.desktop
+++ b/pdfstudioviewer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=PDF Studio Viewer 2019
+Name=PDF Studio Viewer 2020
 Comment=Views and Edits Adobe PDF (acrobat) files
 Icon=pdfstudioviewer
 Exec=pdfstudioviewer %U
diff --git a/pdfstudioviewer.sh b/pdfstudioviewer.sh
new file mode 100644
index 000000000000..1b654f2eb7f6
--- /dev/null
+++ b/pdfstudioviewer.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+INSTALL4J_JAVA_HOME_OVERRIDE=/usr/lib/jvm/java-8-openjdk/jre /opt/pdfstudioviewer/pdfstudioviewer2020