diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index e231e590c1aa7d3ee72ec32f85f985a906838ec6..0000000000000000000000000000000000000000 --- a/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -.build/ -.build.*/ -.dockerignore -*.AppImage - -target/ -appimage/ -Dockerfile diff --git a/utils/scripts/docker/package_appimages.bash b/utils/scripts/docker/package_appimages.bash index b807068a5aef668ff19d53c4cfc1866309500e4a..7141df4d726f6d2dacdafaf45ac32e62a2f8012d 100755 --- a/utils/scripts/docker/package_appimages.bash +++ b/utils/scripts/docker/package_appimages.bash @@ -24,10 +24,7 @@ function join_by() { function get_additional_libs() { case $* in *qt*) - for LIB in /usr/lib/x86_64-linux-gnu/libQt6WaylandEglCompositorHwIntegration.so \ - /usr/lib/x86_64-linux-gnu/libQt6WaylandEglClientHwIntegration.so \ - /usr/lib/x86_64-linux-gnu/libQt6WaylandCompositor.so \ - /usr/lib/x86_64-linux-gnu/libQt6OpenGLWidgets.so \ + 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 \ @@ -50,7 +47,7 @@ function deploy() { local EXEC=${1,,} local EXTRA_QT_PLUGINS="concurrent;core;dbus;eglfsdeviceintegration;eglfskmssupport;gui;multimedia;multimediawidgets;" - local EXTRA_QT_PLUGINS+="opengl;openglwidgets;waylandclient;waylandcompositor;widgets;xcbqpa;" + local EXTRA_QT_PLUGINS+="opengl;openglwidgets;waylandclient;widgets;xcbqpa;" export EXTRA_QT_PLUGINS local EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqeglfs.so;libqwayland-egl.so;libqwayland-generic.so;" diff --git a/utils/scripts/docker/setup_base.bash b/utils/scripts/docker/setup_base.bash index ca84c2952742d0652bb4b40d06c1b2dcac864240..2ed8375655550dfa944c4bf984600cc5071f4a9e 100755 --- a/utils/scripts/docker/setup_base.bash +++ b/utils/scripts/docker/setup_base.bash @@ -12,9 +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" -PKG_BACKPORT+=" libqt6waylandclient6 libqt6waylandcompositor6 libqt6waylandeglclienthwintegration6" -PKG_BACKPORT+=" libqt6waylandeglcompositorhwintegration6 libqt6wlshellintegration6" +PKG_BACKPORT+=" qt6-wayland-dev qt6-wayland qt6-wayland-dev-tools libqt6waylandclient6" PKG_BACKPORT+=" qt6-qpa-plugins"