From a5383a8d86c1a995f6242eae121eeb62a155599c Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 20 Jun 2018 11:06:56 +0700 Subject: [PATCH] Build SNAP with JDK8 for compatibility reasons --- installer/snap/root/bin/filebot.sh | 2 +- installer/snap/snapcraft.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/snap/root/bin/filebot.sh b/installer/snap/root/bin/filebot.sh index dc35321d..c8c9cc70 100755 --- a/installer/snap/root/bin/filebot.sh +++ b/installer/snap/root/bin/filebot.sh @@ -5,4 +5,4 @@ export APP_DATA="$SNAP_USER_DATA/data" export APP_CACHE="$SNAP_USER_DATA/cache" export APP_PREFS="$SNAP_USER_DATA/prefs" -"$SNAP/jre/bin/java" -Djdk.gtk.version=2 @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Dapplication.help=show -Djava.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djna.boot.library.path="$APP_ROOT/lib" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@" +"$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH/jre/bin/java" -Djdk.gtk.version=2 @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Dapplication.help=show -Djava.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djna.boot.library.path="$APP_ROOT/lib" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@" \ No newline at end of file diff --git a/installer/snap/snapcraft.yaml b/installer/snap/snapcraft.yaml index 4c31624e..87f154d2 100644 --- a/installer/snap/snapcraft.yaml +++ b/installer/snap/snapcraft.yaml @@ -16,3 +16,4 @@ parts: filebot: plugin: dump source: root + stage-packages: [openjdk-8-jre, openjfx, jayatana, libmediainfo0v5, libchromaprint-tools]