diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile index 86d2e695064e..6c863aac38e8 100644 --- a/net/libcmis/Makefile +++ b/net/libcmis/Makefile @@ -1,35 +1,34 @@ PORTNAME= libcmis -PORTVERSION= 0.6.2 -PORTREVISION= 7 +PORTVERSION= 0.6.3 CATEGORIES= net devel MASTER_SITES= https://github.com/tdf/libcmis/releases/download/v${PORTVERSION}/ \ https://dev-www.libreoffice.org/src/ MAINTAINER= office@FreeBSD.org COMMENT= Client library for the CMIS interface WWW= https://github.com/tdf/libcmis LICENSE= LGPL20 MPL11 GPLv2 LICENSE_COMB= dual BUILD_DEPENDS= cppunit-config:devel/cppunit \ ${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libcurl.so:ftp/curl USES= compiler:c++11-lib gmake gnome libtool localbase pathfix \ pkgconfig tar:xz USE_GNOME= libxml2 CONFIGURE_ARGS= --disable-werror --with-boost=${LOCALBASE} --without-man GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes PLIST_SUB= MAJVER=${PORTVERSION:R} SHLIBVER=${PORTVERSION:R:E} post-patch: @${REINPLACE_CMD} -e "s|@WITH_LIBCMIS_MAN_FALSE@|#|g" \ ${WRKSRC}/Makefile.in .include diff --git a/net/libcmis/distinfo b/net/libcmis/distinfo index 4d586b56f6d2..b4ae434efc37 100644 --- a/net/libcmis/distinfo +++ b/net/libcmis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700147751 -SHA256 (libcmis-0.6.2.tar.xz) = 1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644 -SIZE (libcmis-0.6.2.tar.xz) = 488736 +TIMESTAMP = 1783952163 +SHA256 (libcmis-0.6.3.tar.xz) = e2e151fdd47a345b6ef72cae1d8ecf3099bb90420f276761f2793ec317809307 +SIZE (libcmis-0.6.3.tar.xz) = 505312 diff --git a/net/libcmis/files/patch-boost-1.86 b/net/libcmis/files/patch-boost-1.86 deleted file mode 100644 index 0f416e5e3fa1..000000000000 --- a/net/libcmis/files/patch-boost-1.86 +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/tdf/libcmis/issues/67 -https://github.com/tdf/libcmis/pull/68 - -From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 31 Aug 2024 12:39:39 +0200 -Subject: [PATCH] Fix boost 1.86 breakage - -The fix does not break building against <1.86 since we're now accessing the -object representation of the return value. - -Fixes #67 ---- - src/libcmis/xml-utils.cxx | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git src/libcmis/xml-utils.cxx src/libcmis/xml-utils.cxx -index e487d17..cdf088f 100644 ---- src/libcmis/xml-utils.cxx -+++ src/libcmis/xml-utils.cxx -@@ -531,16 +531,22 @@ namespace libcmis - boost::uuids::detail::sha1 sha1; - sha1.process_bytes( str.c_str(), str.size() ); - -- unsigned int digest[5]; -+ // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5] -+ // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20] -+ boost::uuids::detail::sha1::digest_type digest; - sha1.get_digest( digest ); - -+ // by using a pointer to unsigned char, we can read the -+ // object representation of either typedef. -+ const unsigned char* ptr = reinterpret_cast( digest ); -+ - stringstream out; -- // Setup writing mode. Every number must produce eight -+ // Setup writing mode. Every number must produce two - // hexadecimal digits, including possible leading 0s, or we get - // less than 40 digits as result. - out << hex << setfill('0') << right; -- for ( int i = 0; i < 5; ++i ) -- out << setw(8) << digest[i]; -+ for ( int i = 0; i < sizeof( digest ); ++ptr, ++i ) -+ out << setw(2) << static_cast( *ptr ); - return out.str(); - } - diff --git a/net/libcmis/files/patch-libxml2-2.12 b/net/libcmis/files/patch-libxml2-2.12 deleted file mode 100644 index f59bce10ca4e..000000000000 --- a/net/libcmis/files/patch-libxml2-2.12 +++ /dev/null @@ -1,26 +0,0 @@ -From 72618e63433c7243e4d9e79a638f19a09402eecc Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 21 Nov 2023 23:10:07 +0100 -Subject: [PATCH] Fix build with libxml2-2.12 (missing include) - -See also: https://github.com/tdf/libcmis/issues/51 -Signed-off-by: Andreas Sturmlechner ---- - inc/libcmis/xml-utils.hxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git inc/libcmis/xml-utils.hxx inc/libcmis/xml-utils.hxx -index 929385e..9bd99ae 100644 ---- inc/libcmis/xml-utils.hxx -+++ inc/libcmis/xml-utils.hxx -@@ -34,6 +34,7 @@ - #include - - #include -+#include - #include - #include - #include --- -2.43.0 - diff --git a/net/libcmis/pkg-plist b/net/libcmis/pkg-plist index 77dbcf045ffc..8c77aab4aeee 100644 --- a/net/libcmis/pkg-plist +++ b/net/libcmis/pkg-plist @@ -1,45 +1,45 @@ bin/cmis-client include/libcmis-%%MAJVER%%/libcmis/allowable-actions.hxx include/libcmis-%%MAJVER%%/libcmis/document.hxx include/libcmis-%%MAJVER%%/libcmis/exception.hxx include/libcmis-%%MAJVER%%/libcmis/folder.hxx include/libcmis-%%MAJVER%%/libcmis/libcmis-api.h include/libcmis-%%MAJVER%%/libcmis/libcmis.hxx include/libcmis-%%MAJVER%%/libcmis/oauth2-data.hxx include/libcmis-%%MAJVER%%/libcmis/object-type.hxx include/libcmis-%%MAJVER%%/libcmis/object.hxx include/libcmis-%%MAJVER%%/libcmis/property-type.hxx include/libcmis-%%MAJVER%%/libcmis/property.hxx include/libcmis-%%MAJVER%%/libcmis/rendition.hxx include/libcmis-%%MAJVER%%/libcmis/repository.hxx include/libcmis-%%MAJVER%%/libcmis/session-factory.hxx include/libcmis-%%MAJVER%%/libcmis/session.hxx include/libcmis-%%MAJVER%%/libcmis/xml-utils.hxx include/libcmis-%%MAJVER%%/libcmis/xmlserializable.hxx include/libcmis-c-%%MAJVER%%/libcmis-c/allowable-actions.h include/libcmis-c-%%MAJVER%%/libcmis-c/document.h include/libcmis-c-%%MAJVER%%/libcmis-c/error.h include/libcmis-c-%%MAJVER%%/libcmis-c/folder.h include/libcmis-c-%%MAJVER%%/libcmis-c/libcmis-c-api.h include/libcmis-c-%%MAJVER%%/libcmis-c/libcmis-c.h include/libcmis-c-%%MAJVER%%/libcmis-c/oauth2-data.h include/libcmis-c-%%MAJVER%%/libcmis-c/object-type.h include/libcmis-c-%%MAJVER%%/libcmis-c/object.h include/libcmis-c-%%MAJVER%%/libcmis-c/property-type.h include/libcmis-c-%%MAJVER%%/libcmis-c/property.h include/libcmis-c-%%MAJVER%%/libcmis-c/rendition.h include/libcmis-c-%%MAJVER%%/libcmis-c/repository.h include/libcmis-c-%%MAJVER%%/libcmis-c/session-factory.h include/libcmis-c-%%MAJVER%%/libcmis-c/session.h include/libcmis-c-%%MAJVER%%/libcmis-c/types.h include/libcmis-c-%%MAJVER%%/libcmis-c/vectors.h lib/libcmis-%%MAJVER%%.a lib/libcmis-%%MAJVER%%.so lib/libcmis-%%MAJVER%%.so.%%SHLIBVER%% -lib/libcmis-%%MAJVER%%.so.%%SHLIBVER%%.1.1 +lib/libcmis-%%MAJVER%%.so.%%SHLIBVER%%.1.2 lib/libcmis-c-%%MAJVER%%.a lib/libcmis-c-%%MAJVER%%.so lib/libcmis-c-%%MAJVER%%.so.%%SHLIBVER%% -lib/libcmis-c-%%MAJVER%%.so.%%SHLIBVER%%.0.0 +lib/libcmis-c-%%MAJVER%%.so.%%SHLIBVER%%.0.1 libdata/pkgconfig/libcmis-%%MAJVER%%.pc libdata/pkgconfig/libcmis-c-%%MAJVER%%.pc