From 969950aaa8f88a70694e9b8786c3dcac7c6710b9 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 17 Jan 2025 09:25:57 +0100 Subject: [PATCH] kirigami_addons6, bump version (#11655) --- ...0.recipe => kirigami_addons6-1.7.0.recipe} | 9 ++++---- .../patches/kirigami_addons-1.6.0.patchset | 22 ------------------- 2 files changed, 4 insertions(+), 27 deletions(-) rename dev-libs/kirigami_addons/{kirigami_addons6-1.6.0.recipe => kirigami_addons6-1.7.0.recipe} (91%) delete mode 100644 dev-libs/kirigami_addons/patches/kirigami_addons-1.6.0.patchset diff --git a/dev-libs/kirigami_addons/kirigami_addons6-1.6.0.recipe b/dev-libs/kirigami_addons/kirigami_addons6-1.7.0.recipe similarity index 91% rename from dev-libs/kirigami_addons/kirigami_addons6-1.6.0.recipe rename to dev-libs/kirigami_addons/kirigami_addons6-1.7.0.recipe index 5400e1175..286a1d49f 100644 --- a/dev-libs/kirigami_addons/kirigami_addons6-1.6.0.recipe +++ b/dev-libs/kirigami_addons/kirigami_addons6-1.7.0.recipe @@ -1,13 +1,12 @@ SUMMARY="Add-ons for the Kirigami framework" DESCRIPTION="Visual end user components for Kirigami-based applications" HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/kirigami-addons/kirigami-addons-$portVersion.tar.xz" -CHECKSUM_SHA256="376dae6fc5acac7d0905ce9fef3211be0705c6e2df52bb80dfde1eaa20fe1bfa" +CHECKSUM_SHA256="7d854975185cf740de486d84f1e2ec3e4eadb66ac9fb897214cba9ab8cc492b1" SOURCE_DIR="kirigami-addons-$portVersion" -PATCHES="kirigami_addons-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -74,7 +73,7 @@ TEST_REQUIRES=" BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ diff --git a/dev-libs/kirigami_addons/patches/kirigami_addons-1.6.0.patchset b/dev-libs/kirigami_addons/patches/kirigami_addons-1.6.0.patchset deleted file mode 100644 index 4ec1a8c11..000000000 --- a/dev-libs/kirigami_addons/patches/kirigami_addons-1.6.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 26201ed3dffccda28285e5cccd48c131ccdd6486 Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Thu, 19 Dec 2024 15:39:10 +0100 -Subject: Disable KF6GlobalAccel on Haiku too - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78d4615..76dc8fa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ if (ANDROID) - find_package(Gradle REQUIRED) - endif() - --if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) -+if(NOT WIN32 AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) - find_package(KF6GlobalAccel ${KF_DEP_VERSION} REQUIRED) - set(HAVE_KGLOBALACCEL TRUE) - else() --- -2.45.2 -