From 7b6be11058facd06411ee932e3903e1c8424ee88 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sat, 22 Oct 2022 13:26:42 +1100
Subject: [PATCH 1/2] cantata: update to 2.5.0.

---
 srcpkgs/cantata/patches/musl.patch | 30 ------------------------------
 srcpkgs/cantata/template           |  6 +++---
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/cantata/patches/musl.patch

diff --git a/srcpkgs/cantata/patches/musl.patch b/srcpkgs/cantata/patches/musl.patch
deleted file mode 100644
index b524d66e24af..000000000000
--- a/srcpkgs/cantata/patches/musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h	2016-01-08 19:44:42.000000000 +0100
-+++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h	2017-03-09 11:41:06.071250302 +0100
-@@ -21,6 +21,7 @@
- #ifndef UDISKS2BLOCK_H
- #define UDISKS2BLOCK_H
- 
-+#include <sys/types.h>
- #include <solid-lite/ifaces/block.h>
- #include "udisksdeviceinterface.h"
- 
---- a/gui/main.cpp	2018-06-16 10:09:13.072771604 +0200
-+++ b/gui/main.cpp	2018-06-16 10:10:00.840162507 +0200
-@@ -260,7 +260,7 @@
-     qInstallMessageHandler(cantataQtMsgHandler);
- }
- 
--#if defined Q_OS_LINUX && defined __GNUC__
-+#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
- #include <execinfo.h>
- #include <unistd.h>
- #include <signal.h>
-@@ -340,7 +340,7 @@
- 
- int main(int argc, char *argv[])
- {
--    #if defined Q_OS_LINUX && defined __GNUC__
-+    #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
-     signal(SIGSEGV, sigHandler);
-     #endif
-     QThread::currentThread()->setObjectName("GUI");
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 8ce1d756ace9..9193d30901e4 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,7 +1,7 @@
 # Template file for 'cantata'
 pkgname=cantata
-version=2.4.2
-revision=2
+version=2.5.0
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
 makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
@@ -16,4 +16,4 @@ maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cdrummond/cantata"
 distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3ed25d0c838720af7ed08b89a30f3e05d6952d40a5f520f29b3558b2eacdec82
+checksum=eb7e00ab3f567afaa02ea2c86e2fe811a475afab93182b95922c6eb126821724

From a15705e97ee1163fcd365f1526f312fa29fe62b9 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Sun, 23 Oct 2022 17:50:15 +1100
Subject: [PATCH 2/2] Update srcpkgs/cantata/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/cantata/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 9193d30901e4..4b417d80d5c2 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -15,5 +15,6 @@ short_desc="Qt client for the music player daemon (MPD)"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/cdrummond/cantata"
+changelog="https://raw.githubusercontent.com/CDrummond/cantata/master/ChangeLog"
 distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=eb7e00ab3f567afaa02ea2c86e2fe811a475afab93182b95922c6eb126821724