CVS commit: pkgsrc/x11/kdelibs4

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 20 11:32:40 UTC 2025

Modified Files:
        pkgsrc/x11/kdelibs4: distinfo
        pkgsrc/x11/kdelibs4/patches: patch-al patch-kio_CMakeLists.txt

Log Message:
kdelibs4: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/kdelibs4/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/kdelibs4/patches/patch-al
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/kdelibs4/patches/patch-kio_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/kdelibs4/distinfo
diff -u pkgsrc/x11/kdelibs4/distinfo:1.60 pkgsrc/x11/kdelibs4/distinfo:1.61
--- pkgsrc/x11/kdelibs4/distinfo:1.60   Wed Aug 17 18:51:09 2022
+++ pkgsrc/x11/kdelibs4/distinfo        Wed Aug 20 11:32:40 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2022/08/17 18:51:09 tnn Exp $
+$NetBSD: distinfo,v 1.61 2025/08/20 11:32:40 wiz Exp $
 
 BLAKE2s (kdelibs-4.14.38.tar.xz) = 1b2445541c6dc1ce334f888950ea0a6bf994d642eb4db034001f8394335a4b4a
 SHA512 (kdelibs-4.14.38.tar.xz) = 54fbbb9b2f12a47d5aca21c152164ed03cc6a6619bf285e2b93c8e9260042ffd728ef41e1badb217e552de6478687cab5d3caf14af7b32da8caca3468d469e45
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = 67561007567ba10f20d8e8
 SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
 SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
 SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
-SHA1 (patch-al) = 20212d740191a699f7aa35db8c23a3b3cb55904e
+SHA1 (patch-al) = 63e4163b4ba44b8f865f0a417e6ec5e14a84c244
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
 SHA1 (patch-cmake_modules_FindHUNSPELL.cmake) = 52bd28c88d696d52ce052ddd7702a0f46244f86e
 SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = becfce89d45fd9b70c2ca08a83ca0e650004996a
@@ -28,7 +28,7 @@ SHA1 (patch-khtml_misc_AtomicString.cpp)
 SHA1 (patch-kimgio_jp2.cpp) = 165ff6b2e6176366739c78c1ca9dc2065c2d008d
 SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
 SHA1 (patch-kinit_kinit.cpp) = 75dfe546c92169e692ddb45cd1a056a1b4042bb6
-SHA1 (patch-kio_CMakeLists.txt) = 3033fe7d31555e83f197f889cf1aa15949a3c14e
+SHA1 (patch-kio_CMakeLists.txt) = 010022fe3fa44e352a9646f3f7e49c9a2412a71a
 SHA1 (patch-kio_kfile_kopenwithdialog.cpp) = b705ed794a082bca03890d69369b4e043e90f6c5
 SHA1 (patch-kio_kfile_kpropertiesdialog.cpp) = 27bced17b818051c6df5bc1ea176fd9f2692caa4
 SHA1 (patch-kio_kssl_kopenssl.cpp) = 4d9319966f4be0b8c09501105f7664481af2834e

Index: pkgsrc/x11/kdelibs4/patches/patch-al
diff -u pkgsrc/x11/kdelibs4/patches/patch-al:1.3 pkgsrc/x11/kdelibs4/patches/patch-al:1.4
--- pkgsrc/x11/kdelibs4/patches/patch-al:1.3    Thu Feb 18 23:24:46 2016
+++ pkgsrc/x11/kdelibs4/patches/patch-al        Wed Aug 20 11:32:40 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.3 2016/02/18 23:24:46 jperkin Exp $
+$NetBSD: patch-al,v 1.4 2025/08/20 11:32:40 wiz Exp $
 
 Disable Darwin bundles.
 
---- cmake/modules/KDE4Macros.cmake.orig        2015-12-08 15:49:30.000000000 +0000
+--- cmake/modules/KDE4Macros.cmake.orig        2017-11-05 01:51:22.000000000 +0000
 +++ cmake/modules/KDE4Macros.cmake
-@@ -996,9 +996,9 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME)
+@@ -1006,9 +1006,9 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME)
  
     # determine additional parameters for add_executable()
     # for GUI apps, create a bundle on OSX
@@ -16,7 +16,15 @@ Disable Darwin bundles.
  
     # for GUI apps, this disables the additional console under Windows
     if (WIN32)
-@@ -1335,7 +1335,7 @@ function(KDE4_INSTALL_AUTH_HELPER_FILES 
+@@ -1103,7 +1103,6 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
+    # This reduces inter-package dependencies and makes it easier to remove
+    # dependencies of shared libraries without breaking binary compatibility.
+    if(NOT "${_add_lib_param}" STREQUAL "STATIC")
+-      set_target_properties(${_target_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "" )
+       set_target_properties(${_target_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "" )
+    endif(NOT "${_add_lib_param}" STREQUAL "STATIC")
+ 
+@@ -1345,7 +1344,7 @@ function(KDE4_INSTALL_AUTH_HELPER_FILES 
          configure_file(${_stubFilesDir}/dbus_policy.stub
                          ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
          install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf

Index: pkgsrc/x11/kdelibs4/patches/patch-kio_CMakeLists.txt
diff -u pkgsrc/x11/kdelibs4/patches/patch-kio_CMakeLists.txt:1.1 pkgsrc/x11/kdelibs4/patches/patch-kio_CMakeLists.txt:1.2
--- pkgsrc/x11/kdelibs4/patches/patch-kio_CMakeLists.txt:1.1    Wed Jan 17 18:53:25 2018
+++ pkgsrc/x11/kdelibs4/patches/patch-kio_CMakeLists.txt        Wed Aug 20 11:32:40 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-kio_CMakeLists.txt,v 1.1 2018/01/17 18:53:25 markd Exp $
+$NetBSD: patch-kio_CMakeLists.txt,v 1.2 2025/08/20 11:32:40 wiz Exp $
 
 Support openssl-1.1
 
---- kio/CMakeLists.txt.orig    2016-12-08 18:44:10.000000000 +0000
+--- kio/CMakeLists.txt.orig    2017-11-05 01:51:22.000000000 +0000
 +++ kio/CMakeLists.txt
 @@ -325,6 +325,7 @@ install(FILES kssl/ksslcertificatemanage
          DESTINATION  ${DATA_INSTALL_DIR}/kconf_update)
  
  kde4_add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
-+target_link_libraries(kio -lssl -lcrypto)
++target_link_libraries(kio LINK_PUBLIC -lssl -lcrypto)
  
  if(NOT KIO_NO_NEPOMUK)
    kde4_add_executable(kfilemetadatareader ${kfilemetadatareaderprocess_SRCS})