CVS commit: pkgsrc/x11/kde-workspace4

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 24 15:44:12 UTC 2025

Modified Files:
        pkgsrc/x11/kde-workspace4: Makefile PLIST distinfo
        pkgsrc/x11/kde-workspace4/patches:
            patch-libs_ksysguard_processcore_CMakeLists.txt
Added Files:
        pkgsrc/x11/kde-workspace4/patches:
            patch-kcontrol_dateandtime_CMakeLists.txt
            patch-kcontrol_kfontinst_dbus_CMakeLists.txt
            patch-kdm_kcm_CMakeLists.txt

Log Message:
kde-workspace4: fix installation with cmake 4

Fix some pkglint and warnings while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/x11/kde-workspace4/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/kde-workspace4/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/kde-workspace4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_dateandtime_CMakeLists.txt \
    pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_kfontinst_dbus_CMakeLists.txt \
    pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_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-workspace4/Makefile
diff -u pkgsrc/x11/kde-workspace4/Makefile:1.127 pkgsrc/x11/kde-workspace4/Makefile:1.128
--- pkgsrc/x11/kde-workspace4/Makefile:1.127    Thu Apr 24 14:16:14 2025
+++ pkgsrc/x11/kde-workspace4/Makefile  Sun Aug 24 15:44:12 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.127 2025/04/24 14:16:14 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2025/08/24 15:44:12 wiz Exp $
 
 DISTNAME=      kde-workspace-4.11.22
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
-PKGREVISION=   66
+PKGREVISION=   67
 CATEGORIES=    x11
 COMMENT=       Base workspace for the KDE 4 integrated X11 desktop
 MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.0/src/}
@@ -22,6 +22,7 @@ CMAKE_CONFIGURE_ARGS+=        -DWITH_NepomukCor
 CMAKE_CONFIGURE_ARGS+= -DWITH_Soprano:BOOL=OFF
 CMAKE_CONFIGURE_ARGS+= -DWITH_Wayland:BOOL=OFF
 CMAKE_CONFIGURE_ARGS+= -DWITH_libgps:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
@@ -59,11 +60,7 @@ PKG_GROUPS=          ${KDM_GROUP}
 PKG_USERS=             ${KDM_USER}:${KDM_GROUP}
 PKG_GECOS.${KDM_USER}= kdm unprivileged user
 
-REPLACE_PERL+=         \
-       kcontrol/keys/convertShortcuts.pl \
-       kwin/clients/oxygen/data/update_oxygen.pl \
-       kwin/data/kwin3_plugin.pl \
-       kwin/data/pluginlibFix.pl
+REPLACE_PERL+=         kwin/clients/oxygen/data/update_oxygen.pl
 REPLACE_SH+=           libs/plasmagenericshell/widgetsexplorer/package/Messages.sh
 
 PY_PATCHPLIST= yes

Index: pkgsrc/x11/kde-workspace4/PLIST
diff -u pkgsrc/x11/kde-workspace4/PLIST:1.14 pkgsrc/x11/kde-workspace4/PLIST:1.15
--- pkgsrc/x11/kde-workspace4/PLIST:1.14        Sun Aug 20 20:46:26 2023
+++ pkgsrc/x11/kde-workspace4/PLIST     Sun Aug 24 15:44:12 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/08/20 20:46:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/08/24 15:44:12 wiz Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -2137,9 +2137,9 @@ share/kde4/servicetypes/solid-device-typ
 share/kde4/servicetypes/systemsettingscategory.desktop
 share/kde4/servicetypes/systemsettingsexternalapp.desktop
 share/kde4/servicetypes/systemsettingsview.desktop
-share/polkit-1/actions/org.kde.fontinst.policy
-share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
-share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy
-share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
+@comment share/polkit-1/actions/org.kde.fontinst.policy
+@comment share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
+@comment share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy
+@comment share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
 share/sounds/pop.wav
 @pkgdir share/kde/config/kdm/sessions

Index: pkgsrc/x11/kde-workspace4/distinfo
diff -u pkgsrc/x11/kde-workspace4/distinfo:1.24 pkgsrc/x11/kde-workspace4/distinfo:1.25
--- pkgsrc/x11/kde-workspace4/distinfo:1.24     Tue Oct 26 11:33:55 2021
+++ pkgsrc/x11/kde-workspace4/distinfo  Sun Aug 24 15:44:12 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 11:33:55 nia Exp $
+$NetBSD: distinfo,v 1.25 2025/08/24 15:44:12 wiz Exp $
 
 BLAKE2s (Daemon.README) = c333f7f722cabc6afe2918ff7d24ac9e46dce3b7ec0d83f0ca9782cca005b336
 SHA512 (Daemon.README) = 8aaf704a95c7cd25c85c4e0d789ed050b555f3ec0a3c11754b79d8b118b68c32d0eac1fbc3022124b10a7c588e78b592e77ad2f718ab4120a95b8859ca94fa5b
@@ -12,10 +12,13 @@ Size (NetBSD-flag-1.0.png) = 4532 bytes
 BLAKE2s (kde-workspace-4.11.22.tar.xz) = a66f86651cce2e5daa68f5cd38e5033d8849c81ed47b8dd2ccc8ef345f0f4f86
 SHA512 (kde-workspace-4.11.22.tar.xz) = 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95
 Size (kde-workspace-4.11.22.tar.xz) = 13553668 bytes
+SHA1 (patch-kcontrol_dateandtime_CMakeLists.txt) = 5cc55408f021df42591a142b76da8bf865ef8950
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
+SHA1 (patch-kcontrol_kfontinst_dbus_CMakeLists.txt) = c10cf4fa29e3a2020e1854525764b67543b7cca6
 SHA1 (patch-kcontrol_randr_krandrtray.cpp) = 47de3212baab5f2f20ccd9b9869ba4450b6a9bb7
 SHA1 (patch-kcontrol_randr_randroutput.cpp) = 6f9e6f18007023941018d2088a585c2ab30a7299
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
+SHA1 (patch-kdm_kcm_CMakeLists.txt) = a2ba7c905c5cadf18ea532687129b753984c6544
 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
 SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
@@ -37,7 +40,7 @@ SHA1 (patch-kwin_killer_killer.cpp) = b6
 SHA1 (patch-kwin_scene_opengl.cpp) = 53de757225b74ddf85609b2ec920659964940e59
 SHA1 (patch-libs_kephal_service_xrandr12_randroutput.cpp) = 03fc906e4ec34b31d9237ea27e7c94f3cfd4213b
 SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248
-SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
+SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = c4ccfed57b57c304f40652b98f0726d03a9afe35
 SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
 SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 37303769e7b3890b47cc4f1f2715f55f2015a3ca
 SHA1 (patch-libs_oxygen_oxygenhelper.cpp) = ef013d9492a1e59e627a82a5b842cb0b7a23160f

Index: pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt
diff -u pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt:1.1 pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt:1.2
--- pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt:1.1       Mon Mar 19 19:44:03 2012
+++ pkgsrc/x11/kde-workspace4/patches/patch-libs_ksysguard_processcore_CMakeLists.txt   Sun Aug 24 15:44:12 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-libs_ksysguard_processcore_CMakeLists.txt,v 1.1 2012/03/19 19:44:03 markd Exp $
+$NetBSD: patch-libs_ksysguard_processcore_CMakeLists.txt,v 1.2 2025/08/24 15:44:12 wiz Exp $
 
---- libs/ksysguard/processcore/CMakeLists.txt.orig     2010-06-16 12:02:57.000000000 +0000
+--- libs/ksysguard/processcore/CMakeLists.txt.orig     2015-08-12 07:03:15.000000000 +0000
 +++ libs/ksysguard/processcore/CMakeLists.txt
 @@ -18,7 +18,7 @@ target_link_libraries(processcore ${KDE4
  target_link_libraries(processcore LINK_INTERFACE_LIBRARIES ${KDE4_KDECORE_LIBS} )
@@ -11,7 +11,7 @@ $NetBSD: patch-libs_ksysguard_processcor
  endif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
  
  set_target_properties(processcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-@@ -39,6 +39,10 @@ set(ksysguardprocesslist_helper_srcs
+@@ -39,10 +39,13 @@ set(ksysguardprocesslist_helper_srcs
  
  kde4_add_executable(ksysguardprocesslist_helper ${ksysguardprocesslist_helper_srcs})
  target_link_libraries(ksysguardprocesslist_helper ${KDE4_KDECORE_LIBS})
@@ -22,3 +22,7 @@ $NetBSD: patch-libs_ksysguard_processcor
  install(TARGETS ksysguardprocesslist_helper DESTINATION ${LIBEXEC_INSTALL_DIR})
  
  kde4_install_auth_helper_files(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper root)
+-kde4_install_auth_actions(org.kde.ksysguard.processlisthelper actions.actions)
+ 
+ set_target_properties(ksysguardprocesslist_helper PROPERTIES COMPILE_FLAGS "-Wall -ggdb")
+ 

Added files:

Index: pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_dateandtime_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_dateandtime_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 24 15:44:12 2025
+++ pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_dateandtime_CMakeLists.txt Sun Aug 24 15:44:12 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-kcontrol_dateandtime_CMakeLists.txt,v 1.1 2025/08/24 15:44:12 wiz Exp $
+
+--- kcontrol/dateandtime/CMakeLists.txt.orig   2025-08-24 15:32:17.647179029 +0000
++++ kcontrol/dateandtime/CMakeLists.txt
+@@ -17,8 +17,6 @@ install(TARGETS kcmdatetimehelper DESTIN
+ 
+ kde4_install_auth_helper_files(kcmdatetimehelper org.kde.kcontrol.kcmclock root)
+ 
+-kde4_install_auth_actions(org.kde.kcontrol.kcmclock kcmclock_actions.actions)
+-
+ ########### install files ###############
+ 
+ install( FILES clock.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
Index: pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_kfontinst_dbus_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_kfontinst_dbus_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 24 15:44:12 2025
+++ pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_kfontinst_dbus_CMakeLists.txt      Sun Aug 24 15:44:12 2025
@@ -0,0 +1,9 @@
+$NetBSD: patch-kcontrol_kfontinst_dbus_CMakeLists.txt,v 1.1 2025/08/24 15:44:12 wiz Exp $
+
+--- kcontrol/kfontinst/dbus/CMakeLists.txt.orig        2025-08-24 15:32:05.035715567 +0000
++++ kcontrol/kfontinst/dbus/CMakeLists.txt
+@@ -29,4 +29,3 @@ configure_file(org.kde.fontinst.service.
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
+ 
+ kde4_install_auth_helper_files(fontinst_helper org.kde.fontinst root)
+-kde4_install_auth_actions(org.kde.fontinst fontinst.actions)
Index: pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 24 15:44:12 2025
+++ pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_CMakeLists.txt      Sun Aug 24 15:44:12 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-kdm_kcm_CMakeLists.txt,v 1.1 2025/08/24 15:44:12 wiz Exp $
+
+--- kdm/kcm/CMakeLists.txt.orig        2025-08-24 15:30:59.919788072 +0000
++++ kdm/kcm/CMakeLists.txt
+@@ -44,8 +44,6 @@ install(TARGETS kcmkdmhelper DESTINATION
+ 
+ kde4_install_auth_helper_files(kcmkdmhelper org.kde.kcontrol.kcmkdm root)
+ 
+-kde4_install_auth_actions(org.kde.kcontrol.kcmkdm kcmkdm_actions.actions)
+-
+ ########### install files ###############
+ 
+ install( FILES kdm.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )