Skip to content

Commit f5dfe9e

Browse files
mgallienmgallien
authored
Merge pull request #947 from nextcloud/feat/desktop/newStableImage
chore: update for new stable-34.0 branch
2 parents e786501 + 3e9746c commit f5dfe9e

3 files changed

Lines changed: 15 additions & 25 deletions

File tree

‎client-appimage-qt6/Dockerfile.build.el8‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN dnf update -y && \
1111
gcc-toolset-14 \
1212
gcc-toolset-14-libatomic-devel \
1313
git-core \
14+
patch \
15+
perl \
1416
python3.12 \
1517
python3.12-pip \
1618
alternatives --set python /usr/bin/python3.12 && \
@@ -28,8 +30,8 @@ ADD craftmaster.ini /root/craftmaster.ini
2830

2931
# Install binary dependencies
3032
RUN \
31-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-33.0|" && \
32-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-33.0|" && \
33+
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-34.0|" && \
34+
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-34.0|" && \
3335
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \
3436
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \
3537
rm -rf /root/linux-gcc-x86_64/build \

‎client-appimage-qt6/Dockerfile.el8‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ RUN dnf update -y && \
116116
xorg-x11-xkb-utils-devel \
117117
xz \
118118
xz-devel \
119+
libcanberra-devel \
119120
zlib-devel && \
120121
alternatives --set python /usr/bin/python3.12 && \
121122
alternatives --set python3 /usr/bin/python3.12
@@ -132,27 +133,12 @@ ADD craftmaster.ini /root/craftmaster.ini
132133

133134
ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.10.2-20260219.tar.gz"
134135

135-
RUN \
136-
wget https://download.nextcloud.com/desktop/development/qt/${CRAFT_IMAGE} && \
137-
tar xf ${CRAFT_IMAGE} && \
138-
rm ${CRAFT_IMAGE} \
139-
;
140-
141-
RUN \
142-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-33.0|" && \
143-
cd /root/craft-clone && \
144-
git remote set-url origin https://github.com/nextcloud/craft.git \
145-
;
146-
147136
ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin"
148137

149138
# Install binary dependencies
150139
RUN \
151-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-33.0|" && \
152-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-33.0|" && \
140+
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-34.0|" && \
141+
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-34.0|" && \
153142
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \
154-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \
155-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i kde/frameworks/tier1/karchive && \
156-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i kde/frameworks/tier1/kdbusaddons && \
157-
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i qt-libs/qtkeychain \
143+
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client \
158144
;

‎client-appimage-qt6/craftmaster.ini‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: GPL-2.0-or-later
33
[General]
4-
Branch = stable-33.0-qt-6.10.2
4+
Branch = stable-34.0-qt-6.10.2
55
CraftUrl = https://github.com/nextcloud/craft.git
6-
CraftRevision = 7bba20683cfc0d3d5ce43594d311a1979d9a0072
6+
CraftRevision = 6d812696a6aa025dc3c545d8feb954f23be9446e
77
ShallowClone = False
88

99
# Variables defined here override the default value
@@ -28,7 +28,7 @@ ShortPath/Enabled = False
2828
ShortPath/EnableJunctions = False
2929

3030
Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/
31-
Packager/CacheVersion = stable-33.0-qt-6.10.2
31+
Packager/CacheVersion = stable-34.0-qt-6.10.2
3232
ContinuousIntegration/Enabled = True
3333

3434
Packager/UseCache = ${Variables:UseCache}
@@ -39,7 +39,10 @@ Packager/CacheDir = ${Variables:Root}\cache
3939
nextcloud-client.buildTests = True
4040
binary/mysql.useMariaDB = False
4141
libs/qt6.version = 6.10.2
42-
craft/craft-blueprints-kde.revision = master
42+
craft/craft-blueprints-kde.revision = stable-34.0
43+
craft/craft-blueprints-nextcloud.revision = stable-34.0
44+
libs/zlib.version = 1.3.1
45+
libs/openssl.version = 3.6.3
4346

4447
[windows-msvc2022_64-cl]
4548
Packager/PackageType = NullsoftInstallerPackager
@@ -59,7 +62,6 @@ General/ABI = linux-gcc-x86_64
5962
Paths/Python = /usr/bin/python3
6063
Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/
6164
Packager/CacheVersion = 26.02
62-
libs/qt6.version = 6.10.2
6365

6466
[Env]
6567
CRAFT_CODESIGN_CERTIFICATE =

0 commit comments

Comments
 (0)