Changes to build and run with Java 8

1 files changed, 12 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6398ee71fc03..fc07abff2fba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=filebot
 pkgver=4.8.4
-pkgrel=3
+pkgrel=4
 _jnaver=4.5.2
 _fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
@@ -15,8 +15,8 @@ arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://github.com/filebot/filebot"
 license=('GPL')
 install=$pkgname.install
-depends=('java-runtime>=8' 'fontconfig' 'chromaprint')
-makedepends=('ant' 'ivy' 'jdk>=8')
+depends=('java-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint')
+makedepends=('ant' 'ivy')
 
 [[ $CARCH == "i686" ]]   && _intarch=i686
 [[ $CARCH == "x86_64" ]] && _intarch=amd64
@@ -24,12 +24,14 @@ makedepends=('ant' 'ivy' 'jdk>=8')
 [[ $CARCH == "armv7h" ]] && _intarch=armv7l
 [[ $CARCH == "aarch64" ]] && _intarch=armv8
 
+_jre=$(archlinux-java get)
+
 source=("${pkgname}::git+https://github.com/filebot/filebot.git"
         #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
         $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
 
 md5sums=('SKIP'
-         'abed3a5dab3032fcde08addbee04fb1b'
+         '7c1128f94fcd9f4e29225a12eac83704'
          '04f46be047049448dba3f0de29fe192d'
          'f37edd0bba7570904d28ab1681c7a7f3')
 
@@ -64,8 +66,12 @@ EOT
 
 build() {
   cd $pkgname
+#  print('Set system '+$_jre+' to java-9-openjdk. Should be reverted after build')
+  sudo archlinux-java set java-8-openjdk
   ant resolve
   ant jar
+#  print('Reverting system Java to '+$_jre)
+#  sudo archlinux-java set $_jre
 }
 
 package() {
@@ -75,4 +81,6 @@ package() {
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  
+  sudo archlinux-java set $_jre
 }