From 3eed046848abddd23cfa23e6510851f0750b0a2ea33d03585abded9626f27353 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 31 Jan 2025 13:20:26 +0000 Subject: [PATCH] Accepting request 1241630 from home:aschnell:boost2 - added boost-smart-ptr.patch from upstream (bsc#1234430) OBS-URL: https://build.opensuse.org/request/show/1241630 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=335 --- boost-smart-ptr.patch | 28 ++++++++++++++++++++++++++++ boost.changes | 5 +++++ boost.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 boost-smart-ptr.patch diff --git a/boost-smart-ptr.patch b/boost-smart-ptr.patch new file mode 100644 index 0000000..e3b6117 --- /dev/null +++ b/boost-smart-ptr.patch @@ -0,0 +1,28 @@ +See https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c. + +diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp +index ddb20c0b0e..11b476513a 100644 +--- a/boost/smart_ptr/intrusive_ptr.hpp ++++ b/boost/smart_ptr/intrusive_ptr.hpp +@@ -285,7 +285,7 @@ template intrusive_ptr dynamic_pointer_cast( intrusive_ptr< + + // operator<< + +-template std::ostream & operator<< (std::ostream & os, intrusive_ptr const & p) ++template std::basic_ostream & operator<< (std::basic_ostream & os, intrusive_ptr const & p) + { + os << p.get(); + return os; +diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp +index 2431a33590..2deed9b632 100644 +--- a/boost/smart_ptr/shared_ptr.hpp ++++ b/boost/smart_ptr/shared_ptr.hpp +@@ -775,7 +775,7 @@ template inline typename shared_ptr::element_type * get_pointer(shar + + // operator<< + +-template std::ostream & operator<< (std::ostream & os, shared_ptr const & p) ++template std::basic_ostream & operator<< (std::basic_ostream & os, shared_ptr const & p) + { + os << p.get(); + return os; diff --git a/boost.changes b/boost.changes index cf7bcef..5e9cdba 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 31 11:05:20 CET 2025 - aschnell@suse.com + +- added boost-smart-ptr.patch from upstream (bsc#1234430) + ------------------------------------------------------------------- Tue Jan 07 10:32:50 CET 2025 - aschnell@suse.com diff --git a/boost.spec b/boost.spec index 7db1d4c..1ef8f98 100644 --- a/boost.spec +++ b/boost.spec @@ -236,6 +236,7 @@ Patch17: python_mpi.patch Patch18: dynamic_linking.patch Patch20: python_library_name.patch Patch21: boost-remove-cmakedir.patch +Patch22: boost-smart-ptr.patch %{?suse_build_hwcaps_libs} BuildRequires: fdupes BuildRequires: gcc-c++ @@ -1287,6 +1288,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch -P 18 -p1 %patch -P 20 -p1 %patch -P 21 -p1 +%patch -P 22 -p1 %build find . -type f -exec chmod u+w {} +