From 188bc4852af59e20f60b186e7acaaaa4b8ce51ab Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 16 Jun 2018 10:01:19 +0200 Subject: [PATCH] cantata: update to 2.3.1. --- srcpkgs/cantata/patches/musl.patch | 21 ++++++++++++++++++++- srcpkgs/cantata/template | 6 +++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cantata/patches/musl.patch b/srcpkgs/cantata/patches/musl.patch index 0d048eb879c..0e76404f954 100644 --- a/srcpkgs/cantata/patches/musl.patch +++ b/srcpkgs/cantata/patches/musl.patch @@ -8,4 +8,23 @@ #include #include "udisksdeviceinterface.h" - +--- gui/main.cpp.orig 2018-06-16 10:09:13.072771604 +0200 ++++ 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 + #include + #include +@@ -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 ef7dbd1b524..4b80427ae05 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,6 +1,6 @@ # Template file for 'cantata' pkgname=cantata -version=2.2.0 +version=2.3.1 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" @@ -13,7 +13,7 @@ makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel depends="media-player-info" short_desc="Qt client for the music player daemon (MPD)" maintainer="LockeAnarchist " -license="GPL-3" +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=c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 +checksum=5b1e563ec125d57296495d0f8f97eeecf0b2260aa50b35bae7cab221d7914eb4