X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=f9c630900d50d81c7da8997c781d075b0d661242;hp=767b634b1c9b741b0232cf4403f672e833467cbd;hb=ffbad1654cdd9263a964873d95535ed66a5011b4;hpb=8fa1956a198d4febc86a63fa14a8a83a17809c9e

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 767b634..f9c6309 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -14,6 +14,8 @@ APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
 
 ARCH=x86_64
 
+PYVER=3.4
+
 ########################################################################
 # You usually don't have to change anything below this line
 ########################################################################
@@ -30,7 +32,7 @@ A="./$APP/$APP.AppDir"
 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
@@ -58,7 +60,8 @@ cp $APPIMAGEKIT_OUTDIR/AppRun .
 # 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
@@ -67,15 +70,37 @@ cp ../../contrib/pulseview.desktop ../../contrib/sigrok-logo-notext.png .
 
 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