svn commit: r459231 - in head/audio/libmusicbrainz3: . files

[Tobias C. Berner]

Author: tcberner
Date: Wed Jan 17 09:31:14 2018
New Revision: 459231
URL: https://svnweb.freebsd.org/changeset/ports/459231

Log:
  audio/libmusicbrainz3 fix build with clang6
  
  PR:		224669

Added:
  head/audio/libmusicbrainz3/files/
  head/audio/libmusicbrainz3/files/patch-src_webservice.cpp   (contents, props changed)
  head/audio/libmusicbrainz3/files/patch-src_xmlParser_xmlParser.cpp   (contents, props changed)
Modified:
  head/audio/libmusicbrainz3/Makefile

Modified: head/audio/libmusicbrainz3/Makefile
==============================================================================
--- head/audio/libmusicbrainz3/Makefile	Wed Jan 17 09:21:28 2018	(r459230)
+++ head/audio/libmusicbrainz3/Makefile	Wed Jan 17 09:31:14 2018	(r459231)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmusicbrainz
 PORTVERSION=	3.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://ftp.osuosl.org/pub/musicbrainz/

Added: head/audio/libmusicbrainz3/files/patch-src_webservice.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libmusicbrainz3/files/patch-src_webservice.cpp	Wed Jan 17 09:31:14 2018	(r459231)
@@ -0,0 +1,24 @@
+error: invalid suffix on literal; C++11 requires a space between literal and identifier
+[-Wreserved-user-defined-literal]
+        ne_set_useragent(sess, PACKAGE"/"VERSION);
+
+--- src/webservice.cpp.orig	2009-08-17 22:54:07 UTC
++++ src/webservice.cpp
+@@ -184,7 +184,7 @@ WebService::get(const std::string &entity,
+ 	if (!sess) 
+ 		throw WebServiceError("ne_session_create() failed.");
+ 	ne_set_server_auth(sess, httpAuth, this);
+-	ne_set_useragent(sess, PACKAGE"/"VERSION);
++	ne_set_useragent(sess, PACKAGE "/" VERSION);
+ 	
+ 	// Use proxy server
+ 	if (!d->proxyHost.empty()) {
+@@ -269,7 +269,7 @@ WebService::post(const std::string &entity,
+ 	if (!sess) 
+ 		throw WebServiceError("ne_session_create() failed.");
+ 	ne_set_server_auth(sess, httpAuth, this);
+-	ne_set_useragent(sess, PACKAGE"/"VERSION);
++	ne_set_useragent(sess, PACKAGE "/" VERSION);
+ 
+ 	// Use proxy server
+ 	if (!d->proxyHost.empty()) {

Added: head/audio/libmusicbrainz3/files/patch-src_xmlParser_xmlParser.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libmusicbrainz3/files/patch-src_xmlParser_xmlParser.cpp	Wed Jan 17 09:31:14 2018	(r459231)
@@ -0,0 +1,14 @@
+src/xmlParser/xmlParser.cpp:743:27: error: cast from pointer to smaller type 'char' loses information
+        lpszNew[cbData] = (TCHAR)NULL;
+
+--- src/xmlParser/xmlParser.cpp.orig	2018-01-17 09:27:41 UTC
++++ src/xmlParser/xmlParser.cpp
+@@ -740,7 +740,7 @@ LPTSTR stringDup(LPCTSTR lpszData, int cbData)
+     if (lpszNew)
+     {
+         memcpy(lpszNew, lpszData, (cbData) * sizeof(TCHAR));
+-        lpszNew[cbData] = (TCHAR)NULL;
++        lpszNew[cbData] = 0;
+     }
+     return lpszNew;
+ }