Skip to content

chore: update for new stable-34.0 branch #947

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

Merged
mgallien merged 2 commits into from
Jun 16, 2026
+15 −25
Merged

chore: update for new stable-34.0 branch #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063ea5d
chore: update for new stable-34.0 branch
mgallien Jun 11, 2026
3e9746c
feat(multimedia): includes libcanberra for audio output
mgallien Jun 11, 2026
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
6 changes: 4 additions & 2 deletions client-appimage-qt6/Dockerfile.build.el8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ RUN dnf update -y && \
gcc-toolset-14 \
gcc-toolset-14-libatomic-devel \
git-core \
patch \
perl \
python3.12 \
python3.12-pip \
alternatives --set python /usr/bin/python3.12 && \
Expand All @@ -28,8 +30,8 @@ ADD craftmaster.ini /root/craftmaster.ini

# Install binary dependencies
RUN \
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|" && \
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|" && \
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|" && \
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|" && \
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 && \
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 && \
rm -rf /root/linux-gcc-x86_64/build \
Expand Down
22 changes: 4 additions & 18 deletions client-appimage-qt6/Dockerfile.el8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ RUN dnf update -y && \
xorg-x11-xkb-utils-devel \
xz \
xz-devel \
libcanberra-devel \
zlib-devel && \
alternatives --set python /usr/bin/python3.12 && \
alternatives --set python3 /usr/bin/python3.12
Expand All @@ -132,27 +133,12 @@ ADD craftmaster.ini /root/craftmaster.ini

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

RUN \
wget https://download.nextcloud.com/desktop/development/qt/${CRAFT_IMAGE} && \
tar xf ${CRAFT_IMAGE} && \
rm ${CRAFT_IMAGE} \
;

RUN \
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|" && \
cd /root/craft-clone && \
git remote set-url origin https://github.com/nextcloud/craft.git \
;

ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin"

# Install binary dependencies
RUN \
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|" && \
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|" && \
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|" && \
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|" && \
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 && \
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 && \
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 && \
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 && \
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 \
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 \
;
12 changes: 7 additions & 5 deletions client-appimage-qt6/craftmaster.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-2.0-or-later
[General]
Branch = stable-33.0-qt-6.10.2
Branch = stable-34.0-qt-6.10.2
CraftUrl = https://github.com/nextcloud/craft.git
CraftRevision = 7bba20683cfc0d3d5ce43594d311a1979d9a0072
CraftRevision = 6d812696a6aa025dc3c545d8feb954f23be9446e
ShallowClone = False

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

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

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

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

[Env]
CRAFT_CODESIGN_CERTIFICATE =
Expand Down