ARCH=x86_64
+PYVER=3.4
+
########################################################################
# You usually don't have to change anything below this line
########################################################################
mkdir -p $A/usr/bin $A/usr/lib $A/usr/share
cd ./$APP
-. ../contrib/functions.sh
+. $STATIC_FILES/functions.sh
########################################################################
# Get build products from $PREFIX
# Copy desktop and icon file to AppDir for AppRun to pick them up
########################################################################
-cp ../../contrib/pulseview.desktop ../../contrib/sigrok-logo-notext.png .
+cp $STATIC_FILES/pulseview.desktop .
+cp $STATIC_FILES/sigrok-logo-notext.png .
########################################################################
# Copy in the dependencies that cannot be assumed to be available
copy_deps
+# Get all Qt5 plugins (won't be copied automatically).
+QT5PLUGINS=/usr/lib/x86_64-linux-gnu/qt5/plugins # Host (+ AppRun) path.
+mkdir -p .$QT5PLUGINS
+cp -r $QT5PLUGINS/accessible .$QT5PLUGINS
+cp -r $QT5PLUGINS/generic .$QT5PLUGINS
+cp -r $QT5PLUGINS/iconengines .$QT5PLUGINS
+cp -r $QT5PLUGINS/imageformats .$QT5PLUGINS
+cp -r $QT5PLUGINS/platforminputcontexts .$QT5PLUGINS
+cp -r $QT5PLUGINS/platforms .$QT5PLUGINS
+
+# Get some additional dependencies of the Qt5 plugins.
+ldd .$QT5PLUGINS/platforms/libqxcb.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
+ldd .$QT5PLUGINS/imageformats/libqsvg.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
+
+# Python 3
+cp /usr/lib/x86_64-linux-gnu/libpython$PYVER* ./usr/lib
+mkdir -p ./usr/share/pyshared
+cp -r /usr/lib/python$PYVER/* ./usr/share/pyshared # AppRun expects this path.
+
+cp -r ./usr/share/pyshared/plat-x86_64-linux-gnu/* ./usr/share/pyshared
+
########################################################################
# Delete stuff that should not go into the AppImage
########################################################################
-delete_blacklisted
move_lib
mv ./usr/lib/x86_64-linux-gnu/* usr/lib/
rm -r ./usr/lib/x86_64-linux-gnu/
+delete_blacklisted
+
# Remove some incorrectly/unintentionally copied files.
rm -r ./home