From aaa255010a9fa496dc2d1722e4825a2836fdb2b2 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 27 Apr 2025 15:40:06 +0000 Subject: [PATCH] kaccounts_integration_kf6, bump to 25.04.0 (#12263) --- ... => kaccounts_integration_kf6-25.04.0.recipe} | 16 +++++++++------- ...et => kaccounts_integration-25.04.0.patchset} | 0 2 files changed, 9 insertions(+), 7 deletions(-) rename kde-apps/kaccounts_integration/{kaccounts_integration_kf6-24.12.3.recipe => kaccounts_integration_kf6-25.04.0.recipe} (92%) rename kde-apps/kaccounts_integration/patches/{kaccounts_integration-24.12.3.patchset => kaccounts_integration-25.04.0.patchset} (100%) diff --git a/kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.3.recipe b/kde-apps/kaccounts_integration/kaccounts_integration_kf6-25.04.0.recipe similarity index 92% rename from kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.3.recipe rename to kde-apps/kaccounts_integration/kaccounts_integration_kf6-25.04.0.recipe index 4be827665..0ef0c5b43 100644 --- a/kde-apps/kaccounts_integration/kaccounts_integration_kf6-24.12.3.recipe +++ b/kde-apps/kaccounts_integration/kaccounts_integration_kf6-25.04.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kaccounts-integration-$portVersion.tar.xz" -CHECKSUM_SHA256="d685b97b32b4926c81b2b035c4d21e4d474957f42c0beff673dba59ad4f3ea4f" +CHECKSUM_SHA256="c326461d39c9c8cc366c42f46a3ee354ee7ee1de428b7a835f2221a5252b6299" SOURCE_DIR="kaccounts-integration-$portVersion" PATCHES="kaccounts_integration-$portVersion.patchset" @@ -80,7 +80,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - cmd:make + cmd:ninja cmd:msgfmt$secondaryArchSuffix cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix @@ -88,19 +88,21 @@ BUILD_PREREQUIRES=" BUILD() { - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -G Ninja -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DCMAKE_SKIP_RPATH=YES \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=OFF - make -C build $jobArgs + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF \ + -DWno-dev + + ninja -v -C build $jobArgs } INSTALL() { - make -C build install + ninja -C build install prepareInstalledDevelLib \ libkaccounts6 diff --git a/kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.3.patchset b/kde-apps/kaccounts_integration/patches/kaccounts_integration-25.04.0.patchset similarity index 100% rename from kde-apps/kaccounts_integration/patches/kaccounts_integration-24.12.3.patchset rename to kde-apps/kaccounts_integration/patches/kaccounts_integration-25.04.0.patchset