kde-frameworks/extra-cmake-modules: Silence cmake warnings

Allen Winter (1):
      CMakeLists.txt - remove trailing '/' to fix CMP0177 warning

Friedrich W. H. Kossebau (1):
      ECMSetupQtPluginMacroNames: fix setting up names for own build

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

3 files changed, 64 insertions, 0 deletions

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.19.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.19.0.ebuild
index 01ca5c6b6d1..026c7312b7d 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.19.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.19.0.ebuild
@@ -41,6 +41,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
 	"${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch"
 	"${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch"
+	"${FILESDIR}/${PN}-6.18.0-ECMSetupQtPluginMacroNames.patch" # in 6.20
+	"${FILESDIR}/${PN}-6.18.0-fix-CMP0177-warning.patch" # in 6.20
 )
 
 python_check_deps() {
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch
new file mode 100644
index 00000000000..0eb32a9d477
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch
@@ -0,0 +1,28 @@
+From ce890f958bf86f4af4a2357e73709d4338c35588 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Tue, 7 Oct 2025 13:33:01 +0200
+Subject: [PATCH] ECMSetupQtPluginMacroNames: fix setting up names for own
+ build
+
+* asturm 2025-10-09: amends b18a78882894b813aec21a64f9d5e4ee358a1143 (in 6.18)
+
+---
+ modules/ECMSetupQtPluginMacroNames.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/ECMSetupQtPluginMacroNames.cmake b/modules/ECMSetupQtPluginMacroNames.cmake
+index 1e023211..22658df0 100644
+--- a/modules/ECMSetupQtPluginMacroNames.cmake
++++ b/modules/ECMSetupQtPluginMacroNames.cmake
+@@ -139,7 +139,7 @@ macro(ecm_setup_qtplugin_macro_names)
+ 
+ 
+     # CMAKE_AUTOMOC_MACRO_NAMES
+-    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES $[_macro_names})
++    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${_macro_names})
+ 
+     # CMAKE_AUTOMOC_DEPEND_FILTERS
+     # CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA
+-- 
+GitLab
+
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch
new file mode 100644
index 00000000000..02e5a978465
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch
@@ -0,0 +1,34 @@
+From 850ef6c884f24773abced96ba65cf497aae946e1 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 2 Oct 2025 09:10:21 -0400
+Subject: [PATCH] CMakeLists.txt - remove trailing '/' to fix CMP0177 warning
+
+KDE_MODULES_INSTALL_DIR needs to be normalized for
+the install(PROGRAMS) command. The easiest solution
+is to not have a trailing '/'.
+
+Fixes:
+```
+CMake Warning (dev) at CMakeLists.txt:96 (install):
+Policy CMP0177 is not set: install() DESTINATION paths are normalized.
+```
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8de8636..2896268b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ set(SHARE_INSTALL_DIR share
+ set(CMAKECONFIG_INSTALL_DIR       ${SHARE_INSTALL_DIR}/ECM/cmake/)
+ 
+ set(FIND_MODULES_INSTALL_DIR      ${SHARE_INSTALL_DIR}/ECM/find-modules/)
+-set(KDE_MODULES_INSTALL_DIR       ${SHARE_INSTALL_DIR}/ECM/kde-modules/)
++set(KDE_MODULES_INSTALL_DIR       ${SHARE_INSTALL_DIR}/ECM/kde-modules)
+ set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
+ set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/)
+ 
+-- 
+GitLab
+