Index: head/audio/libmusicbrainz5/Makefile =================================================================== --- head/audio/libmusicbrainz5/Makefile (revision 553676) +++ head/audio/libmusicbrainz5/Makefile (revision 553677) @@ -1,31 +1,32 @@ # $FreeBSD$ PORTNAME= libmusicbrainz -PORTVERSION= 5.1.0 -PORTREVISION= 3 DISTVERSIONPREFIX= release- +DISTVERSION= 5.1.0-19 +DISTVERSIONSUFFIX= -ge29cc9a CATEGORIES= audio PKGNAMESUFFIX= 5 MAINTAINER= jhale@FreeBSD.org COMMENT= MusicBrainz client library for audio metadata lookup -LICENSE= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libneon.so:www/neon -USES= cmake:insource compiler:c++11-lang gnome iconv:build pathfix +USES= cmake compiler:c++11-lang gnome iconv:build pathfix USE_GNOME= libxml2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= metabrainz post-patch: ${REINPLACE_CMD} -e 's|%%ICONV_PREFIX%%|${ICONV_PREFIX}|g' \ ${WRKSRC}/src/CMakeLists.txt ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake ${RM} ${WRKSRC}/cmake/modules/FindLibXml2.cmake .include Index: head/audio/libmusicbrainz5/distinfo =================================================================== --- head/audio/libmusicbrainz5/distinfo (revision 553676) +++ head/audio/libmusicbrainz5/distinfo (revision 553677) @@ -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 Index: head/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc =================================================================== --- head/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc (revision 553676) +++ head/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc (nonexistent) @@ -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::mapSet##PROP1(str); \ -+ ((MusicBrainz5::C##TYPE1 *)o)->Set##PROP1(str ? str : ""); \ - } \ - catch (...) { \ - } \ Property changes on: head/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch =================================================================== --- head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch (revision 553676) +++ head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch (nonexistent) @@ -1,81 +0,0 @@ ---- include/musicbrainz5/HTTPFetch.h.orig 2016-08-06 17:10:23.956575000 +0200 -+++ include/musicbrainz5/HTTPFetch.h 2016-08-06 17:26:10.934640000 +0200 -@@ -29,11 +29,23 @@ - #include - #include - -+// Visibility patch derived from https://gcc.gnu.org/wiki/Visibility , -+// extended for clang support. -+#if (__clang__) || (__GNUC__ >= 4) -+ #define DLL_PUBLIC __attribute__ ((visibility ("default"))) -+ #define DLL_LOCAL __attribute__ ((visibility ("hidden"))) -+#else -+ #define DLL_PUBLIC -+ #define DLL_LOCAL -+#endif -+ -+ -+ - namespace MusicBrainz5 - { - class CHTTPFetchPrivate; - -- class CExceptionBase: public std::exception -+ class DLL_PUBLIC CExceptionBase: public std::exception - { - public: - CExceptionBase(const std::string& ErrorMessage, const std::string& Exception) -@@ -60,7 +72,7 @@ - * Exception thrown when an error occurs connecting to web service - */ - -- class CConnectionError: public CExceptionBase -+ class DLL_PUBLIC CConnectionError: public CExceptionBase - { - public: - CConnectionError(const std::string& ErrorMessage) -@@ -73,7 +85,7 @@ - * Exception thrown when a connection to the web service times out - */ - -- class CTimeoutError: public CExceptionBase -+ class DLL_PUBLIC CTimeoutError: public CExceptionBase - { - public: - CTimeoutError(const std::string& ErrorMessage) -@@ -86,7 +98,7 @@ - * Exception thrown when an authentication error occurs - */ - -- class CAuthenticationError: public CExceptionBase -+ class DLL_PUBLIC CAuthenticationError: public CExceptionBase - { - public: - CAuthenticationError(const std::string& ErrorMessage) -@@ -99,7 +111,7 @@ - * Exception thrown when an error occurs fetching data - */ - -- class CFetchError: public CExceptionBase -+ class DLL_PUBLIC CFetchError: public CExceptionBase - { - public: - CFetchError(const std::string& ErrorMessage) -@@ -112,7 +124,7 @@ - * Exception thrown when an invalid request is made - */ - -- class CRequestError: public CExceptionBase -+ class DLL_PUBLIC CRequestError: public CExceptionBase - { - public: - CRequestError(const std::string& ErrorMessage) -@@ -125,7 +137,7 @@ - * Exception thrown when the requested resource is not found - */ - -- class CResourceNotFoundError: public CExceptionBase -+ class DLL_PUBLIC CResourceNotFoundError: public CExceptionBase - { - public: - CResourceNotFoundError(const std::string& ErrorMessage) Property changes on: head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h =================================================================== --- head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h (nonexistent) +++ head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h (revision 553677) @@ -0,0 +1,86 @@ +Add visibility to C++ exceptions to prevent crashes with applications +using libkcddb. + +PR: 211630 + +--- include/musicbrainz5/HTTPFetch.h.orig 2015-07-06 20:45:19 UTC ++++ include/musicbrainz5/HTTPFetch.h +@@ -29,11 +29,23 @@ + #include + #include + ++// Visibility patch derived from https://gcc.gnu.org/wiki/Visibility , ++// extended for clang support. ++#if (__clang__) || (__GNUC__ >= 4) ++ #define DLL_PUBLIC __attribute__ ((visibility ("default"))) ++ #define DLL_LOCAL __attribute__ ((visibility ("hidden"))) ++#else ++ #define DLL_PUBLIC ++ #define DLL_LOCAL ++#endif ++ ++ ++ + namespace MusicBrainz5 + { + class CHTTPFetchPrivate; + +- class CExceptionBase: public std::exception ++ class DLL_PUBLIC CExceptionBase: public std::exception + { + public: + CExceptionBase(const std::string& ErrorMessage, const std::string& Exception) +@@ -60,7 +72,7 @@ namespace MusicBrainz5 + * Exception thrown when an error occurs connecting to web service + */ + +- class CConnectionError: public CExceptionBase ++ class DLL_PUBLIC CConnectionError: public CExceptionBase + { + public: + CConnectionError(const std::string& ErrorMessage) +@@ -73,7 +85,7 @@ namespace MusicBrainz5 + * Exception thrown when a connection to the web service times out + */ + +- class CTimeoutError: public CExceptionBase ++ class DLL_PUBLIC CTimeoutError: public CExceptionBase + { + public: + CTimeoutError(const std::string& ErrorMessage) +@@ -86,7 +98,7 @@ namespace MusicBrainz5 + * Exception thrown when an authentication error occurs + */ + +- class CAuthenticationError: public CExceptionBase ++ class DLL_PUBLIC CAuthenticationError: public CExceptionBase + { + public: + CAuthenticationError(const std::string& ErrorMessage) +@@ -99,7 +111,7 @@ namespace MusicBrainz5 + * Exception thrown when an error occurs fetching data + */ + +- class CFetchError: public CExceptionBase ++ class DLL_PUBLIC CFetchError: public CExceptionBase + { + public: + CFetchError(const std::string& ErrorMessage) +@@ -112,7 +124,7 @@ namespace MusicBrainz5 + * Exception thrown when an invalid request is made + */ + +- class CRequestError: public CExceptionBase ++ class DLL_PUBLIC CRequestError: public CExceptionBase + { + public: + CRequestError(const std::string& ErrorMessage) +@@ -125,7 +137,7 @@ namespace MusicBrainz5 + * Exception thrown when the requested resource is not found + */ + +- class CResourceNotFoundError: public CExceptionBase ++ class DLL_PUBLIC CResourceNotFoundError: public CExceptionBase + { + public: + CResourceNotFoundError(const std::string& ErrorMessage) Property changes on: head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt =================================================================== --- head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt (revision 553676) +++ head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt (revision 553677) @@ -1,10 +1,20 @@ ---- 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 ${NEON_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} + %%ICONV_PREFIX%%/include ) 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) Index: head/audio/libmusicbrainz5/pkg-plist =================================================================== --- head/audio/libmusicbrainz5/pkg-plist (revision 553676) +++ head/audio/libmusicbrainz5/pkg-plist (revision 553677) @@ -1,72 +1,74 @@ include/musicbrainz5/Alias.h include/musicbrainz5/AliasList.h include/musicbrainz5/Annotation.h include/musicbrainz5/AnnotationList.h include/musicbrainz5/Artist.h include/musicbrainz5/ArtistCredit.h include/musicbrainz5/ArtistList.h include/musicbrainz5/Attribute.h include/musicbrainz5/AttributeList.h include/musicbrainz5/CDStub.h include/musicbrainz5/CDStubList.h include/musicbrainz5/Collection.h include/musicbrainz5/CollectionList.h include/musicbrainz5/Disc.h include/musicbrainz5/DiscList.h include/musicbrainz5/Entity.h include/musicbrainz5/FreeDBDisc.h include/musicbrainz5/FreeDBDiscList.h include/musicbrainz5/HTTPFetch.h include/musicbrainz5/IPI.h include/musicbrainz5/IPIList.h include/musicbrainz5/ISRC.h include/musicbrainz5/ISRCList.h include/musicbrainz5/ISWC.h include/musicbrainz5/ISWCList.h include/musicbrainz5/Label.h include/musicbrainz5/LabelInfo.h include/musicbrainz5/LabelInfoList.h include/musicbrainz5/LabelList.h include/musicbrainz5/Lifespan.h include/musicbrainz5/List.h include/musicbrainz5/ListImpl.h include/musicbrainz5/Medium.h include/musicbrainz5/MediumList.h include/musicbrainz5/Message.h include/musicbrainz5/Metadata.h 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 include/musicbrainz5/Rating.h include/musicbrainz5/Recording.h include/musicbrainz5/RecordingList.h include/musicbrainz5/Relation.h include/musicbrainz5/RelationList.h include/musicbrainz5/RelationListList.h include/musicbrainz5/Release.h include/musicbrainz5/ReleaseGroup.h include/musicbrainz5/ReleaseGroupList.h include/musicbrainz5/ReleaseList.h include/musicbrainz5/SecondaryType.h include/musicbrainz5/SecondaryTypeList.h include/musicbrainz5/Tag.h include/musicbrainz5/TagList.h include/musicbrainz5/TextRepresentation.h include/musicbrainz5/Track.h include/musicbrainz5/TrackList.h include/musicbrainz5/UserRating.h include/musicbrainz5/UserTag.h include/musicbrainz5/UserTagList.h include/musicbrainz5/Work.h include/musicbrainz5/WorkList.h include/musicbrainz5/defines.h include/musicbrainz5/mb5_c.h include/musicbrainz5/xmlParser.h lib/libmusicbrainz5.so lib/libmusicbrainz5.so.1 lib/libmusicbrainz5.so.1.0.0 libdata/pkgconfig/libmusicbrainz5.pc