public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libcmis] f43: 0.6.3
@ 2026-08-03 20:29 Gwyn Ciesla
0 siblings, 0 replies; only message in thread
From: Gwyn Ciesla @ 2026-08-03 20:29 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/libcmis
Branch : f43
Commit : 7dd1471e08ee54dd92d06a72762ea218f3f22d41
Author : Gwyn Ciesla <gwync@protonmail.com>
Date : 2026-08-03T15:28:18-05:00
Stats : +49/-192 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/libcmis/c/7dd1471e08ee54dd92d06a72762ea218f3f22d41?branch=f43
Log:
0.6.3
---
diff --git a/.gitignore b/.gitignore
index b146136..add51fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/libcmis-0.6.0.tar.xz
/libcmis-0.6.1.tar.xz
/libcmis-0.6.2.tar.xz
+/libcmis-0.6.3.tar.xz
diff --git a/0001-Fix-boost-1.86-breakage.patch b/0001-Fix-boost-1.86-breakage.patch
deleted file mode 100644
index f8f40a0..0000000
--- a/0001-Fix-boost-1.86-breakage.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 31 Aug 2024 12:39:39 +0200
-Subject: [PATCH 1/4] 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 a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index e487d17..cdf088f 100644
---- a/src/libcmis/xml-utils.cxx
-+++ b/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<const unsigned char*>( 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<int>( *ptr );
- return out.str();
- }
-
---
-2.52.0
-
diff --git a/0002-sha1-test-fails-with-older-boost.patch b/0002-sha1-test-fails-with-older-boost.patch
deleted file mode 100644
index 2d15f9a..0000000
--- a/0002-sha1-test-fails-with-older-boost.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0753091be57edae28655e43a9bae9e4c4e414117 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
-Date: Fri, 13 Sep 2024 16:02:13 +0100
-Subject: [PATCH 2/4] sha1 test fails with older boost
-
-<fridrich> 1) test: XmlTest::sha1Test (F) line: 588 test-xmlutils.cxx
-<fridrich> equality assertion failed
-<fridrich> - Expected: f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0
-<fridrich> - Actual : 8b9efff79be0b27b5d5a9370c50c5e78f0abd0d9
----
- src/libcmis/xml-utils.cxx | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index cdf088f..3568ec6 100644
---- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -536,17 +536,19 @@ namespace libcmis
- 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<const unsigned char*>( digest );
--
- stringstream out;
- // 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 < sizeof( digest ); ++ptr, ++i )
-+#if BOOST_VERSION < 108600
-+ for ( int i = 0; i < 5; ++i )
-+ out << setw(8) << digest[i];
-+#else
-+ const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest );
-+ for ( size_t i = 0; i < sizeof( digest ); ++ptr, ++i )
- out << setw(2) << static_cast<int>( *ptr );
-+#endif
- return out.str();
- }
-
---
-2.52.0
-
diff --git a/0003-Fix-build-with-boost-1.66-and-simplify-a-bit.patch b/0003-Fix-build-with-boost-1.66-and-simplify-a-bit.patch
deleted file mode 100644
index b3110dd..0000000
--- a/0003-Fix-build-with-boost-1.66-and-simplify-a-bit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8cf58e67c8a77a81bb8392886468e12c0f96d9ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Mon, 16 Sep 2024 10:21:42 +0200
-Subject: [PATCH 3/4] Fix build with boost < 1.66 and simplify a bit
-
----
- src/libcmis/xml-utils.cxx | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index 3568ec6..20c671e 100644
---- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -531,9 +531,14 @@ namespace libcmis
- boost::uuids::detail::sha1 sha1;
- sha1.process_bytes( str.c_str(), str.size() );
-
-- // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5]
-+ // on boost < 1.66.0, digest_type is typedef'd as reference to unsigned int[5]
-+ // on boost >= 1.66.0 and < 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]
-+#if BOOST_VERSION < 106600
-+ unsigned int digest[5];
-+#else
- boost::uuids::detail::sha1::digest_type digest;
-+#endif
- sha1.get_digest( digest );
-
- stringstream out;
-@@ -541,14 +546,8 @@ namespace libcmis
- // hexadecimal digits, including possible leading 0s, or we get
- // less than 40 digits as result.
- out << hex << setfill('0') << right;
--#if BOOST_VERSION < 108600
-- for ( int i = 0; i < 5; ++i )
-- out << setw(8) << digest[i];
--#else
-- const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest );
-- for ( size_t i = 0; i < sizeof( digest ); ++ptr, ++i )
-- out << setw(2) << static_cast<int>( *ptr );
--#endif
-+ for ( size_t i = 0; i < sizeof( digest ) / sizeof( digest[0] ); ++i )
-+ out << setw(2 * sizeof( digest[0] )) << static_cast<int>( digest[i] );
- return out.str();
- }
-
---
-2.52.0
-
diff --git a/0004-Fix-comment-and-sync-the-if-BOOST_VERSION.patch b/0004-Fix-comment-and-sync-the-if-BOOST_VERSION.patch
deleted file mode 100644
index daefdd0..0000000
--- a/0004-Fix-comment-and-sync-the-if-BOOST_VERSION.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 34e02902beec2d985dd66ee25c37b0b1bd1498a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Mon, 16 Sep 2024 10:59:19 +0200
-Subject: [PATCH 4/4] Fix comment and sync the #if BOOST_VERSION to avoid
- including a redirecting header
-
----
- src/libcmis/xml-utils.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index 20c671e..38e01ec 100644
---- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -36,10 +36,10 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/version.hpp>
-
--#if BOOST_VERSION >= 106800
--#include <boost/uuid/detail/sha1.hpp>
--#else
-+#if BOOST_VERSION < 106600
- #include <boost/uuid/sha1.hpp>
-+#else
-+#include <boost/uuid/detail/sha1.hpp>
- #endif
- #include <curl/curl.h>
-
-@@ -542,7 +542,7 @@ namespace libcmis
- sha1.get_digest( digest );
-
- stringstream out;
-- // Setup writing mode. Every number must produce two
-+ // Setup writing mode. Every byte must produce two
- // hexadecimal digits, including possible leading 0s, or we get
- // less than 40 digits as result.
- out << hex << setfill('0') << right;
---
-2.52.0
-
diff --git a/e00b5b849e467fd3661ebdbfb7e49db5abb5c313.patch b/e00b5b849e467fd3661ebdbfb7e49db5abb5c313.patch
new file mode 100644
index 0000000..40fd429
--- /dev/null
+++ b/e00b5b849e467fd3661ebdbfb7e49db5abb5c313.patch
@@ -0,0 +1,42 @@
+From e00b5b849e467fd3661ebdbfb7e49db5abb5c313 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
+Date: Mon, 1 Jun 2026 19:03:43 +0100
+Subject: [PATCH] avoid ending up with -isystem /usr/include, which breaks
+ horribly
+
+Try an alternative workaround for the macOS ci's -Werror and --with=boost=/opt/homebrew
+
+In file included from /usr/include/c++/15/ext/string_conversions.h:45,
+ from /usr/include/c++/15/bits/basic_string.h:4442,
+ from /usr/include/c++/15/string:56,
+ from ../../inc/libcmis/allowable-actions.hxx:32,
+ from allowable-actions.cxx:29:
+/usr/include/c++/15/cstdlib:83:15: fatal error: stdlib.h: No such file or directory
+ 83 | #include_next <stdlib.h>
+ | ^~~~~~~~~~
+compilation terminated.
+---
+ configure.ac | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 68d2dcb..7186058 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,10 +170,12 @@ BOOST_UUID
+ AS_IF([test "x$enable_client" != "xno"], [
+ BOOST_PROGRAM_OPTIONS
+ ])
+-# Treat boost headers as system headers so -Wshadow / -Weffc++ etc.
+-# inside them do not break the build under -Werror. boost.m4 emits
+-# -I$prefix; rewrite to -isystem $prefix.
+-BOOST_CPPFLAGS=`echo "$BOOST_CPPFLAGS" | sed 's|-I|-isystem |g'`
++# Our macOS CI uses --with-boost=/opt/homebrew and then has warnings which trip
++# up -Werror. So rewrite the -I that boost.m4 emits to -isystem so -Wshadow, etc
++# inside boost don't make ci fail
++AS_IF([test -n "$with_boost" -a "x$with_boost" != "xyes" -a "x$with_boost" != "xno"], [
++ BOOST_CPPFLAGS=`echo "$BOOST_CPPFLAGS" | sed 's|-I|-isystem |g'`
++])
+ AC_SUBST(BOOST_CPPFLAGS)
+
+ # Checks for header files.
diff --git a/libcmis.spec b/libcmis.spec
index 2eabdbe..f827693 100644
--- a/libcmis.spec
+++ b/libcmis.spec
@@ -1,22 +1,14 @@
%global apiversion 0.6
Name: libcmis
-Version: 0.6.2
+Version: 0.6.3
Release: %autorelease
Summary: A C/C++ client library for CM interfaces
License: GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1
URL: https://github.com/tdf/libcmis
Source: https://github.com/tdf/libcmis/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# https://github.com/tdf/libcmis/issues/51
-Patch: libxmis-0.6.2-libxml2-2.12.0-includes.patch
-# https://github.com/tdf/libcmis/pull/68 and followups
-# Fixes build with boost 1.86+, followups address some issues
-Patch: 0001-Fix-boost-1.86-breakage.patch
-Patch: 0002-sha1-test-fails-with-older-boost.patch
-Patch: 0003-Fix-build-with-boost-1.66-and-simplify-a-bit.patch
-Patch: 0004-Fix-comment-and-sync-the-if-BOOST_VERSION.patch
-
+Patch0: e00b5b849e467fd3661ebdbfb7e49db5abb5c313.patch
BuildRequires: boost-devel
BuildRequires: gcc-c++
@@ -26,6 +18,7 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: xmlto
BuildRequires: make
BuildRequires: chrpath
+BuildRequires: autoconf automake libtool
%description
LibCMIS is a C/C++ client library for working with CM (content management)
@@ -54,6 +47,7 @@ command line.
%autosetup -p1
%build
+autoreconf -fi
%configure --disable-silent-rules --disable-static --disable-werror \
DOCBOOK2MAN='xmlto man'
sed -i \
@@ -66,6 +60,7 @@ sed -i \
%make_install
rm -f %{buildroot}/%{_libdir}/*.la
find %{buildroot}/%{_libdir} -type f -name '*.so.*' -print0 | xargs -0 chrpath --delete
+chrpath --delete %{buildroot}%{_bindir}/cmis-client
%ldconfig_scriptlets
diff --git a/sources b/sources
index a1af485..5068545 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libcmis-0.6.2.tar.xz) = 950c2a506db33249251304b038d4389d230fb707d17866322533c8f9261e0fac864bc901163697e712d5f620e19f26b456d896c9ad45362b8acd1d5cbae5f831
+SHA512 (libcmis-0.6.3.tar.xz) = ab700e7f40726e4b027b2406f079da2746e9dd9e4a8324cab1c066b3aea6aa995f14fdaaf7260388f31abe3f8075cd9b7450585832179e48dcb17683bafd430b
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-03 20:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-03 20:29 [rpms/libcmis] f43: 0.6.3 Gwyn Ciesla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox