Skip to content

Commit 063612f

Browse files
mgallienmgallien
authored
Merge pull request #891 from nextcloud/desktop/AppImageBuiltWithKdeCraft-qt-6.10.1
feat(desktop/appimage-qt6): update image to build desktop files client
2 parents 5c44687 + 50e202a commit 063612f

File tree

3 files changed

+12
-68
lines changed

3 files changed

+12
-68
lines changed

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

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,8 @@ RUN dnf update -y && \
1111
gcc-toolset-14 \
1212
gcc-toolset-14-libatomic-devel \
1313
git-core \
14-
patch \
1514
python3.12 \
1615
python3.12-pip \
17-
xcb-util-cursor-devel \
18-
xcb-util-devel \
19-
xcb-util-image-devel \
20-
xcb-util-keysyms-devel \
21-
xcb-util-renderutil-devel \
22-
xcb-util-wm-devel \
23-
xkeyboard-config-devel \
24-
xorg-x11-server-Xvfb \
25-
xorg-x11-xkb-utils-devel \
26-
libxcb-devel \
27-
libxkbfile-devel \
28-
libxshmfence-devel \
29-
libxkbcommon-devel \
30-
libxkbcommon-x11-devel \
31-
libSM-devel \
32-
libX11-devel \
33-
libXScrnSaver-devel \
34-
libXcomposite-devel \
35-
libXcursor-devel \
36-
libXdamage-devel \
37-
libXext-devel \
38-
libXfixes-devel \
39-
libXi-devel \
40-
libXinerama-devel \
41-
libXrandr-devel \
42-
libXrender-devel \
43-
libXtst-devel \
44-
libXv-devel \
45-
mesa-libEGL-devel \
46-
mesa-libGL-devel \
47-
mesa-libgbm-devel \
4816
alternatives --set python /usr/bin/python3.12 && \
4917
alternatives --set python3 /usr/bin/python3.12
5018

@@ -60,11 +28,9 @@ ADD craftmaster.ini /root/craftmaster.ini
6028

6129
# Install binary dependencies
6230
RUN \
63-
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-4.0|" && \
64-
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-4.0|" && \
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|master|" && \
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|master|" && \
6533
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 && \
6634
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 && \
67-
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 && \
68-
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 && \
6935
rm -rf /root/linux-gcc-x86_64/build \
7036
;

‎client-appimage-qt6/Dockerfile.el8‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ RUN dnf update -y && \
5151
file \
5252
glib2-devel \
5353
wget \
54-
inkscape && \
54+
inkscape \
55+
alsa-lib-devel \
56+
librsvg2-tools && \
5557
alternatives --set python /usr/bin/python3.12 && \
5658
alternatives --set python3 /usr/bin/python3.12
5759

@@ -65,7 +67,7 @@ RUN \
6567

6668
ADD craftmaster.ini /root/craftmaster.ini
6769

68-
ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.9.3-13012026.tar.gz"
70+
ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.10.1-20260204.tar.gz"
6971

7072
RUN \
7173
wget https://download.nextcloud.com/desktop/development/qt/${CRAFT_IMAGE} && \
@@ -77,14 +79,9 @@ ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin"
7779

7880
# Install binary dependencies
7981
RUN \
80-
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-4.0|" && \
81-
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-4.0|" && \
82+
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|master|" && \
83+
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|master|" && \
8284
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 && \
8385
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 && \
84-
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 && \
85-
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 \
86-
;
87-
88-
RUN \
8986
rm -rf /root/linux-gcc-x86_64/build \
9087
;

‎client-appimage-qt6/craftmaster.ini‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[General]
44
Branch = master
55
# CraftUrl = https://github.com/allexzander/craft.git
6-
CraftRevision = 05fc0f0e7cb6cb5e8ee7eccba400ad4a2b590657
6+
CraftRevision = 7b73acd32984b67d7e1054c9a02e3d86eca9a030
77
ShallowClone = False
88

99
# Variables defined here override the default value
@@ -27,8 +27,6 @@ Compile/UseNinja = True
2727
ShortPath/Enabled = False
2828
ShortPath/EnableJunctions = False
2929

30-
#Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/
31-
#Packager/CacheVersion = stable-4.0-qt-6.9.3
3230
ContinuousIntegration/Enabled = True
3331

3432
Packager/UseCache = ${Variables:UseCache}
@@ -38,33 +36,16 @@ Packager/CacheDir = ${Variables:Root}\cache
3836
[BlueprintSettings]
3937
nextcloud-client.buildTests = True
4038
binary/mysql.useMariaDB = False
41-
libs/qt6.version = 6.9.3
42-
craft/craft-blueprints-kde.revision = stable-4.0
43-
44-
[windows-msvc2022_64-cl]
45-
Packager/PackageType = NullsoftInstallerPackager
46-
QtSDK/Compiler = msvc2022_64
47-
General/ABI = windows-msvc2022_64-cl
48-
Paths/Python = C:\Python312-x64
49-
50-
[macos-64-clang]
51-
General/ABI = macos-64-clang
52-
53-
[macos-clang-arm64]
54-
General/ABI = macos-clang-arm64
55-
Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
39+
libs/qt6.version = 6.10.1
40+
craft/craft-blueprints-kde.revision = master
5641

5742
[linux-gcc-x86_64]
5843
General/ABI = linux-gcc-x86_64
5944
Paths/Python = /usr/bin/python3
6045
Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/
6146
Packager/CacheVersion = 25.12
62-
libs/qt6.version = 6.9.3
47+
libs/qt6.version = 6.10.1
6348

6449
[Env]
6550
CRAFT_CODESIGN_CERTIFICATE =
6651
SIGN_PACKAGE = False
67-
68-
[Custom_Variables_for_Brander]
69-
qtPath = /opt/qt
70-
dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.8.3-1

0 commit comments

Comments
 (0)