From 9d5ab9c06d72188572065f8bcaa1838befaa7f84 Mon Sep 17 00:00:00 2001 From: Raphael <1050031+raphaelcoeffic@users.noreply.github.com> Date: Wed, 23 Jul 2025 06:33:04 +0000 Subject: [PATCH 1/2] chores: update Qt to 6.9.0 --- dev/Dockerfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index 6ea6424..6985a37 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -5,14 +5,18 @@ FROM ubuntu:${OS_CODENAME} # Redeclare ARGs after FROM ARG OS_CODENAME ARG DEBIAN_FRONTEND=noninteractive -ARG QT_VERSION=5.15.2 -ARG QT_MODULES= +ARG QT_VERSION=6.9.0 +ARG QT_MODULES="-m qtmultimedia qtserialport" ARG QT_HOST=linux ARG QT_TARGET=desktop +ARG QT_ARCH=linux_gcc_64 ARG QT_INSTALL_DIR=/opt/qt ARG GCC_ARM_VERSION=14.2.rel1 ARG NODE_VERSION=20.x +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 + # Setup package repositories and install all dependencies in a single layer RUN apt-get update && \ apt-get install --yes --no-install-recommends software-properties-common gpg gpg-agent wget ca-certificates && \ @@ -50,7 +54,6 @@ RUN apt-get update && \ locales \ # Install dependencies required by Qt libs libssl-dev \ - gstreamer1.0-plugins-base \ # linuxdeploy-plugin-qt requires libxcb1 and supporting libs awesome && \ # Generate all required locales @@ -91,11 +94,10 @@ ENV PATH=${QT_BASE_DIR}/bin:$PATH ENV QT_PLUGIN_PATH=${QT_BASE_DIR}/plugins/ ENV QML_IMPORT_PATH=${QT_BASE_DIR}/qml/ ENV QML2_IMPORT_PATH=${QT_BASE_DIR}/qml/ -ENV LD_LIBRARY_PATH=${QT_BASE_DIR}/lib:$LD_LIBRARY_PATH -ENV PKG_CONFIG_PATH=${QT_BASE_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH +ENV LD_LIBRARY_PATH=${QT_BASE_DIR}/lib +ENV PKG_CONFIG_PATH=${QT_BASE_DIR}/lib/pkgconfig -RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES} && \ - strip --remove-section=.note.ABI-tag ${QT_BASE_DIR}/lib/libQt5Core.so.${QT_VERSION} +RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES} # Install ARM toolchain RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz -O - \ @@ -103,6 +105,7 @@ RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM ENV PATH=/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin/:${PATH} ENV ASAN_OPTIONS="detect_leaks=0" + # HINTS for cmake find_package ENV LIBUSB1_ROOT_DIR=/usr/lib/x86_64-linux-gnu ENV LIBSSL1_ROOT_DIR=/usr/lib/x86_64-linux-gnu From 41bd3f67560a320e95c5bccf5270fae42137a678 Mon Sep 17 00:00:00 2001 From: Raphael <1050031+raphaelcoeffic@users.noreply.github.com> Date: Wed, 23 Jul 2025 08:19:38 +0000 Subject: [PATCH 2/2] fix: add missing libcups2 --- dev/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/Dockerfile b/dev/Dockerfile index 6985a37..141c397 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -53,6 +53,7 @@ RUN apt-get update && \ nodejs \ locales \ # Install dependencies required by Qt libs + libcups2 \ libssl-dev \ # linuxdeploy-plugin-qt requires libxcb1 and supporting libs awesome && \