CVS commit: pkgsrc/multimedia/phonon

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 17 09:06:30 UTC 2025

Modified Files:
        pkgsrc/multimedia/phonon: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/multimedia/phonon/patches: patch-phonon_CMakeLists.txt
            patch-phonon_experimental_CMakeLists.txt

Log Message:
phonon: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/multimedia/phonon/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/phonon/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/multimedia/phonon/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/phonon/patches/patch-phonon_CMakeLists.txt \
    pkgsrc/multimedia/phonon/patches/patch-phonon_experimental_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/multimedia/phonon/Makefile
diff -u pkgsrc/multimedia/phonon/Makefile:1.81 pkgsrc/multimedia/phonon/Makefile:1.82
--- pkgsrc/multimedia/phonon/Makefile:1.81      Thu Apr 24 14:15:19 2025
+++ pkgsrc/multimedia/phonon/Makefile   Sun Aug 17 09:06:30 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2025/04/24 14:15:19 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2025/08/17 09:06:30 wiz Exp $
 
 DISTNAME=      phonon-4.10.3
 
 COMMENT=       Multimedia API for KDE and QT
-PKGREVISION=   19
+PKGREVISION=   20
 
 .include "Makefile.common"
 

Index: pkgsrc/multimedia/phonon/Makefile.common
diff -u pkgsrc/multimedia/phonon/Makefile.common:1.8 pkgsrc/multimedia/phonon/Makefile.common:1.9
--- pkgsrc/multimedia/phonon/Makefile.common:1.8        Sun Aug 25 06:19:05 2024
+++ pkgsrc/multimedia/phonon/Makefile.common    Sun Aug 17 09:06:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2024/08/25 06:19:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2025/08/17 09:06:30 wiz Exp $
 
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_KDE:=phonon/4.10.3/}
@@ -11,12 +11,13 @@ LICENSE=    gnu-lgpl-v2.1
 PATCHDIR=      ${.CURDIR}/../../multimedia/phonon/patches
 DISTINFO_FILE= ${.CURDIR}/../../multimedia/phonon/distinfo
 
-USE_TOOLS+=    pkg-config gmake
-USE_LANGUAGES= c c++
-USE_CMAKE=     yes
-CMAKE_ARG_PATH=        ..
-CONFIGURE_DIRS=        _build
+USE_TOOLS+=            pkg-config gmake
+USE_LANGUAGES=         c c++
+USE_CMAKE=             yes
+CMAKE_ARG_PATH=                ..
+CONFIGURE_DIRS=                _build
 CMAKE_CONFIGURE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 .include "../../multimedia/phonon/options.mk"
 

Index: pkgsrc/multimedia/phonon/distinfo
diff -u pkgsrc/multimedia/phonon/distinfo:1.23 pkgsrc/multimedia/phonon/distinfo:1.24
--- pkgsrc/multimedia/phonon/distinfo:1.23      Tue Oct 26 11:01:14 2021
+++ pkgsrc/multimedia/phonon/distinfo   Sun Aug 17 09:06:30 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 11:01:14 nia Exp $
+$NetBSD: distinfo,v 1.24 2025/08/17 09:06:30 wiz Exp $
 
 BLAKE2s (phonon-4.10.3.tar.xz) = f3f04f83e0c116979d12462211060113301eef3d0f93284889ff0278bc5e3dec
 SHA512 (phonon-4.10.3.tar.xz) = 2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6
 Size (phonon-4.10.3.tar.xz) = 336724 bytes
 SHA1 (patch-cmake_FindPhononInternal.cmake) = 637df634276927ce8cdeeaa8657a8bbd88380544
 SHA1 (patch-cmake_PhononQt4.cmake) = 6cd5a6768df140e9683ae21dbb0f7d54cdbca617
+SHA1 (patch-phonon_CMakeLists.txt) = c3809844e19eaa9f0c495af3ab075cfa5b45ad31
+SHA1 (patch-phonon_experimental_CMakeLists.txt) = 20464b7c1cffacd2d5fa73fd96fbd95d0b24589a

Added files:

Index: pkgsrc/multimedia/phonon/patches/patch-phonon_CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/phonon/patches/patch-phonon_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 17 09:06:30 2025
+++ pkgsrc/multimedia/phonon/patches/patch-phonon_CMakeLists.txt        Sun Aug 17 09:06:30 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-phonon_CMakeLists.txt,v 1.1 2025/08/17 09:06:30 wiz Exp $
+
+cmake 4 compatibility.
+
+--- phonon/CMakeLists.txt.orig 2025-08-17 09:04:31.282190211 +0000
++++ phonon/CMakeLists.txt
+@@ -168,13 +168,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Sun
+ set_target_properties(${PHONON_LIB_SONAME} PROPERTIES
+                                            VERSION ${PHONON_LIB_VERSION}
+                                            SOVERSION ${PHONON_LIB_SOVERSION}
+-                                           DEFINE_SYMBOL MAKE_PHONON_LIB
+-                                           LINK_INTERFACE_LIBRARIES "")
+-# LINK_INTERFACE_LIBRARIES: By default don't add any linked libraries to the "exported"
+-# link interfaces, so that executables linking against this library
+-# will not automatically add implicit dependencies to their link list.
+-# This reduces inter-package dependencies and makes it easier to remove
+-# dependencies of shared libraries without breaking binary compatibility.
++                                           DEFINE_SYMBOL MAKE_PHONON_LIB)
+ 
+ target_include_directories(${PHONON_LIB_SONAME}
+     INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
Index: pkgsrc/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists.txt:1.1
--- /dev/null   Sun Aug 17 09:06:30 2025
+++ pkgsrc/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists.txt   Sun Aug 17 09:06:30 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-phonon_experimental_CMakeLists.txt,v 1.1 2025/08/17 09:06:30 wiz Exp $
+
+cmake 4 compatibility.
+
+--- phonon/experimental/CMakeLists.txt.orig    2025-08-17 09:05:10.928688690 +0000
++++ phonon/experimental/CMakeLists.txt
+@@ -26,7 +26,6 @@ set_target_properties(${PHONON_LIB_SONAM
+                                          VERSION ${PHONON_LIB_VERSION}
+                                          SOVERSION ${PHONON_LIB_SOVERSION}
+                                          DEFINE_SYMBOL MAKE_PHONONEXPERIMENTAL_LIB
+-                                         LINK_INTERFACE_LIBRARIES ""
+                                          )
+ install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT PhononExperimentalLibs ${INSTALL_TARGETS_DEFAULT_ARGS})
+ target_include_directories(${PHONON_LIB_SONAME}experimental