From 0456815bd5cdcbd5c86375333b97fb81ed4cfee5 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Mon, 23 Jan 2017 01:06:31 +0100
Subject: [PATCH] Fix AppImage not launching on all platforms

---
 AppImage-Recipe.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index 322b5464..d9cbd565 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -43,13 +43,23 @@ cd $APP.AppDir
 cp -a ../../bin-release/* .
 cp -a ./usr/local/* ./usr
 rm -R ./usr/local
-patch_strings_in_file /usr/local ./
+patch_strings_in_file /usr/local ././
 patch_strings_in_file /usr ./
 
+# bundle Qt platform plugins
+QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)"
+QT_PLUGIN_PATH="$(dirname $(dirname $QXCB_PLUGIN))"
+mkdir -p "./${QT_PLUGIN_PATH}/platforms"
+cp "$QXCB_PLUGIN" "./${QT_PLUGIN_PATH}/platforms/"
+
 get_apprun
 copy_deps
 delete_blacklisted
 
+# remove dbus and systemd libs as they are not blacklisted
+find . -name libdbus-1.so.3 -exec rm {} \;
+find . -name libsystemd.so.0 -exec rm {} \;
+
 get_desktop
 get_icon
 get_desktopintegration $LOWERAPP
@@ -58,7 +68,7 @@ GLIBC_NEEDED=$(glibc_needed)
 
 cd ..
 
-generate_appimage
+generate_type2_appimage
 
 mv ../out/*.AppImage ..
 rmdir ../out > /dev/null 2>&1