git: e8f4c397c970 - main - audio/cantata: Update to 3.3.1

The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e8f4c397c9703c7fcd847e44baaa9d3ff7d1279e

commit e8f4c397c9703c7fcd847e44baaa9d3ff7d1279e
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-09-23 04:25:00 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-09-23 04:25:45 +0000

    audio/cantata: Update to 3.3.1
    
    https://github.com/nullobsi/cantata/releases/tag/v3.3.1
---
 audio/cantata/Makefile                             |  5 +--
 audio/cantata/distinfo                             |  8 ++--
 .../cantata/files/patch-cmake_FindCDParanoia.cmake | 50 ----------------------
 .../files/patch-cmake_FindMusicBrainz5.cmake       | 31 --------------
 4 files changed, 4 insertions(+), 90 deletions(-)

diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 84e477a7ba79..8d1b16b12a52 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	cantata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0
+DISTVERSION=	3.3.1
 CATEGORIES=	audio kde
 
-PATCH_SITES=	https://github.com/nullobsi/cantata/commit/
-PATCHFILES+=	d44b60601896c740b24abc323ef6121bf1c45dbb.patch:-p1 # Fix build with Qt >= 6.9.0
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Graphical client for MPD using Qt
 WWW=		https://github.com/nullobsi/cantata
diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo
index 6b0ee425df3c..6c8c91c83074 100644
--- a/audio/cantata/distinfo
+++ b/audio/cantata/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1744938858
-SHA256 (nullobsi-cantata-v3.3.0_GH0.tar.gz) = 28ea1510d836084b152e631d202462e430091d25e7bfaaf668b1354e200f7225
-SIZE (nullobsi-cantata-v3.3.0_GH0.tar.gz) = 4783803
-SHA256 (d44b60601896c740b24abc323ef6121bf1c45dbb.patch) = 6ed53a453a4a86cd2f2e9b27440d0ce931074771ed09b6bd067767e62c9de1e6
-SIZE (d44b60601896c740b24abc323ef6121bf1c45dbb.patch) = 795
+TIMESTAMP = 1756030126
+SHA256 (nullobsi-cantata-v3.3.1_GH0.tar.gz) = e811201adfedca26d8c6a86078213de9e26411db77082f739a225a531ca38bbf
+SIZE (nullobsi-cantata-v3.3.1_GH0.tar.gz) = 4787884
diff --git a/audio/cantata/files/patch-cmake_FindCDParanoia.cmake b/audio/cantata/files/patch-cmake_FindCDParanoia.cmake
deleted file mode 100644
index b50623e7be26..000000000000
--- a/audio/cantata/files/patch-cmake_FindCDParanoia.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
---- cmake/FindCDParanoia.cmake.orig	2024-05-30 23:46:53 UTC
-+++ cmake/FindCDParanoia.cmake
-@@ -43,10 +43,13 @@ The following cache variables may also be set:
-   The directory containing ``cdda_interface.h``.
- #]===]
- 
-+include(CheckCSourceCompiles)
-+
- # First use PKG-Config as a starting point.
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--  pkg_check_modules(PC_CDParanoia QUIET cdparanoia)
-+  pkg_check_modules(PC_CDParanoia QUIET libcdio_paranoia)
-+  pkg_check_modules(PC_CDDA QUIET libcdio_cdda)
- endif(PKG_CONFIG_FOUND)
- 
- find_path(CDParanoia_PARANOIA_INCLUDE_DIR
-@@ -56,7 +59,7 @@ find_path(CDParanoia_INTERFACE_INCLUDE_DIR
- )
- find_path(CDParanoia_INTERFACE_INCLUDE_DIR
-         NAMES cdda_interface.h
--        PATHS ${PC_CDParanoia_INCLUDE_DIRS}
-+        PATHS ${PC_CDDA_INCLUDE_DIRS}
-         PATH_SUFFIXES cdda
- )
- 
-@@ -66,7 +69,7 @@ find_library(CDParanoia_INTERFACE_LIBRARY
- )
- find_library(CDParanoia_INTERFACE_LIBRARY
-         NAMES cdda_interface
--        PATHS ${PC_CDParanoia_LIBRARY_DIRS}
-+        PATHS ${PC_CDDA_LIBRARY_DIRS}
- )
- 
- # Set version from PC if applicable.
-@@ -96,6 +99,7 @@ if(CDParanoia_FOUND)
-     )
-   endif ()
-   if(NOT TARGET CDDA::Interface)
-+    add_library(CDDA::Interface UNKNOWN IMPORTED)
-     set_target_properties(CDDA::Interface PROPERTIES
-             IMPORTED_LOCATION "${CDParanoia_INTERFACE_LIBRARY}"
-             INTERFACE_COMPILE_OPTIONS "${PC_CDParanoia_CFLAGS_OTHER}"
-@@ -118,4 +122,4 @@ mark_as_advanced(
-         CDParanoia_INTERFACE_INCLUDE_DIR
-         CDParanoia_PARANOIA_LIBRARY
-         CDParanoia_INTERFACE_LIBRARY
--)
-\ No newline at end of file
-+)
diff --git a/audio/cantata/files/patch-cmake_FindMusicBrainz5.cmake b/audio/cantata/files/patch-cmake_FindMusicBrainz5.cmake
deleted file mode 100644
index b91c338ef2b6..000000000000
--- a/audio/cantata/files/patch-cmake_FindMusicBrainz5.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix linking when the MUSICBRAINZ option is enabled.
-
-https://github.com/nullobsi/cantata/pull/46
-
---- cmake/FindMusicBrainz5.cmake.orig	2024-08-05 22:17:52 UTC
-+++ cmake/FindMusicBrainz5.cmake
-@@ -40,7 +40,7 @@ if(PKG_CONFIG_FOUND)
- # 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_library(MusicBrainz5_LIBRARY
- )
- 
- find_library(MusicBrainz5_LIBRARY
--    NAMES musicbrainz5
-+    NAMES musicbrainz5cc
-     PATHS ${PC_MusicBrainz5_LIBRARY_DIRS}
- )
- 
-@@ -83,4 +83,4 @@ mark_as_advanced(
- mark_as_advanced(
-         MusicBrainz5_INCLUDE_DIR
-         MusicBrainz5_LIBRARY
--)
-\ No newline at end of file
-+)