diff --git a/libboost-1.57.0-moc-libqt4-4.8.6.patch b/libboost-1.57.0-moc-libqt4-4.8.6.patch deleted file mode 100644 index a585d43..0000000 --- a/libboost-1.57.0-moc-libqt4-4.8.6.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- boost_1_57_0/boost/type_traits/detail/has_binary_operator.hpp.orig 2015-04-11 16:45:40.250578640 +0200 -+++ boost_1_57_0/boost/type_traits/detail/has_binary_operator.hpp 2015-04-11 16:45:58.911577918 +0200 -@@ -6,6 +6,7 @@ - // - // See http://www.boost.org/libs/type_traits for most recent version including documentation. - -+#ifndef Q_MOC_RUN - #include - #include - #include -@@ -227,3 +228,4 @@ - #endif - - #include -+#endif diff --git a/libboost-1.58.0-python-3.3.patch b/libboost-1.58.0-python-3.3.patch deleted file mode 100644 index ec3831c..0000000 --- a/libboost-1.58.0-python-3.3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3e405b6fd5db5615bbef241763de070118222ca7 Mon Sep 17 00:00:00 2001 -From: Stefan Seefeld -Date: Thu, 9 Apr 2015 08:57:08 -0400 -Subject: [PATCH] Fix exec_file for Python 3 < 3.4. - ---- - src/exec.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp -index 2910db7..12cdabc 100644 ---- a/libs/python/src/exec.cpp -+++ b/libs/python/src/exec.cpp -@@ -86,9 +86,12 @@ object BOOST_PYTHON_DECL exec_file(str filename, object global, object local) - char *f = python::extract(filename); - - // Let python open the file to avoid potential binary incompatibilities. --#if PY_VERSION_HEX >= 0x03000000 -- // See http://www.codeproject.com/Articles/820116/Embedding-Python-program-in-a-C-Cplusplus-code -+#if PY_VERSION_HEX >= 0x03400000 - FILE *fs = _Py_fopen(f, "r"); -+#elif PY_VERSION_HEX >= 0x03000000 -+ PyObject *fo = Py_BuildValue("s", f); -+ FILE *fs = _Py_fopen(fo, "r"); -+ Py_DECREF(fo); - #else - PyObject *pyfile = PyFile_FromString(f, const_cast("r")); - if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file"); diff --git a/libboost-1.76.0-arm-upstream-fix-build.patch b/libboost-1.76.0-arm-upstream-fix-build.patch deleted file mode 100644 index 5b97e3d..0000000 --- a/libboost-1.76.0-arm-upstream-fix-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6064875bff2e52ba63f01911eb4deb79259c5e3b Mon Sep 17 00:00:00 2001 -From: Carlos Miguel Ferreira -Date: Thu, 3 Jun 2021 23:10:37 +0100 -Subject: [PATCH] Fixes wrong type for mutex in regex v5 - -With the Boost.Regex to ehader-only library, the declaration -of a mutex that should have been changed from boost::static_mutex -to std::mutex was left behind. This was preventing regex from -being built for older arm platforms [1] - -[1]: https://github.com/openwrt/packages/issues/15725 - -Signed-off-by: Carlos Miguel Ferreira ---- - include/boost/regex/v5/mem_block_cache.hpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/include/boost/regex/v5/mem_block_cache.hpp b/include/boost/regex/v5/mem_block_cache.hpp -index 0af4eae18..eb3ec776c 100644 ---- a/include/boost/regex/v5/mem_block_cache.hpp -+++ b/include/boost/regex/v5/mem_block_cache.hpp -@@ -85,10 +85,10 @@ struct mem_block_node - struct mem_block_cache - { - // this member has to be statically initialsed: -- mem_block_node* next; -- unsigned cached_blocks; -+ mem_block_node* next { nullptr }; -+ unsigned cached_blocks { 0 }; - #ifdef BOOST_HAS_THREADS -- boost::static_mutex mut; -+ std::mutex mut; - #endif - - ~mem_block_cache() -@@ -133,11 +133,7 @@ struct mem_block_cache - } - static mem_block_cache& instance() - { --#ifdef BOOST_HAS_THREADS -- static mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, }; --#else -- static mem_block_cache block_cache = { 0, 0, }; --#endif -+ static mem_block_cache block_cache; - return block_cache; - } - }; diff --git a/libboost183.spec b/libboost183.spec index 98592d4..37f639d 100644 --- a/libboost183.spec +++ b/libboost183.spec @@ -2,7 +2,7 @@ %define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) Name: libboost183 Version: 1.83.0 -Release: 3mamba +Release: 4mamba Summary: Free peer-reviewed portable C++ source libraries Group: System/Libraries Vendor: openmamba @@ -10,9 +10,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://www.boost.org/ Source: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{pckver}.tar.bz2 -Patch0: libboost-1.57.0-moc-libqt4-4.8.6.patch -Patch1: libboost-1.58.0-python-3.3.patch -Patch2: libboost-1.76.0-arm-upstream-fix-build.patch License: Boost Software License ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -43,9 +40,6 @@ Ten Boost libraries will be included in the C++ Standards Committee's upcoming C Group: Development/Libraries Summary: Devel package for libboost Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Provides: python-boost-devel -Obsoletes: python-boost-devel < 1.78.0-2mamba -Requires: python-boost-py3 = %{?epoch:%epoch:}%{version}-%{release} %description devel The Boost libraries provide free peer-reviewed portable C++ source libraries. @@ -89,10 +83,6 @@ This package contains then Boost.python library for Python 3.10. #:<< _EOF mv boost_%{pckver} boost_python310 -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p2 - %build #:<< _EOF # Build boost with python3 @@ -240,6 +230,9 @@ rm -f %{buildroot}%{_libdir}/boost-python*/mpi.so %{_libdir}/libboost_numpy310.so.* %changelog +* Tue Jan 02 2024 Silvan Calarco 1.83.0-4mamba +- remove provides/obsoletes for python-boost-devel + * Thu Dec 28 2023 Silvan Calarco 1.83.0-3mamba - legacy package