From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: UPDATE: cantata-3.4.0
To: The OpenBSD ports mailing-list <ports@openbsd.org>
Date: Fri, 12 Dec 2025 12:55:36 +0100

Simple update cantata-3.4.0. Tested on amd64. OK?

Cheers Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/cantata/Makefile,v
diff -u -p -u -p -r1.31 Makefile
--- Makefile	6 Jun 2025 05:39:09 -0000	1.31
+++ Makefile	12 Dec 2025 11:55:13 -0000
@@ -2,18 +2,17 @@ COMMENT =	Qt-based MPD client
 
 GH_ACCOUNT=     nullobsi
 GH_PROJECT=     cantata
-GH_TAGNAME=     v3.3.0
+GH_TAGNAME=     v3.4.0
 
 CATEGORIES =	audio
 
 # GPLv2 only
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6DBus
-WANTLIB += Qt6Gui Qt6Multimedia Qt6Network Qt6Sql Qt6Svg Qt6Widgets
-WANTLIB += Qt6Xml avahi-client avahi-common avcodec avformat avutil
-WANTLIB += c cddb cdio_cdda cdio_paranoia ebur128 m mpg123 mtp
-WANTLIB += musicbrainz5 tag z
+WANTLIB += ${COMPILER_LIBCXX} GL KF6Archive KF6ItemViews Qt6Concurrent
+WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Multimedia Qt6Network Qt6Sql
+WANTLIB += Qt6Svg Qt6Widgets Qt6Xml avahi-client avahi-common
+WANTLIB += avcodec avformat avutil c ebur128 m mpg123 tag z
 
 MODULES =	devel/cmake \
 		x11/qt6
@@ -21,19 +20,19 @@ MODULES =	devel/cmake \
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+4,-guic
 
-LIB_DEPENDS =	audio/libcddb \
-		audio/libcdio-paranoia \
-		audio/libebur128 \
-		audio/libmusicbrainz5 \
+LIB_DEPENDS =	audio/libebur128 \
 		audio/mpg123 \
-		audio/taglib>=2.0 \
-		devel/libmtp \
+		audio/taglib \
 		graphics/ffmpeg \
 		net/avahi,-libs \
 		x11/qt6/qtmultimedia \
 		x11/qt6/qtsvg
 
-CONFIGURE_ARGS +=	-DCMAKE_INSTALL_PREFIX:Path=${PREFIX} \
+LIB_DEPENDS +=	devel/kf6/karchive \
+		devel/kf6/kitemviews
+
+CONFIGURE_ARGS +=	-DENABLE_UDISKS2=OFF \
+			-DENABLE_DEVICES_SUPPORT=OFF \
 			-DENABLE_LIBVLC=OFF
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/cantata/distinfo,v
diff -u -p -u -p -r1.12 distinfo
--- distinfo	6 Jun 2025 05:39:09 -0000	1.12
+++ distinfo	12 Dec 2025 11:55:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (cantata-3.3.0.tar.gz) = KOoVENg2CEsVLmMdICRi5DAJHSXnv6r2aLE1TiAPciU=
-SIZE (cantata-3.3.0.tar.gz) = 4783803
+SHA256 (cantata-3.4.0.tar.gz) = iXYzXCuA6hD29z/JekdOWhyQpbhJeSTfz/tHfnLnP1o=
+SIZE (cantata-3.4.0.tar.gz) = 4798821
Index: patches/patch-3rdparty_solid-lite_CMakeLists_txt
===================================================================
RCS file: patches/patch-3rdparty_solid-lite_CMakeLists_txt
diff -N patches/patch-3rdparty_solid-lite_CMakeLists_txt
--- patches/patch-3rdparty_solid-lite_CMakeLists_txt	6 Jun 2025 05:39:10 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: 3rdparty/solid-lite/CMakeLists.txt
---- 3rdparty/solid-lite/CMakeLists.txt.orig
-+++ 3rdparty/solid-lite/CMakeLists.txt
-@@ -245,6 +245,7 @@ target_link_libraries(
-     solidlite
-     PRIVATE
-         Qt${QT_VERSION_MAJOR}::Core
-+        Qt${QT_VERSION_MAJOR}::DBus
-         Qt${QT_VERSION_MAJOR}::Widgets
-         ${solidlite_OPTIONAL_LIBS}
- )
Index: patches/patch-cmake_FindMusicBrainz5_cmake
===================================================================
RCS file: patches/patch-cmake_FindMusicBrainz5_cmake
diff -N patches/patch-cmake_FindMusicBrainz5_cmake
--- patches/patch-cmake_FindMusicBrainz5_cmake	6 Jun 2025 05:39:10 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-Index: cmake/FindMusicBrainz5.cmake
---- cmake/FindMusicBrainz5.cmake.orig
-+++ cmake/FindMusicBrainz5.cmake
-@@ -40,7 +40,7 @@ The following cache variables may also be set:
- # First use PKG-Config as a starting point.
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--    pkg_check_modules(PC_MusicBrainz5 QUIET libmusicbrainz5)
-+    pkg_check_modules(PC_MusicBrainz5 QUIET libmusicbrainz5cc)
- endif(PKG_CONFIG_FOUND)
- 
- find_path(MusicBrainz5_INCLUDE_DIR
-@@ -50,7 +50,7 @@ find_path(MusicBrainz5_INCLUDE_DIR
- )
- 
- find_library(MusicBrainz5_LIBRARY
--    NAMES musicbrainz5
-+    NAMES musicbrainz5cc
-     PATHS ${PC_MusicBrainz5_LIBRARY_DIRS}
- )
- 
-@@ -83,4 +83,4 @@ endif()
- mark_as_advanced(
-         MusicBrainz5_INCLUDE_DIR
-         MusicBrainz5_LIBRARY
--)
-\ No newline at end of file
-+)
Index: patches/patch-models_streamsmodel_cpp
===================================================================
RCS file: patches/patch-models_streamsmodel_cpp
diff -N patches/patch-models_streamsmodel_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-models_streamsmodel_cpp	12 Dec 2025 11:55:13 -0000
@@ -0,0 +1,14 @@
+Index: models/streamsmodel.cpp
+--- models/streamsmodel.cpp.orig
++++ models/streamsmodel.cpp
+@@ -1300,8 +1300,8 @@ QList<StreamsModel::Item*> StreamsModel::parseIceCastR
+ 
+ 	if (isGZipped) {
+ 		compressor = new KCompressionDevice(dev, false, KCompressionDevice::GZip);
+-		compressor->open(QIODevice::ReadOnly);
+-		readDev = compressor;
++		if (compressor->open(QIODevice::ReadOnly))
++			readDev = compressor;
+ 	}
+ 	QXmlStreamReader doc(readDev);
+