mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

Docker and jfjoch_viewer: Fixes for issues with Qt plugins

Browse Source
This commit is contained in:
leonarski_f
2025-09-19 19:36:16 +02:00
parent c209481446
commit 3588f1f05e
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/rocky8/Dockerfile
+5 -4
View File
@@ -32,11 +32,9 @@ RUN dnf -y update && \
redhat-rpm-config \
ninja-build \
libxcb-devel \
xcb-util-wm-devel \
xcb-util-image-devel \
xcb-util-keysyms-devel \
xcb-util-renderutil-devel \
xcb-util-*-devel \
libxkbcommon-devel \
libxkbcommon-x11-devel \
libX11-devel \
libXext-devel \
libXrender-devel \
@@ -110,6 +108,9 @@ RUN set -eux; \
-DQT_BUILD_TESTS=OFF \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_FEATURE_dbus=ON \
-DQT_FEATURE_xcb=ON \
-DQT_FEATURE_xcb_xlib=ON \
-DQT_FEATURE_xkbcommon_x11=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-DCMAKE_C_COMPILER=${CC} \
docker/rocky9/Dockerfile
+5 -4
View File
@@ -35,11 +35,9 @@ RUN dnf -y update && \
perl \
pkgconf-pkg-config \
libxcb-devel \
xcb-util-wm-devel \
xcb-util-image-devel \
xcb-util-keysyms-devel \
xcb-util-renderutil-devel \
xcb-util-*-devel \
libxkbcommon-devel \
libxkbcommon-x11-devel \
libX11-devel \
libXext-devel \
libXrender-devel \
@@ -106,6 +104,9 @@ RUN set -eux; \
-DQT_BUILD_TESTS=OFF \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_FEATURE_dbus=ON \
-DQT_FEATURE_xcb=ON \
-DQT_FEATURE_xcb_xlib=ON \
-DQT_FEATURE_xkbcommon_x11=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-DCMAKE_C_COMPILER=${CC} \
docker/ubuntu2204/Dockerfile
+9
View File
@@ -43,6 +43,7 @@ RUN set -eux; \
libxfixes-dev \
libxinerama-dev \
libxkbcommon-dev \
libxkbcommon-x11-dev \
libx11-xcb-dev \
libxcb-image0-dev \
libxcb-icccm4-dev \
@@ -52,6 +53,11 @@ RUN set -eux; \
libxcb-randr0-dev \
libxcb-xkb-dev \
libxcb-shm0-dev \
libxcb-cursor0 \
libxcb-cursor-dev \
libxcb-shape0-dev \
libxcb-sync-dev \
libxcb-xfixes0-dev \
libgl1-mesa-dev \
libegl1-mesa-dev \
libdbus-1-dev \
@@ -114,6 +120,9 @@ RUN set -eux; \
-DQT_BUILD_TESTS=OFF \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_FEATURE_dbus=ON \
-DQT_FEATURE_xcb=ON \
-DQT_FEATURE_xcb_xlib=ON \
-DQT_FEATURE_xkbcommon_x11=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-DCMAKE_C_COMPILER=${CC} \
docker/ubuntu2404/Dockerfile
+9
View File
@@ -41,7 +41,11 @@ RUN set -eux; \
libxfixes-dev \
libxinerama-dev \
libxkbcommon-dev \
libxkbcommon-x11-dev \
libx11-xcb-dev \
libxcb-shape0-dev \
libxcb-sync-dev \
libxcb-xfixes0-dev \
libxcb-image0-dev \
libxcb-icccm4-dev \
libxcb-keysyms1-dev \
@@ -50,6 +54,8 @@ RUN set -eux; \
libxcb-randr0-dev \
libxcb-xkb-dev \
libxcb-shm0-dev \
libxcb-cursor0 \
libxcb-cursor-dev \
libgl1-mesa-dev \
libegl1-mesa-dev \
libdbus-1-dev \
@@ -111,6 +117,9 @@ RUN set -eux; \
-DQT_BUILD_TESTS=OFF \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_FEATURE_dbus=ON \
-DQT_FEATURE_xcb=ON \
-DQT_FEATURE_xcb_xlib=ON \
-DQT_FEATURE_xkbcommon_x11=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-DCMAKE_C_COMPILER=${CC} \
viewer/CMakeLists.txt
+1 -1
View File
@@ -67,4 +67,4 @@ INSTALL(
COMPONENT viewer
)
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin)
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin)