Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

built latest qt 5.15 as maintained by KDE and openssl 3.1.4 #626

Merged
merged 3 commits into from
Feb 7, 2024
Merged

built latest qt 5.15 as maintained by KDE and openssl 3.1.4 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d09074c
built latest qt 5.15 as maintained by KDE and openssl 3.1.4
mgallien Feb 5, 2024
5bfae12
update Qt 5.15 to the latest maintained by KDE, openssl and SQLite
mgallien Feb 5, 2024
f279105
upgrade qtkeychain to 0.14.2 release
mgallien Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions client-appimage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

MAINTAINER Desktop Team <[email protected]>

# Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set)
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 && \
Expand All @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
mgallien marked this conversation as resolved.
Show resolved Hide resolved
mkdir build && \
cd build && \
Expand Down
16 changes: 8 additions & 8 deletions client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ MAINTAINER Desktop Team <[email protected]>
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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
Loading