Date: Sat, 21 Jan 2017 15:06:50 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432046 - head/audio/cantata/files Message-ID: <201701211506.v0LF6of1084454@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Jan 21 15:06:50 2017 New Revision: 432046 URL: https://svnweb.freebsd.org/changeset/ports/432046 Log: Add upstream patches to fix compilation in c++11 mode. Approved by: rakuco (mentor) Added: head/audio/cantata/files/ head/audio/cantata/files/patch-git_2cb8d7f (contents, props changed) head/audio/cantata/files/patch-git_a13f957 (contents, props changed) Added: head/audio/cantata/files/patch-git_2cb8d7f ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cantata/files/patch-git_2cb8d7f Sat Jan 21 15:06:50 2017 (r432046) @@ -0,0 +1,22 @@ +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 + } + Added: head/audio/cantata/files/patch-git_a13f957 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/cantata/files/patch-git_a13f957 Sat Jan 21 15:06:50 2017 (r432046) @@ -0,0 +1,22 @@ +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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701211506.v0LF6of1084454>