diff --git a/utils/scripts/docker/package_appimages.bash b/utils/scripts/docker/package_appimages.bash index 7141df4d726f6d2dacdafaf45ac32e62a2f8012d..bbc0c99607799bf7be4e7b520862085515a73ac8 100755 --- a/utils/scripts/docker/package_appimages.bash +++ b/utils/scripts/docker/package_appimages.bash @@ -46,19 +46,16 @@ function get_additional_libs() { function deploy() { local EXEC=${1,,} - local EXTRA_QT_PLUGINS="concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;" - local EXTRA_QT_PLUGINS+="opengl;openglwidgets;waylandclient;widgets;xcbqpa;" + 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 EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqeglfs.so;libqwayland-egl.so;libqwayland-generic.so;" + local EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqwayland-egl.so;libqwayland-generic.so;" export EXTRA_PLATFORM_PLUGINS local EXCLUDE_LIBS="libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread" local EXCLUDE_LIBS="-name *$(join_by "* -or -name *" $EXCLUDE_LIBS)*" - local QT_SRC=/usr/lib/x86_64-linux-gnu/qt6/plugins - local QT_DST=${EXEC^}/usr/plugins - # Will do most of the work linuxdeploy -v1 --appdir ${EXEC^} -e target/release/${EXEC} \ -i ${EXEC}/${EXEC}.png -d ${EXEC}/${EXEC}.desktop \ @@ -67,19 +64,6 @@ function deploy() { # 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... mkdir -p ${EXEC^}/apprun-hooks/ - case ${*:2} in - *qt*) - for PLUGIN in ${QT_SRC}/*; do - local PLUGIN=$(basename ${PLUGIN}) - mkdir -p ${QT_DST}/${PLUGIN} - cp -rf ${QT_SRC}/${PLUGIN}/* ${QT_DST}/${PLUGIN}/ - done - for PRL_FILE in /usr/lib/x86_64-linux-gnu/libQt6Wayland*.prl; do - cp ${PRL_FILE} ${EXEC^}/usr/lib/$(basename ${PRL_FILE}) - done - ;; - *);; - esac find ${EXEC^}/usr/lib/ -type f -and \( ${EXCLUDE_LIBS} \) -delete cp LICENSE CHANGELOG.md CONTRIBUTING.md ${EXEC^}/ install -Dm644 ${EXEC}/${EXEC}.appdata.xml ${EXEC^}/usr/share/metainfo/${EXEC}.appdata.xml diff --git a/utils/scripts/docker/setup_base.bash b/utils/scripts/docker/setup_base.bash index 2ed8375655550dfa944c4bf984600cc5071f4a9e..57a496a4e60461735241ecbea899fc8888a55883 100755 --- a/utils/scripts/docker/setup_base.bash +++ b/utils/scripts/docker/setup_base.bash @@ -12,7 +12,7 @@ PKG_BACKPORT+=" libqt6multimedia6 libqt6concurrent6 libqt6multimediawidgets6 " PKG_BACKPORT+=" libqt6opengl6 libqt6openglwidgets6 libqt6widgets6" PKG_BACKPORT+=" qt6-translations-l10n qt6-l10n-tools" -PKG_BACKPORT+=" qt6-wayland-dev qt6-wayland qt6-wayland-dev-tools libqt6waylandclient6" +PKG_BACKPORT+=" qt6-wayland-dev qt6-wayland qt6-wayland-dev-tools libqt6waylandclient6 libqt6wlshellintegration6" PKG_BACKPORT+=" qt6-qpa-plugins"