CVS commit: pkgsrc/x11/kde-runtime4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 24 15:27:26 UTC 2025

Modified Files:
        pkgsrc/x11/kde-runtime4: Makefile PLIST distinfo
        pkgsrc/x11/kde-runtime4/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/x11/kde-runtime4/patches:
            patch-keditfiletype_tests_CMakeLists.txt
            patch-plasma_remotewidgetshelper_CMakeLists.txt

Log Message:
kde-runtime4: fix build with cmake 4.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/x11/kde-runtime4/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/kde-runtime4/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/kde-runtime4/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/kde-runtime4/patches/patch-keditfiletype_tests_CMakeLists.txt \
    pkgsrc/x11/kde-runtime4/patches/patch-plasma_remotewidgetshelper_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/kde-runtime4/Makefile
diff -u pkgsrc/x11/kde-runtime4/Makefile:1.178 pkgsrc/x11/kde-runtime4/Makefile:1.179
--- pkgsrc/x11/kde-runtime4/Makefile:1.178      Thu Apr 24 14:16:14 2025
+++ pkgsrc/x11/kde-runtime4/Makefile    Sun Aug 24 15:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.178 2025/04/24 14:16:14 wiz Exp $
+# $NetBSD: Makefile,v 1.179 2025/08/24 15:27:26 wiz Exp $
 
 DISTNAME=      kde-runtime-15.12.0
 PKGNAME=       ${DISTNAME:S/-1/4-1/}
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
 CMAKE_CONFIGURE_ARGS+= -DWITH_LibSSH:BOOL=OFF
 CMAKE_CONFIGURE_ARGS+= -DBUILD_khelpcenter=OFF
 CMAKE_CONFIGURE_ARGS+= -DBUILD_drkonqi=OFF
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
 
 .include "../../mk/bsd.prefs.mk"
 CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
@@ -47,7 +48,7 @@ PLIST.polkit= yes
 PLIST.x11=     yes
 .endif
 
-#SUBST_CLASSES+=               htdig
+#SUBST_CLASSES+=       htdig
 #SUBST_STAGE.htdig=    pre-configure
 #SUBST_MESSAGE.htdig=  Fix htdig paths.
 #SUBST_FILES.htdig=    khelpcenter/searchhandlers/khc_htsearch.pl
@@ -66,9 +67,9 @@ REPLACE_PERL+= \
        kioslave/info/kde-info2html
 
 CONF_FILES+=   ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
-                ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
-CONF_FILES+=   ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
-               ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
+               ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
+#CONF_FILES+=  ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
+#              ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
 
 BUILDLINK_DEPMETHOD.qt4-tools= full
 
@@ -89,7 +90,7 @@ INSTALLATION_DIRS+=   ${PKGMANDIR}/man1
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
+BUILDLINK_API_DEPENDS.attica?= attica>=0.1.4
 .include "../../misc/attica/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"

Index: pkgsrc/x11/kde-runtime4/PLIST
diff -u pkgsrc/x11/kde-runtime4/PLIST:1.14 pkgsrc/x11/kde-runtime4/PLIST:1.15
--- pkgsrc/x11/kde-runtime4/PLIST:1.14  Wed Aug 16 10:20:27 2023
+++ pkgsrc/x11/kde-runtime4/PLIST       Sun Aug 24 15:27:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/08/16 10:20:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/08/24 15:27:26 wiz Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -259,7 +259,7 @@ share/dbus-1/interfaces/org.kde.KTimeZon
 share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
 share/dbus-1/services/org.kde.knotify.service
 share/dbus-1/services/org.kde.kuiserver.service
-share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
+@comment share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
 share/desktop-directories/kde-development-translation.directory
 share/desktop-directories/kde-development-webdevelopment.directory
 share/desktop-directories/kde-development.directory
@@ -600,7 +600,7 @@ share/emoticons/kde4/unlove.png
 share/emoticons/kde4/wilted_rose.png
 share/emoticons/kde4/wink.png
 share/examples/kde-runtime4/kde-information.menu
-share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf
+@comment share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf
 share/icons/default.kde4
 share/icons/hicolor/128x128/apps/knetattach.png
 share/icons/hicolor/16x16/apps/knetattach.png
@@ -1713,7 +1713,7 @@ share/locale/l10n/zw/entry.desktop
 share/locale/l10n/zw/flag.png
 share/mime/packages/network.xml
 share/mime/packages/webp.xml
-${PLIST.polkit}share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
+@comment ${PLIST.polkit}share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
 share/sounds/KDE-Im-Cant-Connect.ogg
 share/sounds/KDE-Im-Connection-Lost.ogg
 share/sounds/KDE-Im-Contact-In.ogg

Index: pkgsrc/x11/kde-runtime4/distinfo
diff -u pkgsrc/x11/kde-runtime4/distinfo:1.17 pkgsrc/x11/kde-runtime4/distinfo:1.18
--- pkgsrc/x11/kde-runtime4/distinfo:1.17       Wed Aug 16 10:20:27 2023
+++ pkgsrc/x11/kde-runtime4/distinfo    Sun Aug 24 15:27:26 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2023/08/16 10:20:27 markd Exp $
+$NetBSD: distinfo,v 1.18 2025/08/24 15:27:26 wiz Exp $
 
 BLAKE2s (kde-runtime-15.12.0.tar.xz) = 5089d35093c9a46c61f4af511a7f2fbb346f8cd638f9a3581d76a5294a4e0a58
 SHA512 (kde-runtime-15.12.0.tar.xz) = 453f0538147bb3ea95d4d9e6c503f128f30a383ebe139dcf6df411688d9c245779e931c609e38ca7b94b58907e496af3299646654f53518bf2cb7aa22c8f9137
 Size (kde-runtime-15.12.0.tar.xz) = 7903824 bytes
-SHA1 (patch-CMakeLists.txt) = dc15af452f774f3726573b21b3e9e5fbf328a5c5
+SHA1 (patch-CMakeLists.txt) = 04bd741996b0114f0f18605228fcfe3364379286
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
@@ -13,5 +13,7 @@ SHA1 (patch-ag) = 5ca9064552379792c32577
 SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
 SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
 SHA1 (patch-doc_kcontrol_CMakeLists.txt) = c6300735d29c009322e4fdb4d58a606940fb0c62
+SHA1 (patch-keditfiletype_tests_CMakeLists.txt) = 786cbe61a08ff330295dc9c38036c7420c4f7daa
 SHA1 (patch-kioslave_nfs_rpc__nfs2__prot__xdr.c) = f1d8dc8224e68ef323f06602bf4b856c785f15e4
 SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457
+SHA1 (patch-plasma_remotewidgetshelper_CMakeLists.txt) = e654037b489ec2c0d9cc69da8874195a91231114

Index: pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt
diff -u pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt:1.1 pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt:1.1    Wed Aug 16 10:20:27 2023
+++ pkgsrc/x11/kde-runtime4/patches/patch-CMakeLists.txt        Sun Aug 24 15:27:26 2025
@@ -1,10 +1,22 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/08/16 10:20:27 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/08/24 15:27:26 wiz Exp $
+
+Fix build with cmake 4.
 
 Don't build drkonqi
 
---- CMakeLists.txt.orig        2021-02-25 05:28:06.355694442 +0000
+--- CMakeLists.txt.orig        2015-11-05 04:25:02.000000000 +0000
 +++ CMakeLists.txt
-@@ -107,7 +107,7 @@ add_subdirectory(kimgio)
+@@ -1,7 +1,9 @@
++cmake_minimum_required(VERSION 3.5)
++
+ project(KDEBASE_RUNTIME)
+ 
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+ 
+ include(CTest)
+ include(CTestConfig.cmake)
+@@ -107,7 +109,7 @@ add_subdirectory(kimgio)
  macro_optional_add_subdirectory(renamedlgplugins)
  
  # UI Helper applications

Added files:

Index: pkgsrc/x11/kde-runtime4/patches/patch-keditfiletype_tests_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-runtime4/patches/patch-keditfiletype_tests_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 24 15:27:26 2025
+++ pkgsrc/x11/kde-runtime4/patches/patch-keditfiletype_tests_CMakeLists.txt    Sun Aug 24 15:27:26 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-keditfiletype_tests_CMakeLists.txt,v 1.1 2025/08/24 15:27:26 wiz Exp $
+
+--- keditfiletype/tests/CMakeLists.txt.orig    2025-08-24 15:19:05.884207060 +0000
++++ keditfiletype/tests/CMakeLists.txt
+@@ -2,12 +2,3 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURR
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${KDE4_INCLUDES} )
+ 
+ ########### filetypestest ###############
+-
+-kde4_add_unit_test(filetypestest TEST 
+- filetypestest.cpp
+- ../mimetypedata.cpp
+- ../mimetypewriter.cpp
+- ../sharedmimeinfoversion.cpp
+-)
+-target_link_libraries(filetypestest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBRARIES}
+-                      ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
Index: pkgsrc/x11/kde-runtime4/patches/patch-plasma_remotewidgetshelper_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-runtime4/patches/patch-plasma_remotewidgetshelper_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 24 15:27:26 2025
+++ pkgsrc/x11/kde-runtime4/patches/patch-plasma_remotewidgetshelper_CMakeLists.txt     Sun Aug 24 15:27:26 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-plasma_remotewidgetshelper_CMakeLists.txt,v 1.1 2025/08/24 15:27:26 wiz Exp $
+
+--- plasma/remotewidgetshelper/CMakeLists.txt.orig     2025-08-24 15:19:44.237095408 +0000
++++ plasma/remotewidgetshelper/CMakeLists.txt
+@@ -4,6 +4,3 @@ kde4_add_executable(kcmremotewidgetshelp
+ target_link_libraries(kcmremotewidgetshelper ${KDE4_KDECORE_LIBS})
+ install(TARGETS kcmremotewidgetshelper DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 
+-kde4_install_auth_helper_files(kcmremotewidgetshelper org.kde.kcontrol.kcmremotewidgets root)
+-kde4_install_auth_actions(org.kde.kcontrol.kcmremotewidgets kcm_remotewidgets.actions)
+-