From 7ca21bb7e2a350e275f239028140363cbbe00762 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sun, 5 Nov 2023 12:54:21 +0100
Subject: [PATCH] BUILD: Remove some libs that are not necessary in the
appimage creation
---
.dockerignore | 8 --------
utils/scripts/docker/package_appimages.bash | 7 ++-----
utils/scripts/docker/setup_base.bash | 4 +---
3 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 .dockerignore
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index e231e590..00000000
--- 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 b807068a..7141df4d 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 ca84c295..2ed83756 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"
--
GitLab