diff --git a/boost-1.73-python3.10.patch b/boost-1.73-python3.10.patch deleted file mode 100644 index a6106a9..0000000 --- a/boost-1.73-python3.10.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- boost_1_73_0/boost/parameter/python.hpp% 2020-11-13 23:37:19.232520985 +0000 -+++ boost_1_73_0/boost/parameter/python.hpp 2020-11-13 23:40:58.808393161 +0000 -@@ -66,7 +66,7 @@ - - if (Py_TYPE(&unspecified) == 0) - { -- Py_TYPE(&unspecified) = &PyType_Type; -+ Py_SET_TYPE(&unspecified, &PyType_Type); - PyType_Ready(&unspecified); - } - ---- boost_1_73_0/libs/python/src/object/class.cpp~ 2020-11-13 23:37:19.236520983 +0000 -+++ boost_1_73_0/libs/python/src/object/class.cpp 2020-11-13 23:40:40.233403979 +0000 -@@ -208,7 +208,7 @@ - { - if (static_data_object.tp_dict == 0) - { -- Py_TYPE(&static_data_object) = &PyType_Type; -+ Py_SET_TYPE(&static_data_object, &PyType_Type); - static_data_object.tp_base = &PyProperty_Type; - if (PyType_Ready(&static_data_object)) - return 0; -@@ -316,7 +316,7 @@ - { - if (class_metatype_object.tp_dict == 0) - { -- Py_TYPE(&class_metatype_object) = &PyType_Type; -+ Py_SET_TYPE(&class_metatype_object, &PyType_Type); - class_metatype_object.tp_base = &PyType_Type; - if (PyType_Ready(&class_metatype_object)) - return type_handle(); -@@ -375,11 +375,11 @@ - // there. A negative number indicates that the extra - // instance memory is not yet allocated to any holders. - #if PY_VERSION_HEX >= 0x02060000 -- Py_SIZE(result) = -+ Py_SET_SIZE(result, - #else -- result->ob_size = -+ result->ob_size = ( - #endif -- -(static_cast(offsetof(instance<>,storage) + instance_size)); -+ -(static_cast(offsetof(instance<>,storage) + instance_size))); - } - return (PyObject*)result; - } -@@ -470,7 +470,7 @@ - { - if (class_type_object.tp_dict == 0) - { -- Py_TYPE(&class_type_object) = incref(class_metatype().get()); -+ Py_SET_TYPE(&class_type_object, incref(class_metatype().get())); - class_type_object.tp_base = &PyBaseObject_Type; - if (PyType_Ready(&class_type_object)) - return type_handle(); -@@ -739,7 +739,7 @@ - assert(holder_offset >= offsetof(objects::instance<>,storage)); - - // Record the fact that the storage is occupied, noting where it starts -- Py_SIZE(self) = holder_offset; -+ Py_SET_SIZE(self, holder_offset); - return (char*)self + holder_offset; - } - else ---- boost_1_73_0/libs/python/src/object/life_support.cpp~ 2020-11-13 23:37:19.240520980 +0000 -+++ boost_1_73_0/libs/python/src/object/life_support.cpp 2020-11-13 23:39:37.492440504 +0000 -@@ -93,7 +93,7 @@ - - if (Py_TYPE(&life_support_type) == 0) - { -- Py_TYPE(&life_support_type) = &PyType_Type; -+ Py_SET_TYPE(&life_support_type, &PyType_Type); - PyType_Ready(&life_support_type); - } - ---- boost_1_73_0/libs/python/src/object/function.cpp~ 2020-11-13 23:37:19.244520978 +0000 -+++ boost_1_73_0/libs/python/src/object/function.cpp 2020-11-13 23:39:14.260454029 +0000 -@@ -107,7 +107,7 @@ - PyObject* p = this; - if (Py_TYPE(&function_type) == 0) - { -- Py_TYPE(&function_type) = &PyType_Type; -+ Py_SET_TYPE(&function_type, &PyType_Type); - ::PyType_Ready(&function_type); - } - ---- boost_1_73_0/libs/python/src/object/enum.cpp~ 2020-11-13 23:37:19.248520976 +0000 -+++ boost_1_73_0/libs/python/src/object/enum.cpp 2020-11-13 23:38:51.943467016 +0000 -@@ -153,7 +153,7 @@ - { - if (enum_type_object.tp_dict == 0) - { -- Py_TYPE(&enum_type_object) = incref(&PyType_Type); -+ Py_SET_TYPE(&enum_type_object, incref(&PyType_Type)); - #if PY_VERSION_HEX >= 0x03000000 - enum_type_object.tp_base = &PyLong_Type; - #else ---- boost_1_73_0/boost/python/object/make_instance.hpp~ 2020-11-14 00:26:47.356724835 +0000 -+++ boost_1_73_0/boost/python/object/make_instance.hpp 2020-11-14 00:26:49.947723159 +0000 -@@ -47,7 +47,7 @@ - - // Note the position of the internally-stored Holder, - // for the sake of destruction -- Py_SIZE(instance) = offsetof(instance_t, storage); -+ Py_SET_SIZE(instance, offsetof(instance_t, storage)); - - // Release ownership of the python object - protect.cancel(); diff --git a/boost-1.73.0-b2-build-flags.patch b/boost-1.73.0-b2-build-flags.patch deleted file mode 100644 index e2e2037..0000000 --- a/boost-1.73.0-b2-build-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_73_0/tools/build/src/engine/build.sh~ 2020-04-25 17:09:03.159419899 +0100 -+++ boost_1_73_0/tools/build/src/engine/build.sh 2020-04-25 17:11:35.085907844 +0100 -@@ -233,7 +233,7 @@ - - *) - B2_CXX="${CXX} -x c++ -std=c++11" -- B2_CXXFLAGS_RELEASE="-O2 -s" -+ B2_CXXFLAGS_RELEASE="${RPM_OPT_FLAGS} ${RPM_LD_FLAGS}" - B2_CXXFLAGS_DEBUG="-O0 -g" - esac - ;; diff --git a/boost-1.75.0-boost-build-fix.patch b/boost-1.75.0-boost-build-fix.patch deleted file mode 100644 index 264441b..0000000 --- a/boost-1.75.0-boost-build-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 40e5bcd594b01f9b7091de07f9efc4567cc1ac40 Mon Sep 17 00:00:00 2001 -From: Thomas Rodgers -Date: Tue, 2 Feb 2021 18:15:30 -0800 -Subject: [PATCH] Apply post 1.75.0 change from upstream - ---- - tools/build/src/engine/startup.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/build/src/engine/startup.cpp b/tools/build/src/engine/startup.cpp -index f58625408..a7659bb50 100644 ---- a/tools/build/src/engine/startup.cpp -+++ b/tools/build/src/engine/startup.cpp -@@ -195,7 +195,7 @@ bool b2::startup::bootstrap(FRAME *frame) - { - const std::string path{ - b2::paths::normalize( -- b2_exe_path + "/../../share/boost-build/" + boost_build_jam)}; -+ b2_exe_path + "/../../share/boost-build/src/kernel/" + boost_build_jam)}; - if (b2::filesys::is_file(path)) - b2_file_path = path; - } --- -2.26.2 - diff --git a/boost-1.76.0-b2-build-flags.patch b/boost-1.76.0-b2-build-flags.patch new file mode 100644 index 0000000..3422b5d --- /dev/null +++ b/boost-1.76.0-b2-build-flags.patch @@ -0,0 +1,25 @@ +From 5dde5a5a3c12dd8f52cb61ba220ec221ecfa98f0 Mon Sep 17 00:00:00 2001 +From: Thomas Rodgers +Date: Thu, 29 Jul 2021 10:15:37 -0700 +Subject: [PATCH] Use options from RPM for release builds with GCC + +--- + tools/build/src/engine/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh +index 58f41cb4a..f85040f99 100755 +--- a/tools/build/src/engine/build.sh ++++ b/tools/build/src/engine/build.sh +@@ -325,7 +325,7 @@ case "${B2_TOOLSET}" in + B2_CXX="${B2_CXX} -pthread" + ;; + esac +- B2_CXXFLAGS_RELEASE="-O2 -s" ++ B2_CXXFLAGS_RELEASE="${RPM_OPT_FLAGS} ${RPM_LD_FLAGS}" + B2_CXXFLAGS_DEBUG="-O0 -g" + ;; + +-- +2.31.1 + diff --git a/boost-1.76.0-fix-duplicate-typedef-in-mp.patch b/boost-1.76.0-fix-duplicate-typedef-in-mp.patch new file mode 100644 index 0000000..a6c3c7d --- /dev/null +++ b/boost-1.76.0-fix-duplicate-typedef-in-mp.patch @@ -0,0 +1,27 @@ +From 62fcbde69aae70af24a51cb6582a2a95f65441c2 Mon Sep 17 00:00:00 2001 +From: Thomas Rodgers +Date: Wed, 4 Aug 2021 13:22:35 -0700 +Subject: [PATCH] Fix duplicate typedef in mp.hpp [#671] + +https://github.com/boostorg/math/pull/671 +--- + boost/math/tools/mp.hpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/boost/math/tools/mp.hpp b/boost/math/tools/mp.hpp +index dc8440988..3100a0bb6 100644 +--- a/boost/math/tools/mp.hpp ++++ b/boost/math/tools/mp.hpp +@@ -426,9 +426,6 @@ struct make_integer_sequence_impl + template + using make_integer_sequence = typename detail::make_integer_sequence_impl::type; + +-template +-using index_sequence = integer_sequence; +- + template + using make_index_sequence = make_integer_sequence; + +-- +2.31.1 + diff --git a/boost-1.76.0-fix-include-inside-boost-namespace.patch b/boost-1.76.0-fix-include-inside-boost-namespace.patch new file mode 100644 index 0000000..0fd8f05 --- /dev/null +++ b/boost-1.76.0-fix-include-inside-boost-namespace.patch @@ -0,0 +1,33 @@ +From f6818a161d3f835d246aceea0804243c887ac10b Mon Sep 17 00:00:00 2001 +From: Thomas Rodgers +Date: Wed, 4 Aug 2021 13:09:57 -0700 +Subject: [PATCH] Fix include inside boost namespace [#670] + +https://github.com/boostorg/math/pull/670/commits/1ec5c98d80de97f9e962c5627e1a0e6096099894 +--- + boost/math/tools/mp.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boost/math/tools/mp.hpp b/boost/math/tools/mp.hpp +index 35565646f..dc8440988 100644 +--- a/boost/math/tools/mp.hpp ++++ b/boost/math/tools/mp.hpp +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + namespace boost { namespace math { namespace tools { namespace meta_programming { + +@@ -338,7 +339,6 @@ using mp_remove_if_q = mp_remove_if; + // Index sequence + // Use C++14 index sequence if available + #if defined(__cpp_lib_integer_sequence) && (__cpp_lib_integer_sequence >= 201304) +-#include + template + using index_sequence = std::index_sequence; + +-- +2.31.1 + diff --git a/boost.spec b/boost.spec index cbc8a5b..43afae3 100644 --- a/boost.spec +++ b/boost.spec @@ -41,8 +41,8 @@ Name: boost %global real_name boost Summary: The free peer-reviewed portable C++ source libraries -Version: 1.75.0 -Release: 9%{?dist} +Version: 1.76.0 +Release: 0%{?dist} License: Boost and MIT and Python # Replace each . with _ in %%{version} @@ -54,7 +54,7 @@ License: Boost and MIT and Python %global toplev_dirname %{real_name}_%{version_enc} URL: http://www.boost.org -Source0: https://dl.bintray.com/boostorg/release/%{version}/source/%{name}_%%{version_enc}.tar.bz2 +Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/%{name}_%%{version_enc}.tar.bz2 Source1: libboost_thread.so # Add a manual page for b2, based on the online documentation: # http://www.boost.org/boost-build2/doc/html/bbv2/overview.html @@ -138,28 +138,26 @@ Patch96: boost-1.75.0-build-optflags.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318383 Patch97: boost-1.75.0-no-rpath.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1541035 -Patch83: boost-1.73.0-b2-build-flags.patch - # https://lists.boost.org/Archives/boost/2020/04/248812.php Patch88: boost-1.73.0-cmakedir.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1896382 -# https://github.com/boostorg/python/issues/325 -Patch93: boost-1.73-python3.10.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1899888 # https://github.com/boostorg/locale/issues/52 Patch94: boost-1.73-locale-empty-vector.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1923740 -# https://github.com/boostorg/build/issues/696 -Patch95: boost-1.75.0-boost-build-fix.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1958382 # https://github.com/boostorg/graph/pull/218 Patch98: boost-1.75.0-remove-deprecated-boost-iterator.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1541035 +Patch99: boost-1.76.0-b2-build-flags.patch + +# https://github.com/boostorg/math/pull/670 +Patch100: boost-1.76.0-fix-include-inside-boost-namespace.patch + +# https://github.com/boostorg/math/pull/671 +Patch101: boost-1.76.0-fix-duplicate-typedef-in-mp.patch + %bcond_with tests %bcond_with docs_generated @@ -676,12 +674,12 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x %patch51 -p1 %patch96 -p1 %patch97 -p1 -%patch83 -p1 +%patch99 -p1 %patch88 -p1 -%patch93 -p1 %patch94 -p1 -%patch95 -p1 %patch98 -p1 +%patch100 -p1 +%patch101 -p1 %build %set_build_flags @@ -1283,6 +1281,18 @@ fi %{_mandir}/man1/b2.1* %changelog +* Wed Aug 04 2021 Thomas Rodgers - 1.76.0-1 +- Rebase to 1.75.0 + See https://fedoraproject.org/wiki/Changes/F35Boost176 +- Drop patches: + deleted: boost-1.73-python3.10.patch + deleted: boost-1.73.0-b2-build-flags.patch + deleted: boost-1.75.0-boost-build-fix.patch +- Fix include inside boost namespace in boost/math/tools/mp.hpp + See https://github.com/boostorg/math/pull/670 +- Fix duplicate typedef in boost/math/tools/mp.hpp + See https://github.com/boostorg/math/pull/671 + * Wed Jul 21 2021 Fedora Release Engineering - 1.75.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 784d5b3..ced7dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (boost_1_75_0.tar.bz2) = d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a +SHA512 (boost_1_76_0.tar.bz2) = 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429