From 3760a9ffd173ec2b228d5f9a26c541275a994639 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Wed, 9 May 2018 18:11:57 +0200
Subject: [PATCH] AppImage: Bundle KWindowSystem plugins

---
 linux/appimage/build-appimage.sh | 4 ++++
 linux/appimage/setup.sh          | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/linux/appimage/build-appimage.sh b/linux/appimage/build-appimage.sh
index 30043d309..9ff9ea965 100755
--- a/linux/appimage/build-appimage.sh
+++ b/linux/appimage/build-appimage.sh
@@ -261,6 +261,10 @@ done
 for P in ${NEEDEDPLUGINSLIST} ; do
   cp -r ${PLUGINSARETHERE}/${P} bundle_build_dir/plugins ;
 done
+if [[ -d "${PLUGINSARETHERE}/kf5/org.kde.kwindowsystem.platforms" ]]; then
+mkdir bundle_build_dir/plugins/kf5
+cp -r ${PLUGINSARETHERE}/kf5/org.kde.kwindowsystem.platforms bundle_build_dir/plugins/kf5
+fi
 install ${PLUGINSARETHERE}/platforms/libqxcb.so bundle_build_dir/plugins/platforms
 install ${PLUGINSARETHERE}/sqldrivers/libqsqlite.so bundle_build_dir/plugins/sqldrivers
 cp -r ${QMLSARETHERE}/{QtQuick.2,QtWebEngine} bundle_build_dir/qml
diff --git a/linux/appimage/setup.sh b/linux/appimage/setup.sh
index 238e56fe0..c811ff3ee 100755
--- a/linux/appimage/setup.sh
+++ b/linux/appimage/setup.sh
@@ -11,7 +11,7 @@ MODULE_VERSION="${FRAMEWORK_VERSION}.0"
 
 QTDIR="/root/Qt/5.10.1/gcc_64"
 
-trap "rm -rf *${MODULE_VERSION} *.tar.xz phonon* qt-installer setup.sh" EXIT 1 2
+trap "rm -rf *${MODULE_VERSION} *.tar.xz phonon* qt-installer* setup.sh" EXIT 1 2
 
 # Install Qt
 cd /root
@@ -85,3 +85,9 @@ for MODULE_NAME in ${NEEDED_MODULES}; do
     moduleBuild
     popd
 done
+
+pushd $QTDIR/plugins/kf5
+chrpath --replace '$ORIGIN/../../lib' *.so
+chrpath --replace '$ORIGIN/../../../lib' */*.so
+popd
+exit