kirigami_addons, revbump, drop KF6GlobalAccel (#11484)

dev-libs/kirigami_addons/kirigami_addons6-1.6.0.recipe

@@ -3,10 +3,11 @@ DESCRIPTION="Visual end user components for Kirigami-based applications"
 HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/kirigami-addons/kirigami-addons-$portVersion.tar.xz"
 CHECKSUM_SHA256="376dae6fc5acac7d0905ce9fef3211be0705c6e2df52bb80dfde1eaa20fe1bfa"
 SOURCE_DIR="kirigami-addons-$portVersion"
+PATCHES="kirigami_addons-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -15,7 +16,7 @@ libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	kirigami_addons1$secondaryArchSuffix = $portVersion
+	kirigami_addons6$secondaryArchSuffix = $portVersion
 	lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -35,20 +36,21 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	kirigami_addons1${secondaryArchSuffix}_devel = $portVersion
+	kirigami_addons6${secondaryArchSuffix}_devel = $portVersion
 	devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	kirigami_addons1$secondaryArchSuffix == $portVersion base
+	kirigami_addons6$secondaryArchSuffix == $portVersion base
+	"
+REPLACES="
+	kirigami_addons1$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	# KF6
 	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF6ConfigCore$secondaryArchSuffix
 	devel:libKF6CoreAddons$secondaryArchSuffix
-	devel:libKF6GlobalAccel$secondaryArchSuffix
 	devel:libKF6GuiAddons$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
 	devel:libKirigami$secondaryArchSuffix

dev-libs/kirigami_addons/patches/kirigami_addons-1.6.0.patchset

@@ -0,0 +1,22 @@
+From 26201ed3dffccda28285e5cccd48c131ccdd6486 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+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
+