diff --git a/utils/scripts/docker/package_appimages.bash b/utils/scripts/docker/package_appimages.bash index 5d8de78b6ca5ea862951c02642275c75ca759c5c..c05b942700cd88b26449783eb185905a239267dc 100755 --- a/utils/scripts/docker/package_appimages.bash +++ b/utils/scripts/docker/package_appimages.bash @@ -21,35 +21,9 @@ function join_by() { fi } -function get_additional_libs() { - case $* in - *qt*) - for LIB in /usr/lib/x86_64-linux-gnu/libQt6OpenGLWidgets.so \ - /usr/lib/x86_64-linux-gnu/libQt6OpenGL.so \ - /usr/lib/x86_64-linux-gnu/libQt6MultimediaWidgets.so \ - /usr/lib/x86_64-linux-gnu/libQt6Multimedia.so \ - /usr/lib/x86_64-linux-gnu/libQt6Concurrent.so \ - /usr/lib/x86_64-linux-gnu/libQt6WaylandClient.so \ - /usr/lib/x86_64-linux-gnu/libQt6XcbQpa.so \ - /usr/lib/x86_64-linux-gnu/libQt6WlShellIntegration.so.6 \ - /usr/lib/x86_64-linux-gnu/libQt6EglFSDeviceIntegration.so \ - /usr/lib/x86_64-linux-gnu/libQt6EglFsKmsGbmSupport.so \ - /usr/lib/x86_64-linux-gnu/libQt6EglFsKmsSupport.so ; - do - for FILE in ${LIB}*; do - echo -n " -l${FILE} " - done - done;; - *);; - esac -} - function deploy() { local EXEC=${1,,} - - local EXTRA_QT_PLUGINS="concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;xcbglintegrations;" - local EXTRA_QT_PLUGINS+="opengl;openglwidgets;waylandclient;widgets;xcbqpa;wayland-shell-integration;wayland-graphics-integration-client;" - export EXTRA_QT_PLUGINS + local WITHQTPLUGIN="$2" local EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqwayland-egl.so;libqwayland-generic.so;" export EXTRA_PLATFORM_PLUGINS @@ -57,10 +31,14 @@ function deploy() { local EXCLUDE_LIBS="libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread libX11-xcb libxcb-" local EXCLUDE_LIBS="-name *$(join_by "* -or -name *" $EXCLUDE_LIBS)*" + local qtPlugin=() + if [[ "x$WITHQTPLUGIN" == "x1" ]]; then + qtPlugin+=(--plugin qt) + fi + # Will do most of the work linuxdeploy -v1 --appdir ${EXEC^} -e target/release/${EXEC} \ - -i ${EXEC}/${EXEC}.png -d ${EXEC}/${EXEC}.desktop \ - ${*:2} $(get_additional_libs $*) + -i ${EXEC}/${EXEC}.png -d ${EXEC}/${EXEC}.desktop "${qtPlugin[@]}" # Handle aftermath things here, we force copy the qt plugins for wayland and remove unwanted # libs... NOTE: For now we force the xcb platform because of troubles with wayland... @@ -103,5 +81,5 @@ EOF deploy lkt deploy amadeus -deploy lektord --plugin qt +deploy lektord 1