svn commit: r459556 - in head/audio/libcoverart: . files

[Jason E. Hale]

Author: jhale
Date: Sat Jan 20 23:06:41 2018
New Revision: 459556
URL: https://svnweb.freebsd.org/changeset/ports/459556

Log:
  Fix build with clang6 [1]
  
  Use a different distfile that has a properly versioned directory. The checksum
  has changed, but there are no file changes, only the WRKSRC has been renamed
  from the confusing "libcoverart-{PROJECT_VERSION}" to "libcoverart-1.0.0".
  
  Reported by:	pkg-fallout [1]

Added:
  head/audio/libcoverart/files/
  head/audio/libcoverart/files/patch-src_xmlParser.cpp   (contents, props changed)
Modified:
  head/audio/libcoverart/Makefile
  head/audio/libcoverart/distinfo

Modified: head/audio/libcoverart/Makefile
==============================================================================
--- head/audio/libcoverart/Makefile	Sat Jan 20 21:42:38 2018	(r459555)
+++ head/audio/libcoverart/Makefile	Sat Jan 20 23:06:41 2018	(r459556)
@@ -4,7 +4,7 @@ PORTNAME=	libcoverart
 PORTVERSION=	1.0.0
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	GHC
+MASTER_SITES=	https://github.com/metabrainz/${PORTNAME}/releases/download/release-${PORTVERSION}/
 
 MAINTAINER=	jhale at FreeBSD.org
 COMMENT=	Library for accessing the MusicBrainz cover art archive
@@ -16,11 +16,6 @@ LIB_DEPENDS=	libjansson.so:devel/jansson \
 
 USES=		cmake pathfix
 USE_LDCONFIG=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	metabrainz
-
-# {PROJECT_VERSION} is not a variable nor a typo, just part of the directory name
-WRKSRC=		${WRKDIR}/${PORTNAME}-{PROJECT_VERSION}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \

Modified: head/audio/libcoverart/distinfo
==============================================================================
--- head/audio/libcoverart/distinfo	Sat Jan 20 21:42:38 2018	(r459555)
+++ head/audio/libcoverart/distinfo	Sat Jan 20 23:06:41 2018	(r459556)
@@ -1,2 +1,3 @@
-SHA256 (libcoverart-1.0.0.tar.gz) = e4cb78939003a4b5e5c4db68e42e86fbbbea5e69d3166b43ca01a7065916a121
-SIZE (libcoverart-1.0.0.tar.gz) = 57950
+TIMESTAMP = 1516486441
+SHA256 (libcoverart-1.0.0.tar.gz) = 5d9d4a4c46f35754e016affab83957961a364d7a4c7d64447f73bff22a300f44
+SIZE (libcoverart-1.0.0.tar.gz) = 57933

Added: head/audio/libcoverart/files/patch-src_xmlParser.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/libcoverart/files/patch-src_xmlParser.cpp	Sat Jan 20 23:06:41 2018	(r459556)
@@ -0,0 +1,16 @@
+Fix build with clang6.
+src/xmlParser.cpp:676:27: error: cast from pointer to smaller type 'char' loses information
+        lpszNew[cbData] = (XMLCHAR)NULL;
+                          ^~~~~~~~~~~~~
+
+--- src/xmlParser.cpp.orig	2018-01-20 21:39:55 UTC
++++ src/xmlParser.cpp
+@@ -673,7 +673,7 @@ XMLSTR stringDup(XMLCSTR lpszData, int cbData)
+     if (lpszNew)
+     {
+         memcpy(lpszNew, lpszData, (cbData) * sizeof(XMLCHAR));
+-        lpszNew[cbData] = (XMLCHAR)NULL;
++        lpszNew[cbData] = 0;
+     }
+     return lpszNew;
+ }