From e886be2215336a51416a0414adef0b5a7e7da940 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 14 Apr 2026 07:21:56 +0200 Subject: [PATCH] ECM, bump to version 6.25.0 (#13938) --- ...cipe => extra_cmake_modules-6.25.0.recipe} | 6 +-- ...et => extra_cmake_modules-6.25.0.patchset} | 48 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) rename kde-frameworks/extra-cmake-modules/{extra_cmake_modules-6.19.0.recipe => extra_cmake_modules-6.25.0.recipe} (93%) rename kde-frameworks/extra-cmake-modules/patches/{extra_cmake_modules-6.19.0.patchset => extra_cmake_modules-6.25.0.patchset} (92%) diff --git a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.19.0.recipe b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.25.0.recipe similarity index 93% rename from kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.19.0.recipe rename to kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.25.0.recipe index 1719f5458..c9c8ecc92 100644 --- a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.19.0.recipe +++ b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.25.0.recipe @@ -5,11 +5,11 @@ 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://invent.kde.org/frameworks/extra-cmake-modules" -COPYRIGHT="2010-2025 KDE Organisation" +COPYRIGHT="2010-2026 KDE Organisation" LICENSE="BSD (2-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-$portVersion.tar.xz" -CHECKSUM_SHA256="a4f0c1d8181f43e9af4b9b44696c77760b5bc9dae5bdb921f090bce664e9ca84" +CHECKSUM_SHA256="ffeb4951bf09b2b8ee17ef24a28b6de650c0db0f59ddffb9009b37cac63af348" SOURCE_DIR="extra-cmake-modules-$portVersion" PATCHES="extra_cmake_modules-$portVersion.patchset" diff --git a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.19.0.patchset b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.25.0.patchset similarity index 92% rename from kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.19.0.patchset rename to kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.25.0.patchset index 248f71b2b..b93f0fbc8 100644 --- a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.19.0.patchset +++ b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.25.0.patchset @@ -1,4 +1,4 @@ -From b1328890b343d60a73e2d75cb376bebb934bafd6 Mon Sep 17 00:00:00 2001 +From 1e55315d160bcf526928925c3b8ff06c7da65850 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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 1f6193c..b097396 100644 +index 8267507..60b35d5 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake -@@ -239,7 +239,7 @@ include("${ECM_MODULE_DIR}/ECMSourceVersionControl.cmake") +@@ -248,7 +248,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 1f6193c..b097396 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.51.0 +2.52.0 -From dc731bd638e36f1e6cbf261c71007c0419ad4c87 Mon Sep 17 00:00:00 2001 +From f1e6d0824b9a4f42e6713fbffa97c586342a216a 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 7e354dd..357f4b6 100644 +index e51d586..7cb33bb 100644 --- a/kde-modules/KDEMetaInfoPlatformCheck.cmake +++ b/kde-modules/KDEMetaInfoPlatformCheck.cmake -@@ -50,6 +50,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}") +@@ -52,6 +52,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}") if (WIN32) set(_MetainfoFoundSupportedPlatform true) endif() @@ -44,10 +44,10 @@ index 7e354dd..357f4b6 100644 if (CMAKE_SYSTEM_NAME MATCHES "Darwin") set(_MetainfoFoundSupportedPlatform true) -- -2.51.0 +2.52.0 -From 88e380bfa799a16b6a4c62bc5d4fc5bb84a0cdcd Mon Sep 17 00:00:00 2001 +From e37ea3a4ee41b8628fed435ad26af2d1b954ad16 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 28 Feb 2024 11:48:23 +0100 Subject: demote_unsupported_platform_error_to_a_warning @@ -55,10 +55,10 @@ 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 +index 7cb33bb..03233a3 100644 --- a/kde-modules/KDEMetaInfoPlatformCheck.cmake +++ b/kde-modules/KDEMetaInfoPlatformCheck.cmake -@@ -78,6 +78,6 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}") +@@ -80,6 +80,6 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}") endforeach() if (NOT _MetainfoFoundSupportedPlatform) @@ -67,10 +67,10 @@ index 357f4b6..45152c8 100644 endif() endif() -- -2.51.0 +2.52.0 -From 8767eade6b0e2e9c6a39bb9b3109adf229713af5 Mon Sep 17 00:00:00 2001 +From af05c682fd15cd5a11de9ab234135cebd1231756 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Tue, 20 May 2025 16:21:06 +0200 Subject: Fix hardcoded paths, we don't use /usr/* @@ -119,10 +119,10 @@ index d59c1b8..e6aa25f 100644 set -x --path XDG_CONFIG_DIRS "@KDE_INSTALL_FULL_CONFDIR@" $XDG_CONFIG_DIRS -- -2.51.0 +2.52.0 -From 078dced5eaa3a235f0c4a3dade8b2d7fc80755ac Mon Sep 17 00:00:00 2001 +From 488958dd6b61597cf0b345dcce67acd05247518d Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Thu, 16 Oct 2025 14:39:36 +0200 Subject: Set QTPLUGINDIR,QMLDIR and QCHDIR for Haiku @@ -130,10 +130,10 @@ Subject: Set QTPLUGINDIR,QMLDIR and QCHDIR for Haiku Also set default path for DATAROOTDIR and INCLUDEDIR diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake -index 4550dd1..f493afd 100644 +index a346c4d..604ae08 100644 --- a/kde-modules/KDEInstallDirs5.cmake +++ b/kde-modules/KDEInstallDirs5.cmake -@@ -241,6 +241,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirsCommon.cmake) +@@ -243,6 +243,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirsCommon.cmake) if(WIN32) _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}") @@ -142,7 +142,7 @@ index 4550dd1..f493afd 100644 else() _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}/kf5") endif() -@@ -295,17 +297,31 @@ else() +@@ -297,17 +299,31 @@ else() set(_pluginsDirParent) #androiddeployqt wants plugins right in the prefix endif() @@ -185,7 +185,7 @@ index 4550dd1..f493afd 100644 endif() _define_relative(PLUGINDIR QTPLUGINDIR "" -@@ -330,8 +346,16 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) +@@ -332,8 +348,16 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) _define_absolute(QTQCHDIR ${qt_docs_dir} "documentation bundles in QCH format for Qt-extending libraries") else() @@ -205,10 +205,10 @@ index 4550dd1..f493afd 100644 diff --git a/kde-modules/KDEInstallDirs6.cmake b/kde-modules/KDEInstallDirs6.cmake -index b71c535..80a1fb6 100644 +index 792b5b9..155f339 100644 --- a/kde-modules/KDEInstallDirs6.cmake +++ b/kde-modules/KDEInstallDirs6.cmake -@@ -200,6 +200,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirsCommon.cmake) +@@ -202,6 +202,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/KDEInstallDirsCommon.cmake) if(WIN32) _define_non_cache(LIBEXECDIR_KF "${CMAKE_INSTALL_LIBEXECDIR}") @@ -217,7 +217,7 @@ index b71c535..80a1fb6 100644 else() _define_non_cache(LIBEXECDIR_KF "${CMAKE_INSTALL_LIBEXECDIR}/kf6") endif() -@@ -244,11 +246,21 @@ else() +@@ -246,11 +248,21 @@ else() set(_pluginsDirParent) #androiddeployqt wants plugins right in the prefix endif() @@ -244,7 +244,7 @@ index b71c535..80a1fb6 100644 endif() _define_relative(PLUGINDIR QTPLUGINDIR "" -@@ -264,8 +276,16 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) +@@ -266,8 +278,16 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) _define_absolute(QTQCHDIR ${qt_docs_dir} "documentation bundles in QCH format for Qt-extending libraries") else() @@ -320,5 +320,5 @@ index 30726b7..2bc4f47 100644 "man documentation" MAN_INSTALL_DIR) -- -2.51.0 +2.52.0