From 1f99077fb784393d6a0cb3be4490a5a5293a53ed Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 7 Sep 2023 10:50:19 +0200 Subject: [PATCH] Craft: New cache and pin versions --- .craft.ini | 5 +- .craft.shelf | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 5 deletions(-) diff --git a/.craft.ini b/.craft.ini index 299a7e789da..539dd13c2b9 100644 --- a/.craft.ini +++ b/.craft.ini @@ -14,7 +14,7 @@ ownCloudVersion = 5.0 # update MacDeploymentTarget when updating Qt QtVersion = 6.4.3 -CachePatchLvl = 2 +CachePatchLvl = 3 # set WORKSPACE to cwd, override on ci # with legacy fallbac APPVEYOR_BUILD_FOLDER @@ -72,9 +72,6 @@ libs/qt6/qtbase.withDBus = False libs/qt6/qtbase.patchLevel = 1 qt-libs/qtkeychain.buildWithQt6 = True -# the current release does not properly handle macos -kde/frameworks/extra-cmake-modules.version = master - [windows-cl-msvc2022-x86_64] General/ABI = windows-cl-msvc2022-x86_64 diff --git a/.craft.shelf b/.craft.shelf index 4b4ee9ab87c..aee51e9ada2 100644 --- a/.craft.shelf +++ b/.craft.shelf @@ -1,3 +1,165 @@ [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 = 2023-01-10 + +[craft/craft-blueprints-kde] +version = master +revision = 7005606e99ce6eff11eae3074d988dfedb4518bb + +[craft/craft-blueprints-owncloud] +version = 5 + +[craft/craft-core] +version = master +revision = 4be809853bfc637dc43f5b73f478e41e822a18bc + +[dev-utils/clazy] +version = 1.11 + +[dev-utils/cmake] +version = latest + +[dev-utils/cmake-base] +version = 3.23.3 + +[dev-utils/icoutils] +version = 0.32.3 + +[dev-utils/jom] +version = 1_1_3 + +[dev-utils/kshimgen] +version = 0.5.4 + +[dev-utils/nasm] +version = 2.15.05 + +[dev-utils/ninja] +version = 1.11.1 + +[dev-utils/patch] +version = 2.7.6 + +[dev-utils/perl] +version = 5.36.0 + +[dev-utils/pkg-config] +version = 0.29.2 + +[dev-utils/python3] +version = 3 + +[dev-utils/symsorter] +version = 0.7.0 + +[dev-utils/wget] +version = 1.21.2-45 + +[kde/frameworks/extra-cmake-modules] +version = master +revision = 9620f3e9 + +[libs/brotli] +version = 1.0.9 + +[libs/freetype] +version = 2.12.1 + +[libs/giflib] +version = 5.2.1 + +[libs/harfbuzz] +version = 2.7.2 + +[libs/kdsingleapplication] +version = 1.0.0 + +[libs/libbzip2] +version = 1.0.6 + +[libs/libjpeg-turbo] +version = 2.1.5.1 + +[libs/liblzma] +version = 5.2.3 + +[libs/libpng] +version = 1.6.39 + +[libs/libre-graph-api-cpp-qt-client] +version = 1.0.4 + +[libs/libxml2] +version = 2.10.3 + +[libs/libzstd] +version = 1.5.5 + +[libs/nlohmann-json] +version = 3.11.2 + +[libs/openssl] +version = 3.1.2 + +[libs/pcre2] +version = 10.42 + +[libs/qt6/qtbase] +version = 6.4.3 +patchLevel = 5 + +[libs/qt6/qtdeclarative] +version = 6.4.3 + +[libs/qt6/qtimageformats] +version = 6.4.3 + +[libs/qt6/qtscxml] +version = 6.4.3 + +[libs/qt6/qtshadertools] +version = 6.4.3 + +[libs/qt6/qtsvg] +version = 6.4.3 + +[libs/qt6/qttools] +version = 6.4.3 + +[libs/qt6/qttranslations] +version = 6.4.3 + +[libs/runtime] +version = 17 + +[libs/sqlite] +version = 3.42.0 + +[libs/tiff] +version = 4.4.0 + +[libs/webp] +version = 1.3.0 + +[libs/zlib] +version = 1.2.13 + +[owncloud/libcrashreporter-qt] +version = master +revision = 738ef95 + +[python-modules/pip] +version = master + +[python-modules/pip-system] +version = master + +[python-modules/virtualenv] +version = master + +[qt-libs/qtkeychain] +version = 0.14.1 +