mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

Update audio/cantata to 2.1.0

Browse Source 
Reviewed by:	rakuco
Differential Revision:	https://reviews.freebsd.org/D11802
This commit is contained in:
Tobias C. Berner 2017-08-01 14:30:43 +00:00
parent 881b6837ac
commit 69c7b0fdc2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447021
8 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/cantata/Makefile
View File

@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= cantata
PORTVERSION= 2.0.1
PORTVERSION= 2.1.0
DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= audio kde
MAINTAINER= kde@FreeBSD.org
@ -19,7 +18,8 @@ USE_QT5= buildtools_build concurrent core dbus gui network \
qmake_build sql sql-sqlite3_run svg widgets xml
CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \
-DENABLE_KDE:BOOL=FALSE
-DENABLE_KDE:BOOL=FALSE \
-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
USES= cmake:outsource cpe pkgconfig shebangfix
SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake

6
audio/cantata/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1465799840
SHA256 (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 294fc96944dd2bb6056525a49ae9db1b1da1b7902ac63286ed6c01622b8e3b52
SIZE (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 2711833
TIMESTAMP = 1501534413
SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b
SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024

13
audio/cantata/files/patch-devices_cddbinterface.cpp Normal file
View File

@ -0,0 +1,13 @@
https://github.com/CDrummond/cantata/pull/1052
--- devices/cddbinterface.cpp.orig 2017-07-30 19:13:05 UTC
+++ devices/cddbinterface.cpp
@@ -158,7 +158,7 @@ void CddbInterface::readDisc()
cddb_track_t *track = cddb_track_new();
if (track) {
cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2));
- cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData());
+ cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1").arg(i).toUtf8().constData());
cddb_track_set_artist(track, unknown.constData());
cddb_disc_add_track(disc, track);
}

22
audio/cantata/files/patch-git_2cb8d7f
View File

@ -1,22 +0,0 @@
From 2cb8d7f67411d6958388705893f5e5de46b3bba0 Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Sat, 29 Oct 2016 18:43:34 +0100
Subject: [PATCH] Fix C++11 warning
---
support/utils.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/utils.cpp b/support/utils.cpp
index 2e0c885..4fad46c 100644
--- support/utils.cpp
+++ support/utils.cpp
@@ -773,7 +773,7 @@ QString Utils::helper(const QString &app)
#elif defined Q_OS_MAC
return fixPath(QCoreApplication::applicationDirPath())+app;
#else
- return QString(INSTALL_PREFIX "/"LINUX_LIB_DIR"/")+QCoreApplication::applicationName()+constDirSep+app;
+ return QString(INSTALL_PREFIX "/" LINUX_LIB_DIR "/")+QCoreApplication::applicationName()+constDirSep+app;
#endif
}

22
audio/cantata/files/patch-git_a13f957
View File

@ -1,22 +0,0 @@
From a13f9575e6226ef7378f3da6b700416354231767 Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Sat, 12 Nov 2016 20:05:46 +0000
Subject: [PATCH] C++ 11
---
devices/musicbrainz.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devices/musicbrainz.cpp b/devices/musicbrainz.cpp
index cc1a7a0..89f5409 100644
--- devices/musicbrainz.cpp
+++ devices/musicbrainz.cpp
@@ -248,7 +248,7 @@ void MusicBrainz::lookup(bool full)
}
DBUG << "Should lookup " << discId;
- MusicBrainz5::CQuery Query("cantata-"PACKAGE_VERSION_STRING);
+ MusicBrainz5::CQuery Query("cantata-" PACKAGE_VERSION_STRING);
QList<CdAlbum> m;
QList<QNetworkProxy> proxies=NetworkProxyFactory::self()->queryProxy(QNetworkProxyQuery(QUrl("http://musicbrainz.org")));
foreach (const QNetworkProxy &p, proxies) {

14
audio/cantata/files/patch-mpd-interface_httpstream.cpp Normal file
View File

@ -0,0 +1,14 @@
https://github.com/CDrummond/cantata/pull/1052
--- mpd-interface/httpstream.cpp.orig 2017-08-01 10:50:50 UTC
+++ mpd-interface/httpstream.cpp
@@ -25,7 +25,9 @@
#include "mpdconnection.h"
#include "mpdstatus.h"
#include "gui/settings.h"
+#ifndef LIBVLC_FOUND
#include <QtMultimedia/QMediaPlayer>
+#endif
#include <QTimer>
static const int constPlayerCheckPeriod=250;

12
audio/cantata/files/patch-mpd-interface_mpdstats.h Normal file
View File

@ -0,0 +1,12 @@
https://github.com/CDrummond/cantata/pull/1052
--- mpd-interface/mpdstats.h.orig 2017-07-30 19:13:05 UTC
+++ mpd-interface/mpdstats.h
@@ -27,6 +27,7 @@
#ifndef MPD_STATS_H
#define MPD_STATS_H
+#include <ctime>
#include <QDateTime>
#include <QObject>

19
audio/cantata/pkg-plist
View File

@ -7,7 +7,7 @@ share/applications/cantata.desktop
%%DATADIR%%/config/scrobblers.xml
%%DATADIR%%/config/tag_fixes.xml
%%DATADIR%%/config/weblinks.xml
%%DATADIR%%/fonts/fontawesome-4.3.0.ttf
%%DATADIR%%/fonts/fontawesome-webfont.ttf
%%DATADIR%%/icons/bbc.svg
%%DATADIR%%/icons/cbc.svg
%%DATADIR%%/icons/npr.svg
@ -19,7 +19,6 @@ share/applications/cantata.desktop
%%DATADIR%%/icons/cantata/index.theme
%%DATADIR%%/icons/cantata/svg/audio-x-generic.svg
%%DATADIR%%/icons/cantata/svg/cantata.svg
%%DATADIR%%/icons/cantata/svg/dynamic-playlist.svg
%%TAGLIB%%%%DATADIR%%/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
%%DATADIR%%/icons/cantata/svg/folder-downloads.svg
%%DATADIR%%/icons/cantata/svg/folder-temp.svg
@ -28,7 +27,6 @@ share/applications/cantata.desktop
%%DATADIR%%/icons/cantata/svg/inode-directory.svg
%%TAGLIB%%%%DATADIR%%/icons/cantata/svg/multimedia-player.svg
%%DATADIR%%/icons/cantata/svg/network-server-database.svg
%%DATADIR%%/icons/cantata/svg/playlist.svg
%%DATADIR%%/icons/cantata/svg/preferences-desktop-keyboard.svg
%%DATADIR%%/icons/cantata/svg/preferences-other.svg
%%PROXY%%%%DATADIR%%/icons/cantata/svg/preferences-system-network.svg
@ -40,28 +38,27 @@ share/applications/cantata.desktop
%%DATADIR%%/mpd/mpd.conf.template
%%DATADIR%%/scripts/cantata-dynamic
%%DATADIR%%/scripts/cantata-remote
%%DATADIR%%/themes/adwaita.css
%%DATADIR%%/themes/ambiance-dt.css
%%DATADIR%%/themes/ambiance.css
%%DATADIR%%/themes/elementary.css
%%DATADIR%%/themes/faience.css
%%DATADIR%%/themes/mint-x.css
%%DATADIR%%/themes/radiance-dt.css
%%DATADIR%%/themes/radiance.css
%%NLS%%%%DATADIR%%/translations/blank.qm
%%NLS%%%%DATADIR%%/translations/cantata_cs.qm
%%NLS%%%%DATADIR%%/translations/cantata_de.qm
%%NLS%%%%DATADIR%%/translations/cantata_en_GB.qm
%%NLS%%%%DATADIR%%/translations/cantata_es.qm
%%NLS%%%%DATADIR%%/translations/cantata_fr.qm
%%NLS%%%%DATADIR%%/translations/cantata_hu.qm
%%NLS%%%%DATADIR%%/translations/cantata_it.qm
%%NLS%%%%DATADIR%%/translations/cantata_ja.qm
%%NLS%%%%DATADIR%%/translations/cantata_ko.qm
%%NLS%%%%DATADIR%%/translations/cantata_pl.qm
%%NLS%%%%DATADIR%%/translations/cantata_ru.qm
%%NLS%%%%DATADIR%%/translations/cantata_zh_CN.qm
share/icons/hicolor/128x128/apps/cantata.png
share/icons/hicolor/16x16/apps/cantata.png
share/icons/hicolor/22x22/apps/cantata.png
share/icons/hicolor/24x24/apps/cantata.png
share/icons/hicolor/256x256/apps/cantata.png
share/icons/hicolor/32x32/apps/cantata.png
share/icons/hicolor/48x48/apps/cantata.png
share/icons/hicolor/512x512/apps/cantata.png
share/icons/hicolor/64x64/apps/cantata.png
share/icons/hicolor/scalable/apps/cantata.svg
share/icons/hicolor/scalable/apps/cantata-symbolic.svg