Fix after Java 14 update

Add workaround for FS#64121

4 files changed, 14 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f19dabe6b762..0d6315fd772d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = asciidocfx
 	pkgdesc = Asciidoc Editor and Toolchain written with JavaFX
 	pkgver = 1.7.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://asciidocfx.com/
 	arch = any
 	license = Apache
 	makedepends = maven>=3.3.9
-	makedepends = java-environment>=11
+	makedepends = java-environment>=12
 	makedepends = gendesk
-	depends = java-environment=13
+	depends = java-environment=14
 	depends = java-openjfx
 	source = https://github.com/asciidocfx/AsciidocFX/archive/v1.7.2.tar.gz
 	source = asciidocfx
-	source = versions.patch
 	sha512sums = 13e11110b81ff5dea8afab24616e9f2a1994a065408d0b8642af78566f1e39570bba4871a2b437675b0cca4adc7951221cdc13eb04896d44fef961d92f0e780f
-	sha512sums = 6482d9a0c6133a5d19efeabe9ba581e43858a162777d30afab3bd2575c6c9bcc336c9b7edb7c14a4434f42e64765f735f721fed1db16e2eb298c4889a09f136a
-	sha512sums = 750c1a89b5375eaf2710b1d56a78773f2c673a1b428c6ecb7221088849632d02a2f0429b82d2482fc3cf2bb4cb69ab1b7adc8170ba413a2de2fd23e66070b9f4
+	sha512sums = 7f758a2536c627d854bab4d42f629163d68ff5681be108779670262e765311cad3c93d0c976d561438519ab92a4311d3b49d2f8352cf5ef17aab47eb2b77047d
 
 pkgname = asciidocfx
 
diff --git a/PKGBUILD b/PKGBUILD
index d9363f7a138b..a28b6ddd13fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,26 @@
 
 pkgname=asciidocfx
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Asciidoc Editor and Toolchain written with JavaFX"
 arch=('any')
 
 url='http://asciidocfx.com/'
 license=('Apache')
 
-makedepends=('maven>=3.3.9' 'java-environment>=11' 'gendesk')
-depends=('java-environment=13' 'java-openjfx')
+makedepends=('maven>=3.3.9' 'java-environment>=12' 'gendesk')
+depends=('java-environment=14' 'java-openjfx')
 
 source=(
     "https://github.com/asciidocfx/AsciidocFX/archive/v${pkgver}.tar.gz"
     'asciidocfx'
-    'versions.patch'
 )
 sha512sums=(
     '13e11110b81ff5dea8afab24616e9f2a1994a065408d0b8642af78566f1e39570bba4871a2b437675b0cca4adc7951221cdc13eb04896d44fef961d92f0e780f'
-    '6482d9a0c6133a5d19efeabe9ba581e43858a162777d30afab3bd2575c6c9bcc336c9b7edb7c14a4434f42e64765f735f721fed1db16e2eb298c4889a09f136a'
-    '750c1a89b5375eaf2710b1d56a78773f2c673a1b428c6ecb7221088849632d02a2f0429b82d2482fc3cf2bb4cb69ab1b7adc8170ba413a2de2fd23e66070b9f4'
+    '7f758a2536c627d854bab4d42f629163d68ff5681be108779670262e765311cad3c93d0c976d561438519ab92a4311d3b49d2f8352cf5ef17aab47eb2b77047d'
 )
 
 prepare() {
-    cd "AsciidocFX-${pkgver}"
-    patch --forward --strip=1 --input="${srcdir}/versions.patch"
-    cd ..
-
     # Generate a desktop entry
     # -f: forces and overrides the file if any
     # -n: do not download an icon
@@ -59,4 +53,8 @@ package() {
 
     install -Dm644 "../${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
     install -Dm644 './src/main/resources/logo.png' "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+
+    # Workaround for FS#64121
+    install -dm755 "${pkgdir}/usr/share/java/asciidocfx/lib/java-openjfx"
+    cp -t "${pkgdir}/usr/share/java/asciidocfx/lib/java-openjfx" /usr/lib/jvm/java-14-openjdk/lib/javafx*
 }
diff --git a/asciidocfx b/asciidocfx
index 3a4c229943ba..d7ca10a95bc8 100755
--- a/asciidocfx
+++ b/asciidocfx
@@ -4,8 +4,8 @@ for name in $BASEDIR/lib/*.jar; do
   CP=$CP:$name
 done
 
-PATH_TO_FX=/usr/lib/jvm/java-13-openjfx/lib
-PATH_TO_JAVA=/usr/lib/jvm/java-13-openjdk/bin/java
+PATH_TO_FX=$BASEDIR/lib/java-openjfx
+PATH_TO_JAVA=/usr/lib/jvm/java-14-openjdk/bin/java
 
 exec $PATH_TO_JAVA \
   -cp $CP \
diff --git a/versions.patch b/versions.patch
deleted file mode 100644
index e5fb7cf16b0f..000000000000
--- a/versions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 9e45999..5747450 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -12,13 +12,13 @@
- 
-     <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--        <java.version>12</java.version>
-+        <java.version>11</java.version>
-         <maven.compiler.source>${java.version}</maven.compiler.source>
-         <maven.compiler.target>${java.version}</maven.compiler.target>
-         <mainClass>com.kodedu.boot.AppStarter</mainClass>
-         <install4j.home>/home/travis/build/asciidocfx/AsciidocFX/install4j8.0</install4j.home>
-         <install4j.licenseKey>${env.LICENSE_KEY_8}</install4j.licenseKey>
--        <openjfx.version>14</openjfx.version>
-+        <openjfx.version>13</openjfx.version>
-         <ikonli.version>11.3.5</ikonli.version>
-         <jaxb.version>2.3.2</jaxb.version>
-     </properties>