From b4c4c2bb57b3d4250c42ac62632e72105550b577 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Mon, 26 Nov 2018 04:21:42 +0700
Subject: [PATCH] Try to fix SNAP issues (mediainfo, gtk2 theme, etc)

---
 installer/snap/base/bin/filebot.sh | 7 ++-----
 installer/snap/snapcraft.yaml      | 8 ++++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/installer/snap/base/bin/filebot.sh b/installer/snap/base/bin/filebot.sh
index 2783ac03..26d38df6 100755
--- a/installer/snap/base/bin/filebot.sh
+++ b/installer/snap/base/bin/filebot.sh
@@ -2,10 +2,7 @@
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
-export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-amd64"
-export FILEBOT_HOME="$SNAP/filebot"
-
 APP_DATA="$SNAP_USER_DATA/data"
-LIBRARY_PATH="$FILEBOT_HOME/lib"
+LIBRARY_PATH="$SNAP/filebot/lib:$SNAP/usr/lib/x86_64-linux-gnu"
 
-"$JAVA_HOME/bin/java" -Dapplication.deployment=snap -Dapplication.update=skip -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
+"$SNAP/usr/lib/jvm/java-8-openjdk-amd64/bin/java" -Dapplication.deployment=snap -Dapplication.update=skip -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} @{linux.portable.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$SNAP/filebot/jar/filebot.jar" "$@"
diff --git a/installer/snap/snapcraft.yaml b/installer/snap/snapcraft.yaml
index af580ce7..db401e3d 100644
--- a/installer/snap/snapcraft.yaml
+++ b/installer/snap/snapcraft.yaml
@@ -14,9 +14,11 @@ apps:
     plugs:
       - desktop
       - desktop-legacy
+      - wayland
+      - unity7
       - x11
+      - opengl
       - gsettings
-      - dbus
       - home
       - removable-media
       - network
@@ -33,12 +35,14 @@ parts:
     stage-packages:
       - openjdk-8-jre
       - openjfx
-      - libmediainfo0v5
+      - mediainfo
       - libchromaprint-tools
       - p7zip-full
       - p7zip-rar
       - xdg-utils
       - curl
+      - libgnome-2-0
+      - libgnomevfs2-0
       - gtk2-engines-murrine
       - libcanberra-gtk-module
       - hicolor-icon-theme