From d09074c8453ee481242b9704b567bd5da54229c5 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 5 Feb 2024 09:25:31 +0100 Subject: [PATCH 1/3] built latest qt 5.15 as maintained by KDE and openssl 3.1.4 Signed-off-by: Matthieu Gallien --- client/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/Dockerfile b/client/Dockerfile index 013c7da2..0ba00cab 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -6,20 +6,20 @@ MAINTAINER Desktop Team ARG BUILD_QT ENV VER_QT kde-5.15 -ENV VER_QT_DATE 2023-08-21 -ENV VER_OPENSSL 3.0.10 +ENV VER_QT_DATE 2024-02-03 +ENV VER_OPENSSL 3.1.4 ENV VER_LIBP11 libp11-0.4.12 ENV VER_KFRAMEWORKS 5.107.0 -ENV VER_SQLITE 3430000 -ENV VER_SQLITE_YEAR 2023 +ENV VER_SQLITE 3450100 +ENV VER_SQLITE_YEAR 2024 ENV QT_ROOT /opt/qt${VER_QT} RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt-get update && \ - apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \ + apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget && \ apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -q -y \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \ git \ ninja-build \ curl \ @@ -173,7 +173,7 @@ RUN if [ "$BUILD_QT" = "1" ] ; then \ # Build Qt RUN if [ "$BUILD_QT" = "1" ] ; then \ # Do not require matching versions of Qt dependencies for WebEngine modules - sed -i "s/5.15.14 /5.15.10 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \ + sed -i "s/5.15.17 /5.15.12 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \ ; fi # Build Qt From 5bfae12af66d823c24c7f715298cb62e334397f7 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 5 Feb 2024 17:55:36 +0100 Subject: [PATCH 2/3] update Qt 5.15 to the latest maintained by KDE, openssl and SQLite build image for AppImage packaging Signed-off-by: Matthieu Gallien --- client-appimage/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client-appimage/Dockerfile b/client-appimage/Dockerfile index 11e8af00..a0099cfb 100644 --- a/client-appimage/Dockerfile +++ b/client-appimage/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 MAINTAINER Desktop Team @@ -6,20 +6,20 @@ MAINTAINER Desktop Team ARG BUILD_QT ENV VER_QT kde-5.15 -ENV VER_QT_DATE 2023-08-22 -ENV VER_OPENSSL 3.0.10 +ENV VER_QT_DATE 2024-02-05 +ENV VER_OPENSSL 3.1.4 ENV VER_LIBP11 libp11-0.4.12 ENV VER_KFRAMEWORKS 5.107.0 -ENV VER_SQLITE 3430000 -ENV VER_SQLITE_YEAR 2023 +ENV VER_SQLITE 3450100 +ENV VER_SQLITE_YEAR 2024 ENV QT_ROOT /opt/qt${VER_QT} # https://askubuntu.com/questions/158871/how-do-i-enable-the-source-code-repositories RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt-get update && \ - apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \ - DEBIAN_FRONTEND=noninteractive apt-get install -q -y software-properties-common && \ + apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget && \ + DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends software-properties-common && \ rm -rf /var/lib/apt/lists/* && \ # Ubuntus version of inkscape is outdated add-apt-repository -y ppa:inkscape.dev/stable && \ @@ -28,7 +28,7 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ # Install packages apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -q -y \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \ git \ ninja-build \ curl \ @@ -170,7 +170,7 @@ RUN if [ "$BUILD_QT" = "1" ] ; then \ # Build Qt RUN if [ "$BUILD_QT" = "1" ] ; then \ # Do not require matching versions of Qt dependencies for WebEngine modules - sed -i "s/5.15.14 /5.15.10 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \ + sed -i "s/5.15.17 /5.15.12 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \ ; fi # Build Qt From f2791058ebfd2442066d722a67acf6ba630bf082 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 5 Feb 2024 20:58:11 +0100 Subject: [PATCH 3/3] upgrade qtkeychain to 0.14.2 release Signed-off-by: Matthieu Gallien --- client-appimage/Dockerfile | 2 +- client/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-appimage/Dockerfile b/client-appimage/Dockerfile index a0099cfb..5f7e9ca5 100644 --- a/client-appimage/Dockerfile +++ b/client-appimage/Dockerfile @@ -214,7 +214,7 @@ ENV PKG_CONFIG_PATH ${QT_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH} # Install QtKeychain RUN if [ "$BUILD_QT" != "1" ] ; then \ cd /tmp && \ - git clone https://github.com/frankosterfeld/qtkeychain.git --depth 1 -b v0.12.0 && \ + git clone https://github.com/frankosterfeld/qtkeychain.git --depth 1 -b 0.14.2 && \ cd qtkeychain && \ mkdir build && \ cd build && \ diff --git a/client/Dockerfile b/client/Dockerfile index 0ba00cab..780d47f8 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -217,7 +217,7 @@ ENV PKG_CONFIG_PATH ${QT_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH} # Install QtKeychain RUN if [ "$BUILD_QT" != "1" ] ; then \ cd /tmp && \ - git clone https://github.com/frankosterfeld/qtkeychain.git --depth 1 -b v0.12.0 && \ + git clone https://github.com/frankosterfeld/qtkeychain.git --depth 1 -b 0.14.2 && \ cd qtkeychain && \ mkdir build && \ cd build && \