From nobody Wed Nov 20 10:05:42 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XtcSQ3lD8z5dXtq; Wed, 20 Nov 2024 10:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XtcSQ30tkz4fNc; Wed, 20 Nov 2024 10:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732097142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMlNlVD2+xMTm10g9w6Nkt2GOLV1CCcwc/UvaBzii9U=; b=WQd6wonNL6KBm5CkGk0EIKYsMhowkWqoilS2v/YVIgK8ACqGruGzAaD5INnXvtrbyEkt8i cXBaRgHNLh2YLyj7orC5JJM+soxuk+pgmP8lpZaEiz6mKn9Bf/Prd0gSuItiZHFcTSe36k lh+sEdPF7hW3HK89e78RYydjBTSH5n0290cMWqd+Db+TpMGaQW5eam12NfZoJOh9zz/ocs IZQr61QG7Ghi9TdiisQNh+I808cYcaccuqL/nZt1Rl7pSvXWQ73+4bbqjmYzb0gxgGimQ0 Jiw71vJXwVmLMZyP5tLtJK+uJSMPNc0ov/rO/tGi7vXYMi9tC+0iIpZaxJxDgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732097142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMlNlVD2+xMTm10g9w6Nkt2GOLV1CCcwc/UvaBzii9U=; b=CCWbWviW6HDgWjR+Ly78qNclIbSyq6cq/Wl8A60WvDrTH9eDws5IF2frRbdNikbMdPq6Uq 1GjCgND271ty/PfsbDN3ZFym4oj2P95Uvjb9YObZlQS3YKqAWtzTaSJ131m9dnMXF5dgUE DtFZXRoFA6VEH1KmN78OamcnPCPyKUefo6sYapIu/Cgh4VU6X+asjFxkzTnCCCq2QcjKr5 fdJsdLJpNSqslw+qA7QEwz53JWpiGBalVYh1OyTOF4StlnN8hOJAYKL7r1ddZKkptok1hc lsGZa07vdh7O7tiL3dYJFzzm9aVBU4MTVCJSu8Z3wkOTN0niVqK05M1SdzJMOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732097142; a=rsa-sha256; cv=none; b=FDZvhwEuYBEmrK202i9mf89qU3R8hvsxS0idyel4lNBl/nwGgKlnSQMycIS+vDZTVSJKEC Qe8auGJ3RN6iC45W0t55UMLDaP8dhCWcm9H0smugm1MKsWFCqdv7XaTy1au40YdmaytqZ/ qc8cUK+PqTfyUyCydn5ywBQ3CuZsJMZGCcffpBjd1mFUl27PZeymG6GuVGqaufSk+uYTI4 LU8N1udGeG3YqPAFxaDmmS7ewjr8OPA/Dfqj2IZDBQseJYQJ6qLEwV/8C9LHBDECTOCY6J TvkcG/RU5hBOg9ZlCxbw7+T+Nhp1CFL0HUt257ynke+HuQqY+I0JX1I9XFwmBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XtcSQ2cKbzqP7; Wed, 20 Nov 2024 10:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AKA5gAB023914; Wed, 20 Nov 2024 10:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AKA5g4T023910; Wed, 20 Nov 2024 10:05:42 GMT (envelope-from git) Date: Wed, 20 Nov 2024 10:05:42 GMT Message-Id: <202411201005.4AKA5g4T023910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: a48821ad2733 - main - net/libcmis: fix build with boost-1.86 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a48821ad273386ac6731a3903f954e7dcdc1009c Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a48821ad273386ac6731a3903f954e7dcdc1009c commit a48821ad273386ac6731a3903f954e7dcdc1009c Author: Dima Panov AuthorDate: 2024-11-20 09:22:33 +0000 Commit: Dima Panov CommitDate: 2024-11-20 10:05:18 +0000 net/libcmis: fix build with boost-1.86 Sponsored by: Future Crew, LLC --- net/libcmis/Makefile | 2 +- net/libcmis/files/patch-boost-1.86 | 47 ++++++++++++++++++++++++++++++++++++ net/libcmis/files/patch-libxml2-2.12 | 26 ++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile index 68719929d2c2..6d57415a138d 100644 --- a/net/libcmis/Makefile +++ b/net/libcmis/Makefile @@ -1,6 +1,6 @@ PORTNAME= libcmis PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net devel MASTER_SITES= https://github.com/tdf/libcmis/releases/download/v${PORTVERSION}/ \ https://dev-www.libreoffice.org/src/ diff --git a/net/libcmis/files/patch-boost-1.86 b/net/libcmis/files/patch-boost-1.86 new file mode 100644 index 000000000000..0f416e5e3fa1 --- /dev/null +++ b/net/libcmis/files/patch-boost-1.86 @@ -0,0 +1,47 @@ +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 new file mode 100644 index 000000000000..f59bce10ca4e --- /dev/null +++ b/net/libcmis/files/patch-libxml2-2.12 @@ -0,0 +1,26 @@ +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 +