CVS commit: pkgsrc/x11/kde-baseapps4

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 27 23:02:32 UTC 2025

Modified Files:
        pkgsrc/x11/kde-baseapps4: distinfo
        pkgsrc/x11/kde-baseapps4/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/x11/kde-baseapps4/patches:
            patch-konqueror_src_tests_CMakeLists.txt

Log Message:
kde-baseapps4: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/kde-baseapps4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/kde-baseapps4/patches/patch-konqueror_src_tests_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-baseapps4/distinfo
diff -u pkgsrc/x11/kde-baseapps4/distinfo:1.16 pkgsrc/x11/kde-baseapps4/distinfo:1.17
--- pkgsrc/x11/kde-baseapps4/distinfo:1.16      Tue Oct 26 11:33:55 2021
+++ pkgsrc/x11/kde-baseapps4/distinfo   Wed Aug 27 23:02:32 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:33:55 nia Exp $
+$NetBSD: distinfo,v 1.17 2025/08/27 23:02:32 wiz Exp $
 
 BLAKE2s (kde-baseapps-15.12.0.tar.xz) = ac4982b3a2a946d27e160adaf89bfc0fb9159d3002865a932cefa9e511505c30
 SHA512 (kde-baseapps-15.12.0.tar.xz) = 67dfcfc46d0c9f10c6071927833d9a16c5c2696a16c1be7315a28d4c33ceb402c1505a613ff6222635771f55e6e71cb5df954ec6f477ee0ab199e8727aea8ed4
 Size (kde-baseapps-15.12.0.tar.xz) = 2050764 bytes
-SHA1 (patch-CMakeLists.txt) = f8f5fbf60388d057f845264f4c2759c90b5bc7c3
+SHA1 (patch-CMakeLists.txt) = c58024c9a517837ba7760dee2a2172e361e7125b
 SHA1 (patch-dolphin_src_CMakeLists.txt) = f524104916a8de097309fbc3d775b2ff7f9b13a8
 SHA1 (patch-dolphin_src_dolphin.desktop) = c97d4e0e9ac393b87f62fa88d4414944e18a014d
 SHA1 (patch-dolphin_src_kitemviews_private_kdirectorycontentscounterworker.cpp) = db1d193f2413ae1aa53dbc979076ba76d485883f
 SHA1 (patch-konq-plugins_validators_tidy__validator.cpp) = b1dbebad77ce52d4b07ed1015256378778400641
+SHA1 (patch-konqueror_src_tests_CMakeLists.txt) = 923e56236d6e4b3ab6511bb8c80b432cf95961f2

Index: pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt
diff -u pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt:1.1 pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt:1.1   Thu Feb 11 21:38:08 2021
+++ pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt       Wed Aug 27 23:02:32 2025
@@ -1,10 +1,22 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/02/11 21:38:08 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/08/27 23:02:32 wiz Exp $
+
+Fix build with cmake 4.
 
 dont build dolphin
 
 --- CMakeLists.txt.orig        2015-12-08 07:04:21.000000000 +0000
 +++ CMakeLists.txt
-@@ -37,7 +37,7 @@ if ( KActivities_FOUND )
+@@ -1,7 +1,9 @@
++cmake_minimum_required(VERSION 3.5)
++
+ project(KDEBASE_APPS)
+ 
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+ 
+ include(CTest)
+ include(CTestConfig.cmake)
+@@ -37,7 +39,7 @@ if ( KActivities_FOUND )
  endif ( KActivities_FOUND )
  
  add_subdirectory( lib )

Added files:

Index: pkgsrc/x11/kde-baseapps4/patches/patch-konqueror_src_tests_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-baseapps4/patches/patch-konqueror_src_tests_CMakeLists.txt:1.1
--- /dev/null   Wed Aug 27 23:02:32 2025
+++ pkgsrc/x11/kde-baseapps4/patches/patch-konqueror_src_tests_CMakeLists.txt   Wed Aug 27 23:02:32 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-konqueror_src_tests_CMakeLists.txt,v 1.1 2025/08/27 23:02:32 wiz Exp $
+
+Fix build with cmake 4.
+
+--- konqueror/src/tests/CMakeLists.txt.orig    2015-12-08 07:04:21.000000000 +0000
++++ konqueror/src/tests/CMakeLists.txt
+@@ -9,30 +9,4 @@ kde4_add_executable(centralwidget TEST c
+ target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+                       ${QT_QTTEST_LIBRARY})
+ 
+-########### konqviewmgrtest ###############
+-
+-kde4_add_unit_test(konqviewmgrtest TEST konqviewmgrtest.cpp)
+-target_link_libraries(konqviewmgrtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+-                      ${KDE4_KHTML_LIBS} ${QT_QTTEST_LIBRARY})
+-
+-########### historymanagertest ###############
+-
+-kde4_add_unit_test(historymanagertest historymanagertest.cpp)
+-target_link_libraries(historymanagertest konq konquerorprivate ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-
+-########### undomanagertest ###############
+-
+-kde4_add_unit_test(undomanagertest undomanagertest.cpp)
+-target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-
+-########### konqhtmltest ###############
+-
+-kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
+-target_link_libraries(konqhtmltest kdeinit_konqueror ${KDE4_KHTML_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-
+-########### konqviewtest ###############
+-
+-kde4_add_unit_test(konqviewtest konqviewtest.cpp)
+-target_link_libraries(konqviewtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-
+ endif (NOT WIN32)