From 26a2b186e62b2cbea082dab8e72350f0d83788bd Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 7 Jul 2024 12:15:59 +0200
Subject: [PATCH] kdevelop, bump version for libsvn_client (#10668)

---
 ...24.05.0.recipe => kdevelop-24.05.2.recipe} | 35 ++++++++++---------
 ...5.0.patchset => kdevelop-24.05.2.patchset} | 10 +++---
 2 files changed, 23 insertions(+), 22 deletions(-)
 rename dev-util/kdevelop/{kdevelop-24.05.0.recipe => kdevelop-24.05.2.recipe} (94%)
 rename dev-util/kdevelop/patches/{kdevelop-24.05.0.patchset => kdevelop-24.05.2.patchset} (94%)

diff --git a/dev-util/kdevelop/kdevelop-24.05.0.recipe b/dev-util/kdevelop/kdevelop-24.05.2.recipe
similarity index 94%
rename from dev-util/kdevelop/kdevelop-24.05.0.recipe
rename to dev-util/kdevelop/kdevelop-24.05.2.recipe
index cef7a542d..49e00197f 100644
--- a/dev-util/kdevelop/kdevelop-24.05.0.recipe
+++ b/dev-util/kdevelop/kdevelop-24.05.2.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="https://www.kdevelop.org/"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kdevelop-$portVersion.tar.xz"
-CHECKSUM_SHA256="ad8f11c0571c82d0d6bb0b8149110dda7e72f68fecf6296682df9aa9d92f9a9b"
+CHECKSUM_SHA256="00f2288db0770aaa23c9fdc0277cca96d1f6a8bb248db4594a618d47621ee583"
 SOURCE_DIR="kdevelop-$portVersion"
 PATCHES="kdevelop-$portVersion.patchset"
 ADDITIONAL_FILES="kdevelop.rdef.in"
@@ -46,7 +46,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 #	cmd:dbus_launch # needs the one from x86 on 32bit
 	lib:libboost_system$secondaryArchSuffix
-	lib:libclang$secondaryArchSuffix >= 17
+	lib:libclang$secondaryArchSuffix >= 18
 	lib:libdbus_1$secondaryArchSuffix
 	lib:libgrantlee_templates$secondaryArchSuffix
 	lib:libKF5Activities$secondaryArchSuffix
@@ -96,7 +96,7 @@ REQUIRES="
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
 	lib:libkomparediff2$secondaryArchSuffix
-	lib:libLLVM_17$secondaryArchSuffix
+#	lib:libLLVM$secondaryArchSuffix >= 18
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -163,7 +163,7 @@ BUILD_REQUIRES="
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:libkomparediff2$secondaryArchSuffix
-	devel:libLLVM_17$secondaryArchSuffix
+	devel:libLLVM_18$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5DBus$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
@@ -175,17 +175,24 @@ BUILD_REQUIRES="
 	devel:libQt5WebKitWidgets$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
+	devel:libsvn_client_1$secondaryArchSuffix
+	devel:libsvn_fs_1$secondaryArchSuffix
+	devel:libsvn_repos_1$secondaryArchSuffix
+	devel:libsvn_ra_1$secondaryArchSuffix
+	devel:libsvn_subr_1$secondaryArchSuffix
+	devel:libsvn_wc_1$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
 	cmd:apr_1_config$secondaryArchSuffix
 	cmd:apu_1_config$secondaryArchSuffix
-	cmd:clang_17$secondaryArchSuffix
+	cmd:clang_18$secondaryArchSuffix
 	cmd:cmake
 	cmd:find
 	cmd:g++$secondaryArchSuffix
 	cmd:kdev_pg_qt$secondaryArchSuffix
-	cmd:llvm_config$secondaryArchSuffix >= 17
+	cmd:llvm_config$secondaryArchSuffix >= 18
 	cmd:lrelease$secondaryArchSuffix >= 5.15
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -194,25 +201,19 @@ BUILD_PREREQUIRES="
 	cmd:update_mime_database$secondaryArchSuffix
 	"
 
-if [ $effectiveTargetArchitecture != "x86_gcc2" ] ; then
-	REQUIRES+="
-		lib:libsvn_client_1
-	"
-	BUILD_REQUIRES+="
-		devel:libsvn_client_1
-	"
-fi
-
 TEST_REQUIRES="
 	qthaikuplugins$secondaryArchSuffix
 	"
 
-BUILD()
+PATCH()
 {
 	# disable docs generation until libxml package is fixed
 	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
 	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+}
 
+BUILD()
+{
 	CLANG_VERSION="`clang --version | head -n 1 | cut -d " " -f3`"
 	BUILTIN_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`/clang/$CLANG_VERSION/include"
 
diff --git a/dev-util/kdevelop/patches/kdevelop-24.05.0.patchset b/dev-util/kdevelop/patches/kdevelop-24.05.2.patchset
similarity index 94%
rename from dev-util/kdevelop/patches/kdevelop-24.05.0.patchset
rename to dev-util/kdevelop/patches/kdevelop-24.05.2.patchset
index 99de5750a..dea672327 100644
--- a/dev-util/kdevelop/patches/kdevelop-24.05.0.patchset
+++ b/dev-util/kdevelop/patches/kdevelop-24.05.2.patchset
@@ -1,11 +1,11 @@
-From 71ed7e5ae9d05ddadd617a932dc00cdab85fcb04 Mon Sep 17 00:00:00 2001
+From 53f9194f6aa7b2df4576fd65718c08498be22db7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 22 Sep 2020 13:41:47 +1000
 Subject: Fix for Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 322cbdc..e1f0740 100644
+index ee01a04..0aef0d1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -80,7 +80,6 @@ endif()
@@ -75,10 +75,10 @@ index e7e3b69..332c95e 100644
  kdevplatform_add_plugin(kdevqthelp SOURCES ${kdevqthelp_SRCS})
  target_link_libraries(kdevqthelp
 -- 
-2.43.2
+2.45.2
 
 
-From ea22edc8a4fa1daacdeb0ae082b18008a2efc9b3 Mon Sep 17 00:00:00 2001
+From c7e66a497f28365fe2986756db424daf4f74280b Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Tue, 26 Mar 2024 08:14:54 +0100
 Subject: Use system theme
@@ -99,5 +99,5 @@ index e553dd0..e7b2176 100644
  
  void MainWindowPrivate::toggleArea(bool b)
 -- 
-2.43.2
+2.45.2