pull · Sep 8, 2025 · Sep 8, 2025 · Sep 9, 2025 · Sep 10, 2025 · Sep 10, 2025
diff --git a/.clang-format b/.clang-format
@@ -11,8 +11,8 @@
 # Webkit style was loosely based on the Qt style
 BasedOnStyle: WebKit
 
-Standard: Cpp11
-ColumnLimit: 0
+Standard: c++17
+ColumnLimit: 160
 
 # Disable reflow of qdoc comments: indentation rules are different.
 # Translation comments are also excluded
@@ -48,11 +48,7 @@ AlwaysBreakTemplateDeclarations: true
 # clang-format does not handle that
 AllowShortFunctionsOnASingleLine: Inline
 
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
+SortIncludes: true
 
 # macros for which the opening brace stays attached
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
@@ -61,4 +57,6 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH
 MaxEmptyLinesToKeep: 2
 KeepEmptyLinesAtTheStartOfBlocks: false
 
-SortIncludes: true
+# Properly format c++11 initializer
+SpaceBeforeCpp11BracedList: false
+Cpp11BracedListStyle: true
diff --git a/.craft.ini b/.craft.ini
@@ -1,23 +1,25 @@
 [General]
 Branch = master
 ShallowClone = False
+# Cloned repo which contains blueprints for openssl 3.4.4 and 3.4.5
+CraftUrl=https://github.com/owncloud/craft.git
 
 # Variables defined here override the default value
-# The variable names are casesensitive
+# The variable names are case-sensitive
 [Variables]
-#Values need to be overwritten to create a chache
+#Values need to be overwritten to create a cache
 UseCache = True
 CreateCache = True
 
-ownCloudVersion = 2.10
+ownCloudVersion = 6.0
 # this version must match the target in the blueprint
 
 # update MacDeploymentTarget when updating Qt
-QtVersion = 5.15.2
-CachePatchLvl = 3
+QtVersion = 6.8.3
+CachePatchLvl = 0
 
 # set WORKSPACE to cwd, override on ci
-# with legacy fallbac APPVEYOR_BUILD_FOLDER
+# with legacy fallback APPVEYOR_BUILD_FOLDER
 WORKSPACE = ${Variables:APPVEYOR_BUILD_FOLDER}
 APPVEYOR_BUILD_FOLDER = ${Variables:Root}
 CiBuild = True
@@ -29,8 +31,9 @@ CiBuild = True
 [GeneralSettings]
 Version/ConfigVersion = 6
 
-#https://github.com/qt/qtbase/blob/5.15/mkspecs/common/macx.conf#L8
-General/MacDeploymentTarget = 10.13
+## Set the minimum supported MacOs version, this is also limited by Qt
+## https://github.com/qt/qtbase/blob/6.8/.cmake.conf#L54C5-L54C35
+#MacDeploymentTarget = 12
 
 Packager/Destination=${Variables:WORKSPACE}/binaries
 Paths/Python = C:/Python36
@@ -43,6 +46,7 @@ Packager/CacheDir = ${Variables:WORKSPACE}/cache
 Packager/UseCache = ${Variables:UseCache}
 Packager/CreateCache = ${Variables:CreateCache}
 Packager/CacheVersion = ${Variables:ownCloudVersion}/Qt_${Variables:QtVersion}_${Variables:CachePatchLvl}
+Packager/PackageDebugSymbols = False
 ; Packager/RepositoryUrl = https://files.kde.org/craft/
 Packager/RepositoryUrl =  https://download.owncloud.com/desktop/craft/cache/
 Compile/BuildType = RelWithDebInfo
@@ -57,28 +61,41 @@ CodeSigning/MacKeychainPath = sign-${Env:DRONE_BUILD_NUMBER}.keychain
 
 [BlueprintSettings]
 # skip msys in normal builds its only needed for the cache
+dev-utils/msys-base.ignored = True
 dev-utils/msys.ignored = True
 
+# in the current cache that pulls in the uncached lxml which takes ages to build
+dev-utils/gtk-doc.ignored = True
+
 binary/mysql.ignored = True
 libs/dbus.ignored = True
 libs/icu.ignored = True
-libs/llvm-meta.ignored = True
-
-libs/qt5.version = ${Variables:QtVersion}
-libs/qt5/qtbase.useLtcg = True
-libs/qt5/qtbase.withMysql = False
-libs/qt5/qtbase.withDBus = False
 
-[windows-msvc2019_64-cl]
-General/ABI = windows-msvc2019_64-cl
-
-[windows-msvc2019_64-cl-debug]
-General/ABI = windows-msvc2019_64-cl
+libs/qt6.version = ${Variables:QtVersion}
+libs/qt6/qtbase.withDBus = False
+qt-libs/qtkeychain.buildWithQt6 = True
+
+# pinning versions to fix security issues
+libs/libcurl.version = 7.84.0
+libs/openssl.version = 3.4.5
+libs/libpng.version = 1.6.45
+libs/freetype.version = 2.14.1
+
+# pinning versions to have a stable cache
+dev-utils/cmake-base.version = 3.31.9
+libs/glib.version = 2.81.0
+libs/libxml2.version = 2.12.7
+libs/libxslt.version = 1.1.42
+# 78.1 causes cache misses - libxml2 requires 78.x
+libs/icu.version = 76.1
+
+[windows-cl-msvc2022-x86_64]
+General/ABI = windows-cl-msvc2022-x86_64
+
+[windows-cl-msvc2022-x86_64-debug]
+General/ABI = windows-cl-msvc2022-x86_64
 Compile/BuildType = Debug
 
-[windows-msvc2019_32-cl]
-General/ABI = windows-msvc2019_32-cl
-
 [macos-64-clang]
 General/ABI = macos-64-clang
 # Packager/PackageType = MacPkgPackager
@@ -87,22 +104,29 @@ General/ABI = macos-64-clang
 General/ABI = macos-64-clang
 Compile/BuildType = Debug
 
+[macos-clang-arm64]
+General/ABI = macos-clang-arm64
+
+[macos-clang-arm64-debug]
+General/ABI = macos-clang-arm64
+Compile/BuildType = Debug
+
 [linux-64-gcc]
 General/ABI = linux-64-gcc
 
 [linux-64-gcc-BlueprintSettings]
 libs/dbus.ignored = False
-libs/qt5/qtbase.withDBus = True
-dev-utils/7zip.useCentosBasedBuild=True
+libs/icu.ignored = False
+libs/qt6/qtbase.withDBus = True
 
 [linux-64-gcc-debug]
 General/ABI = linux-64-gcc
 Compile/BuildType = Debug
 
 [linux-64-gcc-debug-BlueprintSettings]
 libs/dbus.ignored = False
-libs/qt5/qtbase.withDBus = True
-dev-utils/7zip.useCentosBasedBuild=True
+libs/icu.ignored = False
+libs/qt6/qtbase.withDBus = True
 
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =

diff --git a/.craft.shelf b/.craft.shelf
@@ -1,3 +1,182 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/owncloud/craft-blueprints-owncloud.git|master|;https://invent.kde.org/packaging/craft-blueprints-kde.git|master|
+blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|master|
+
+[core/cacert]
+version = 2025-09-09
+
+[craft/craft-blueprints-kde]
+version = master
+revision = 945d9fa
+
+[craft/craft-blueprints-owncloud]
+version = master
+revision = d28bcaf
+
+[craft/craft-core]
+version = master
+revision = 6cf4d10fb3024c9038bbda0cd26a220ffefab3ff
+
+[dev-utils/7zip-base]
+version = 25.01
+
+[dev-utils/cmake]
+version = latest
+
+[dev-utils/cmake-base]
+version = 3.31.9
+
+[dev-utils/icoutils]
+version = 0.32.3
+
+[dev-utils/jom]
+version = 1_1_3
+
+[dev-utils/kshimgen]
+version = 0.6.1
+
+[dev-utils/nasm]
+version = 2.16.03
+
+[dev-utils/ninja]
+version = 1.13.1
+
+[dev-utils/perl]
+version = 5.40.1
+
+[dev-utils/pkgconf]
+version = 2.5.1
+
+[dev-utils/symsorter]
+version = 0.7.0
+
+[kde/frameworks/extra-cmake-modules]
+version = 6.20.0
+
+[kde/frameworks/tier1/syntax-highlighting]
+version = 6.20.0
+
+[libs/brotli]
+version = 1.1.0
+
+[libs/cairo]
+version = 1.18.4
+
+[libs/expat]
+version = 2.7.3
+
+[libs/freetype]
+version = 2.14.1
+
+[libs/gettext]
+version = 0.22.3
+
+[libs/giflib]
+version = 5.2.1
+
+[libs/glib]
+version = 2.81.0
+
+[libs/harfbuzz]
+version = 11.2.0
+
+[libs/kdsingleapplication]
+version = 1.2.0
+
+[libs/libb2]
+version = 0.98.1
+
+[libs/libbzip2]
+version = 1.0.8
+
+[libs/libffi]
+version = 3.4.7
+
+[libs/libjpeg-turbo]
+version = 3.0.3
+
+[libs/liblzma]
+version = 5.2.3
+
+[libs/libpng]
+version = 1.6.45
+
+[libs/libre-graph-api-cpp-qt-client]
+version = 1.0.4
+
+[libs/libunistring]
+version = 1.4.1
+
+[libs/libxml2]
+version = 2.12.7
+
+[libs/libzstd]
+version = 1.5.7
+
+[libs/llvm]
+version = 20.1.7
+
+[libs/nlohmann-json]
+version = 3.12.0
+
+[libs/openssl]
+version = 3.4.5
+
+[libs/pcre2]
+version = 10.44
+
+[libs/pixman]
+version = 0.46.4
+
+[libs/python]
+version = 3.11.11
+
+[libs/qt6/qtbase]
+version = 6.8.3
+
+[libs/qt6/qtdeclarative]
+version = 6.8.3
+
+[libs/qt6/qtimageformats]
+version = 6.8.3
+
+[libs/qt6/qtlanguageserver]
+version = 6.8.3
+
+[libs/qt6/qtscxml]
+version = 6.8.3
+
+[libs/qt6/qtshadertools]
+version = 6.8.3
+
+[libs/qt6/qtsvg]
+version = 6.8.3
+
+[libs/qt6/qttools]
+version = 6.8.3
+
+[libs/qt6/qttranslations]
+version = 6.8.3
+
+[libs/runtime]
+version = 17
+
+[libs/sqlite]
+version = 3.50.4
+
+[libs/tiff]
+version = 4.4.0
+
+[libs/webp]
+version = 1.3.2
+
+[libs/zlib]
+version = 1.3.1
+
+[owncloud/libcrashreporter-qt]
+version = master
+revision = 96da290
+
+[qt-libs/qtkeychain]
+version = 0.15.0
+
diff --git a/.drone.env b/.drone.env