From owner-svn-ports-head@freebsd.org  Sat Jan 21 15:06:52 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3779ACBBBDA;
 Sat, 21 Jan 2017 15:06:52 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E11DC959;
 Sat, 21 Jan 2017 15:06:51 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0LF6ptU084456;
 Sat, 21 Jan 2017 15:06:51 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0LF6of1084454;
 Sat, 21 Jan 2017 15:06:50 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <201701211506.v0LF6of1084454@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sat, 21 Jan 2017 15:06:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432046 - head/audio/cantata/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2017 15:06:52 -0000

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) {