From 00ffac022a731eb7d681f5c8d58af450b36f7b2f Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 12 Mar 2025 11:18:29 +0000
Subject: [PATCH] libkomparediff2, bump KF6 version, rename recipes (#11916)

---
 ...24.05.2.recipe => libkomparediff2-24.05.2.recipe} | 11 +++++++----
 ...2.0.recipe => libkomparediff2_kf6-24.12.3.recipe} | 12 +++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename kde-apps/libkomparediff2/{libkomparediff2_5-24.05.2.recipe => libkomparediff2-24.05.2.recipe} (91%)
 rename kde-apps/libkomparediff2/{libkomparediff2-24.12.0.recipe => libkomparediff2_kf6-24.12.3.recipe} (85%)

diff --git a/kde-apps/libkomparediff2/libkomparediff2_5-24.05.2.recipe b/kde-apps/libkomparediff2/libkomparediff2-24.05.2.recipe
similarity index 91%
rename from kde-apps/libkomparediff2/libkomparediff2_5-24.05.2.recipe
rename to kde-apps/libkomparediff2/libkomparediff2-24.05.2.recipe
index a9b73f1a7..949d963ea 100644
--- a/kde-apps/libkomparediff2/libkomparediff2_5-24.05.2.recipe
+++ b/kde-apps/libkomparediff2/libkomparediff2-24.05.2.recipe
@@ -18,7 +18,7 @@ libVersion="5.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	libkomparediff2_5$secondaryArchSuffix = $portVersion
+	libkomparediff2$secondaryArchSuffix = $portVersion
 	lib:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -38,16 +38,19 @@ REQUIRES="
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Xml$secondaryArchSuffix
 	"
+REPLACES="
+	libkomparediff2_5$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	libkomparediff2_5${secondaryArchSuffix}_devel = $portVersion
+	libkomparediff2${secondaryArchSuffix}_devel = $portVersion
 	devel:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libkomparediff2_5$secondaryArchSuffix == $portVersion base
+	libkomparediff2$secondaryArchSuffix == $portVersion base
 	"
 CONFLICTS_devel="
-	libkomparediff2$secondaryArchSuffix
+	libkomparediff2_kf6${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe b/kde-apps/libkomparediff2/libkomparediff2_kf6-24.12.3.recipe
similarity index 85%
rename from kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe
rename to kde-apps/libkomparediff2/libkomparediff2_kf6-24.12.3.recipe
index c3c01c5de..dcdcddb52 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe
+++ b/kde-apps/libkomparediff2/libkomparediff2_kf6-24.12.3.recipe
@@ -4,11 +4,11 @@ strings, and is used in Kompare and KDevelop.
 
 This package is part of the KDE Software Development Kit module."
 HOMEPAGE="https://invent.kde.org/sdk/libkomparediff2/"
-COPYRIGHT="2010-2024 KDE Organisation"
+COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/libkomparediff2-$portVersion.tar.xz"
-CHECKSUM_SHA256="fa729d5e8dcc3d45aa041292b21989314c2d3ec73f00ca436fe27f58000b6e79"
+CHECKSUM_SHA256="33c722e7c6935b9fe6ca7b626d10d0cd0e0878a0396b2ab659f4c4d6dd714912"
 SOURCE_DIR="libkomparediff2-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -18,7 +18,7 @@ libVersion="6.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	libkomparediff2$secondaryArchSuffix = $portVersion
+	libkomparediff2_kf6$secondaryArchSuffix = $portVersion
 	lib:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -29,6 +29,7 @@ REQUIRES="
 	lib:libKF6ConfigCore$secondaryArchSuffix
 	lib:libKF6ConfigWidgets$secondaryArchSuffix
 	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6GuiAddons$secondaryArchSuffix
 	lib:libKF6I18n$secondaryArchSuffix
 	lib:libKF6KIOCore$secondaryArchSuffix
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
@@ -42,11 +43,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libkomparediff2${secondaryArchSuffix}_devel = $portVersion
+	libkomparediff2_kf6${secondaryArchSuffix}_devel = $portVersion
 	devel:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libkomparediff2$secondaryArchSuffix == $portVersion base
+	libkomparediff2_kf6$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -55,6 +56,7 @@ BUILD_REQUIRES="
 	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF6ConfigCore$secondaryArchSuffix
 	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6GuiAddons$secondaryArchSuffix
 	devel:libKF6I18n$secondaryArchSuffix
 	devel:libKF6KIOCore$secondaryArchSuffix
 	devel:libKF6XmlGui$secondaryArchSuffix