kommit, bump version (#10648)

kde-apps/kommit/kommit-1.6.0.recipe

@@ -5,7 +5,7 @@ COPYRIGHT="2021-2024 Hamed Masafi"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/kommit-v$portVersion.tar.bz2"
-CHECKSUM_SHA256="b118902f6cacfac4a4a3ef6536f53290f9d6713589fe1838bd2c865ae30c88cb"
+CHECKSUM_SHA256="0320d15a3d50f5de75f3e0903554479d750036e7d15344b5e99d5396d40f6e10"
 SOURCE_DIR="kommit-v$portVersion"
 PATCHES="kommit-$portVersion.patchset"
 ADDITIONAL_FILES="kommit.rdef.in"
@@ -74,6 +74,7 @@ BUILD_REQUIRES="
 	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5DbusAddons$secondaryArchSuffix
+	devel:libKF5DocTools$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
@@ -107,6 +108,12 @@ TEST_REQUIRES="
 	qthaikuplugins$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	# disable docs generation/installation
+	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+}
+
 BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \

kde-apps/kommit/patches/kommit-1.3.1.patchset

@@ -1,29 +0,0 @@
-From e0d620c2c06c70f5fe1069e5f46b920def595393 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Sun, 24 Dec 2023 21:26:26 +0100
-Subject: Disable Doctools
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bda02cd..fa865d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,7 +78,6 @@ find_package(
-         CoreAddons
-         Crash
-         DBusAddons
--        DocTools
-         I18n
-         XmlGui
-         KIO
-@@ -116,7 +115,6 @@ endif(BUILD_TESTING)
- 
- if(KF${KF_MAJOR_VERSION}DocTools_FOUND) # For the moment on kf6 it doesn't build depend against deprecated &kf5
-     add_subdirectory(doc)
--    kdoctools_install(po)
- else()
- 
-     message(WARNING "DocTools not found. NEED TO FIX IT IN QT6")
--- 
-2.42.1
-

kde-apps/kommit/patches/kommit-1.6.0.patchset

@@ -0,0 +1,22 @@
+From cd781d180f2c9b5304754efeb8b266663247ee10 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Sat, 29 Jun 2024 11:57:18 +0200
+Subject: Disable KDBUSADDONS for Haiku also
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9889e6b..54d7559 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,7 +87,7 @@ find_package(
+         SyntaxHighlighting
+ )
+ 
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+     find_package(KF${KF_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} CONFIG REQUIRED)
+     set(HAVE_KDBUSADDONS true)
+ endif()
+-- 
+2.45.1
+