diff --git a/.craft.shelf b/.craft.shelf index c3efed667f..f0649c56ba 100644 --- a/.craft.shelf +++ b/.craft.shelf @@ -1,204 +1,3 @@ [General] version = 2 blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/opencloud-eu/craft-blueprints-opencloud.git|main| - -[core/cacert] -version = 2025-09-09 - -[craft/craft-blueprints-kde] -version = master -revision = 26586a9e9 - -[craft/craft-blueprints-opencloud] -version = main -revision = 09c0c94d067b696e70f99e80640c0407e17c85f2 - -[craft/craft-core] -version = master -revision = b3c1e0d20a760afa7d00729dab4a5f29c30e6cd0 - -[dev-utils/7zip-base] -version = 25.00 - -[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/nsis] -version = 3.09 - -[dev-utils/perl] -version = 5.40.1 - -[dev-utils/pkgconf] -version = 2.4.3 - -[dev-utils/snoretoast] -version = 0.9.0 - -[kde/frameworks/extra-cmake-modules] -version = 6.18.0 - -[libs/brotli] -version = 1.1.0 - -[libs/cairo] -version = 1.18.4 - -[libs/dbus] -version = 1.14.8 - -[libs/expat] -version = 2.2.10 - -[libs/freetype] -version = 2.12.1 - -[libs/gettext] -version = 0.22.3 - -[libs/giflib] -version = 5.2.1 - -[libs/harfbuzz] -version = 11.2.0 - -[libs/icu] -version = 76.1 - -[libs/kdsingleapplication] -version = 1.2.0 - -[libs/libb2] -version = 0.98.1 - -[libs/libbzip2] -version = 1.0.6 - -[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/libunistring] -version = 1.3 - -[libs/libxml2] -version = 2.14.5 - -[libs/libzstd] -version = 1.5.7 - -[libs/llvm] -version = 20.1.7 - -[libs/nlohmann-json] -version = 3.11.2 - -[libs/openssl] -version = 3.5.4 - -[libs/pcre2] -version = 10.44 - -[libs/pixman] -version = 0.46.4 - -[libs/python] -version = 3.11.11 - -[libs/qt6/qtbase] -version = 6.9.2 - -[libs/qt6/qtdeclarative] -version = 6.9.2 - -[libs/qt6/qtimageformats] -version = 6.9.2 - -[libs/qt6/qtlanguageserver] -version = 6.9.2 - -[libs/qt6/qtshadertools] -version = 6.9.2 - -[libs/qt6/qtsvg] -version = 6.9.2 - -[libs/qt6/qttools] -version = 6.9.2 - -[libs/qt6/qttranslations] -version = 6.9.2 - -[libs/runtime] -version = 17 - -[libs/sqlite] -version = 3.50.2 - -[libs/tiff] -version = 4.4.0 - -[libs/webp] -version = 1.3.2 - -[libs/zlib] -version = 1.3.1 - -[opencloud/libre-graph-api-cpp-qt-client] -version = 1.0.7 - -[python-modules/flit-core] -version = latest - -[python-modules/hatchling] -version = 1.27.0 - -[python-modules/meson] -version = 1.4.2 - -[python-modules/packaging] -version = master - -[python-modules/pathspec] -version = latest - -[python-modules/pip] -version = 25.0.1 - -[python-modules/pluggy] -version = latest - -[python-modules/setuptools] -version = master - -[python-modules/trove-classifiers] -version = latest - -[qt-libs/qtkeychain] -version = 0.15.0 diff --git a/.github/workflows/craft_override.ini b/.github/workflows/craft_override.ini index d2830e292c..018f76a89d 100644 --- a/.github/workflows/craft_override.ini +++ b/.github/workflows/craft_override.ini @@ -10,3 +10,9 @@ Compile/UseCCache = True # no longer preinstalled on the github images and only required to build dev-utils/breakpad-tools dev-utils/python2.ignored = True dev-utils/breakpad-tools.ignored = True + +[linux-gcc-x86_64] +Environment/SourceCommand = export PKG_CONFIG_PATH=(/usr/bin/pkg-config --variable pc_path pkg-config) && source /opt/rh/gcc-toolset-14/enable + +[linux-gcc-x86_64-debug] +Environment/SourceCommand = export PKG_CONFIG_PATH=(/usr/bin/pkg-config --variable pc_path pkg-config) && source /opt/rh/gcc-toolset-14/enable \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef8f7eeef0..f1232091e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: container: - target: linux-gcc-x86_64 os: ubuntu-latest - container: ghcr.io/opencloud-eu/ci-docker-desktop/appimage:latest + container: invent-registry.kde.org/sysadmin/ci-images/craft-appimage:latest name: ${{ matrix.target }} @@ -96,6 +96,8 @@ jobs: - name: Craft setup run: | New-Item -Path ~/cache -ItemType Directory -ErrorAction SilentlyContinue + # disable git's safe.directory + git config --global --add safe.directory '*' & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" --setup - name: Craft unshelve diff --git a/CMakeLists.txt b/CMakeLists.txt index da4c66046e..4c056f3270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ cmake_minimum_required(VERSION 3.18) + +include(VERSION.cmake) +project(OpenCloudDesktop LANGUAGES CXX VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -include(VERSION.cmake) -project(OpenCloudDesktop LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}) include(FeatureSummary) find_package(ECM 6.0.0 REQUIRED NO_MODULE) @@ -18,6 +20,14 @@ set(APPLE_SUPPRESS_X11_WARNING ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(ECMMarkNonGuiExecutable) +include(ECMSetupVersion) + +include(KDECompilerSettings NO_POLICY_SCOPE) +include(ECMEnableSanitizers) + find_package(QT 6.8 NAMES Qt6 COMPONENTS Core REQUIRED) find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml Quick QuickWidgets QuickControls2 REQUIRED) @@ -29,14 +39,6 @@ if (UNIX AND NOT APPLE) find_package(Qt6 REQUIRED COMPONENTS DBus) endif() -include(KDEInstallDirs) -include(KDECMakeSettings) -include(ECMMarkNonGuiExecutable) -include(ECMSetupVersion) - -include(KDECompilerSettings NO_POLICY_SCOPE) -include(ECMEnableSanitizers) - # while we use qt_add_qml_module instead of ecm_add_qml_module # include ECMQmlModule to set up the policies include(ECMQmlModule)