Attachment 219022 Details for Bug 250567 – Patch for libmusicbrainz5

[patch] Patch for libmusicbrainz5

libmusicbrainz-final-version-before-split.patch (text/plain), 3.53 KB, created by Daniel Engberg on 2020-10-23 21:11:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-10-23 21:11:12 UTC

Size: 3.53 KB

patch

obsolete

>diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
>index e5daa287212a..b1d89b5c9086 100644
>--- a/audio/libmusicbrainz5/Makefile
>+++ b/audio/libmusicbrainz5/Makefile
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	libmusicbrainz
>-PORTVERSION=	5.1.0
>-PORTREVISION=	3
> DISTVERSIONPREFIX=	release-
>+DISTVERSION=	5.1.0-19
>+DISTVERSIONSUFFIX=	-ge29cc9a
> CATEGORIES=	audio
> PKGNAMESUFFIX=	5
> 
>diff --git a/audio/libmusicbrainz5/distinfo b/audio/libmusicbrainz5/distinfo
>index 52d8c7400a27..6b171e5f2cac 100644
>--- a/audio/libmusicbrainz5/distinfo
>+++ b/audio/libmusicbrainz5/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (metabrainz-libmusicbrainz-release-5.1.0_GH0.tar.gz) = 6e1dc7158d884748287eb14159c4e2866eb4f4e5559765c7c17621c4a3c802c8
>-SIZE (metabrainz-libmusicbrainz-release-5.1.0_GH0.tar.gz) = 78005
>+TIMESTAMP = 1603483215
>+SHA256 (metabrainz-libmusicbrainz-release-5.1.0-19-ge29cc9a_GH0.tar.gz) = 59ea04531607e0e1f552da150b263ee8cd55ccbc8c96f6f3cd7d2d7dab63db28
>+SIZE (metabrainz-libmusicbrainz-release-5.1.0-19-ge29cc9a_GH0.tar.gz) = 78950
>diff --git a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt
>index 4e0f96e395e3..0cf2f0601718 100644
>--- a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt
>+++ b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt
>@@ -1,4 +1,4 @@
>---- src/CMakeLists.txt.orig	2014-11-13 13:12:24 UTC
>+--- src/CMakeLists.txt.orig	2015-07-06 20:45:19 UTC
> +++ src/CMakeLists.txt
> @@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES(
>  	${CMAKE_CURRENT_BINARY_DIR}/../include
>@@ -8,3 +8,13 @@
>  )
>  
>  SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc
>+@@ -36,7 +37,8 @@ ADD_CUSTOM_COMMAND(
>+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
>+ 	COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h
>+ 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 	${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
>+-	DEPENDS make-c-interface cinterface.xml *.inc
>++	DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc
>++                c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc
>+ )
>+ 
>+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
>diff --git a/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc b/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc
>deleted file mode 100644
>index ae5245b88d8d..000000000000
>--- a/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/c-int-source-funcs.inc.orig	2014-11-13 13:12:24 UTC
>-+++ src/c-int-source-funcs.inc
>-@@ -157,7 +157,7 @@ std::string GetMapValue(std::map<std::st
>- 		if (o) \
>- 		{ \
>- 			try { \
>--				((MusicBrainz5::C##TYPE1 *)o)->Set##PROP1(str); \
>-+				((MusicBrainz5::C##TYPE1 *)o)->Set##PROP1(str ? str : ""); \
>- 			} \
>- 			catch (...) { \
>- 			} \
>diff --git a/audio/libmusicbrainz5/pkg-plist b/audio/libmusicbrainz5/pkg-plist
>index a7230e8dbb15..c21bd5b8af45 100644
>--- a/audio/libmusicbrainz5/pkg-plist
>+++ b/audio/libmusicbrainz5/pkg-plist
>@@ -38,6 +38,8 @@ include/musicbrainz5/NameCredit.h
> include/musicbrainz5/NameCreditList.h
> include/musicbrainz5/NonMBTrack.h
> include/musicbrainz5/NonMBTrackList.h
>+include/musicbrainz5/Offset.h
>+include/musicbrainz5/OffsetList.h
> include/musicbrainz5/PUID.h
> include/musicbrainz5/PUIDList.h
> include/musicbrainz5/Query.h

Actions: View | Diff

Attachments on bug 250567: 219022