ECM, bump version (#10207)

kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.0.0.recipe

@@ -4,14 +4,14 @@ modules provided by CMake, including ones used by find_package() to find \
 common software, ones that can be used directly in CMakeLists.txt files to \
 perform common tasks and toolchain files that must be specified on the \
 commandline by the user."
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules/"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-${portVersion}.tar.xz"
-CHECKSUM_SHA256="ee3e35f6a257526b8995a086dd190528a8ef4b3854b1e457b8122701b0ce45ee"
-SOURCE_DIR="extra-cmake-modules-${portVersion}"
-PATCHES="extra_cmake_modules-${portVersion}.patchset"
+SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-$portVersion.tar.xz"
+CHECKSUM_SHA256="23992bf19db717156b7d6dd13118caa79fd57f090beb062e8308db3c09f70d0c"
+SOURCE_DIR="extra-cmake-modules-$portVersion"
+PATCHES="extra_cmake_modules-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -31,41 +31,37 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Quick$secondaryArchSuffix
+	devel:libQt6UiTools$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
+	cmd:dot
+	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
-	cmd:linguist$secondaryArchSuffix
 	cmd:make
-	cmd:qcollectiongenerator$secondaryArchSuffix
+	cmd:python3
 	"
 
-PATCH()
-{
-	sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml
-}
-
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DSHARE_INSTALL_DIR=$dataDir/cmake/Modules
-
-	make $jobArgs
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		-DSHARE_INSTALL_DIR=$dataDir/cmake/Modules \
+		-DDOC_INSTALL_DIR=$docDir \
+		-DMAN_INSTALL_DIR=$manDir \
+		-DBUILD_WITH_QT6=ON \
+		-DBUILD_QCH=ON
+	make -Cbuild $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -Cbuild install
 }
 
 TEST()
 {
-	cd build
-	make test
+	# 99% tests passed, 1 tests failed out of 95
+	make -Cbuild test
 }

kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.0.0.patchset

@@ -1,4 +1,4 @@
-From d6038d0eb39858ef9e91c9384812c7ad1ec85a16 Mon Sep 17 00:00:00 2001
+From 09b932bb36f2e8face512efe966c2cabfa7cd49e Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Mon, 16 Dec 2019 16:01:30 +0300
 Subject: don't default to using debug build type on Haiku...
@@ -6,10 +6,10 @@ Subject: don't default to using debug build type on Haiku...
 if the source directory is a git clone
 
 diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
-index 762cfc6..1cc5e38 100644
+index 97657fb..7f83365 100644
 --- a/kde-modules/KDECompilerSettings.cmake
 +++ b/kde-modules/KDECompilerSettings.cmake
-@@ -230,7 +230,7 @@ include("${ECM_MODULE_DIR}/ECMSourceVersionControl.cmake")
+@@ -233,7 +233,7 @@ include("${ECM_MODULE_DIR}/ECMSourceVersionControl.cmake")
  # source directory is a git clone.
  # Otherwise, leave it empty, to let distro packagers choose the flags.
  ############################################################
@@ -19,20 +19,20 @@ index 762cfc6..1cc5e38 100644
      message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
      set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE "${default_build_type}")
 -- 
-2.30.2
+2.43.2
 
 
-From 52922b0d4ae5277e66a9a71606e48637bf09bd8b Mon Sep 17 00:00:00 2001
+From 8ccad66da54edae309421152708eae184de0762b Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 8 May 2022 21:16:49 +1000
 Subject: Add Haiku platform check
 
 
 diff --git a/kde-modules/KDEMetaInfoPlatformCheck.cmake b/kde-modules/KDEMetaInfoPlatformCheck.cmake
-index 7efcdb7..cb8318d 100644
+index 7e354dd..357f4b6 100644
 --- a/kde-modules/KDEMetaInfoPlatformCheck.cmake
 +++ b/kde-modules/KDEMetaInfoPlatformCheck.cmake
-@@ -42,6 +42,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
+@@ -50,6 +50,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
                  if (WIN32)
                      set(_MetainfoFoundSupportedPlatform true)
                  endif()
@@ -44,5 +44,28 @@ index 7efcdb7..cb8318d 100644
                  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
                      set(_MetainfoFoundSupportedPlatform true)
 -- 
-2.30.2
+2.43.2
+
+
+From 0398098604786758cda6586b5ef9d91c0819934b Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Wed, 28 Feb 2024 11:48:23 +0100
+Subject: demote_unsupported_platform_error_to_a_warning
+
+From Debian patches
+
+diff --git a/kde-modules/KDEMetaInfoPlatformCheck.cmake b/kde-modules/KDEMetaInfoPlatformCheck.cmake
+index 357f4b6..45152c8 100644
+--- a/kde-modules/KDEMetaInfoPlatformCheck.cmake
++++ b/kde-modules/KDEMetaInfoPlatformCheck.cmake
+@@ -78,6 +78,6 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
+     endforeach()
+ 
+     if (NOT _MetainfoFoundSupportedPlatform)
+-        message(FATAL_ERROR "Your current platform '${CMAKE_SYSTEM_NAME}' is not supported. The list of supported platorms is '${_MetainfoSupportedPlatforms}'.If you think this is a mistake or you are working on enabling the platform please build with the KF_IGNORE_PLATFORM_CHECK variable set to true")
++        message(WARNING "Your current platform '${CMAKE_SYSTEM_NAME}' is not supported. The list of supported platorms is '${_MetainfoSupportedPlatforms}'.If you think this is a mistake or you are working on enabling the platform please build with the KF_IGNORE_PLATFORM_CHECK variable set to true")
+     endif()
+ endif()
+-- 
+2.43.2