From 299b9b9335817b282b67cde109a3c0d2128eb8aa Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Jun 2023 08:44:09 +0200 Subject: [PATCH 1/8] Add patch from Vagrant Cascadian to make build reproducible. Update changelog (cherry picked from commit ef3f0455d383e4cdb50984e11fb45001804c538c) Signed-off-by: Adam Emerson Conflicts: debian/changelog debian/patches/series Just the usual issues of pulling back from upstream --- debian/changelog | 11 +++ ...estamps-and-dates-from-documentation.patch | 89 +++++++++++++++++++ debian/patches/series | 3 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch diff --git a/debian/changelog b/debian/changelog index a51fe5970..963529f8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +boost1.82 (1.82.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Adapt tests for newer cmake version (Closes: #1036841) + * Add dependency on libboost-json1.81-dev from libboost1.81-all-dev (Closes: + #1037155) + * Add patch from Vagrant Cascadian to make documentation build reproducible + (Closes: #1035027) + + -- Gianfranco Costamagna Mon, 19 Jun 2023 15:32:59 +0200 + boost1.82 (1.82.0-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch b/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch new file mode 100644 index 000000000..e38562c0d --- /dev/null +++ b/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch @@ -0,0 +1,89 @@ +From 7c9c189ea32470cd683939c11fabf78f0b2f3f17 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +Date: Sat, 22 Apr 2023 19:53:22 -0700 +Subject: [PATCH] Remove timestamps and dates from documentation. + +https://reproducible-builds.org/docs/timestamps/ +--- + libs/circular_buffer/doc/circular_buffer.qbk | 2 -- + libs/units/doc/units.qbk | 1 - + tools/boostbook/xsl/html-base.xsl | 22 -------------------- + tools/quickbook/doc/block.qbk | 4 ++-- + 4 files changed, 2 insertions(+), 27 deletions(-) + +diff --git a/libs/circular_buffer/doc/circular_buffer.qbk b/libs/circular_buffer/doc/circular_buffer.qbk +index a7177e4c..217c42b6 100644 +--- a/libs/circular_buffer/doc/circular_buffer.qbk ++++ b/libs/circular_buffer/doc/circular_buffer.qbk +@@ -596,8 +596,6 @@ Paul A. Bristow refactored the documentation in 2013 to use the full power of Qu + + [section:version_id Documentation Version Info] + +-Last edit to Quickbook file __FILENAME__ was at __TIME__ on __DATE__. +- + [tip This should appear on the pdf version + (but may be redundant on a html version where the last edit date is on the first (home) page).] + +diff --git a/libs/units/doc/units.qbk b/libs/units/doc/units.qbk +index 0c7345fc..b160ef21 100644 +--- a/libs/units/doc/units.qbk ++++ b/libs/units/doc/units.qbk +@@ -1309,7 +1309,6 @@ the design and implementation of this library. + + __boostroot + +-Last edit to Quickbook file __FILENAME__ was at __TIME__ on __DATE__. + + [tip This should appear on the pdf version (but may be redundant on html).] + [/ Useful on pdf version. See also Last revised timestamp on first page of html version.] +diff --git a/tools/boostbook/xsl/html-base.xsl b/tools/boostbook/xsl/html-base.xsl +index a1031710..cfba8727 100644 +--- a/tools/boostbook/xsl/html-base.xsl ++++ b/tools/boostbook/xsl/html-base.xsl +@@ -234,28 +234,6 @@ set toc,title + + +- +-

+- +- Last revised: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-

+- + + + +diff --git a/tools/quickbook/doc/block.qbk b/tools/quickbook/doc/block.qbk +index dbfdb8d2..bcf3f406 100644 +--- a/tools/quickbook/doc/block.qbk ++++ b/tools/quickbook/doc/block.qbk +@@ -602,8 +602,8 @@ Quickbook has some predefined macros that you can already use. + + [table Predefined Macros + [[Macro] [Meaning] [Example]] +- [[[^\__DATE__]] [Today's date] [__DATE__]] +- [[[^\__TIME__]] [The current time] [__TIME__]] ++ [[[^\__DATE__]] [Today's date] [2022-04-20]] ++ [[[^\__TIME__]] [The current time] [01:42:48 PM]] + [[[^\__FILENAME__]][Quickbook source filename] [__FILENAME__]] + ] + +-- +2.39.2 + diff --git a/debian/patches/series b/debian/patches/series index 20e99033b..07207f425 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,5 @@ 20_remove_privacy_breach.patch 116.patch fix-mpi-python37.patch -fix_extension.patch \ No newline at end of file +fix_extension.patch +0001-Remove-timestamps-and-dates-from-documentation.patch From 2cd30e87e5a93ba4f05b1c1266560f95ba88b1e5 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Jun 2023 08:40:06 +0200 Subject: [PATCH 2/8] Add patch to fix autopkgtests with newer cmake (Closes: #1036840) (cherry picked from commit 4cb74a350919e581da2d3eedb577398a86564169) Signed-off-by: Adam Emerson --- debian/tests/srcs/atomic/CMakeLists.txt | 2 +- debian/tests/srcs/chrono/CMakeLists.txt | 2 +- debian/tests/srcs/container/CMakeLists.txt | 2 +- debian/tests/srcs/context/CMakeLists.txt | 2 +- debian/tests/srcs/coroutine/CMakeLists.txt | 2 +- debian/tests/srcs/datetime/CMakeLists.txt | 2 +- debian/tests/srcs/exception/CMakeLists.txt | 2 +- debian/tests/srcs/fiber/CMakeLists.txt | 4 ++-- debian/tests/srcs/filesystem/CMakeLists.txt | 4 ++-- debian/tests/srcs/graph-parallel/CMakeLists.txt | 2 +- debian/tests/srcs/graph/CMakeLists.txt | 4 ++-- debian/tests/srcs/iostreams/CMakeLists.txt | 4 ++-- debian/tests/srcs/locale/CMakeLists.txt | 4 ++-- debian/tests/srcs/log/CMakeLists.txt | 4 ++-- debian/tests/srcs/math/CMakeLists.txt | 4 ++-- debian/tests/srcs/mpi/CMakeLists.txt | 2 +- debian/tests/srcs/program-options/CMakeLists.txt | 4 ++-- debian/tests/srcs/python/CMakeLists.txt | 2 +- debian/tests/srcs/random/CMakeLists.txt | 4 ++-- debian/tests/srcs/regex/CMakeLists.txt | 4 ++-- debian/tests/srcs/serialization/CMakeLists.txt | 4 ++-- debian/tests/srcs/signals/CMakeLists.txt | 4 ++-- debian/tests/srcs/stacktrace/CMakeLists.txt | 2 +- debian/tests/srcs/system/CMakeLists.txt | 4 ++-- debian/tests/srcs/test/CMakeLists.txt | 4 ++-- debian/tests/srcs/thread/CMakeLists.txt | 2 +- debian/tests/srcs/timer/CMakeLists.txt | 4 ++-- debian/tests/srcs/type-erasure/CMakeLists.txt | 4 ++-- debian/tests/srcs/wave/CMakeLists.txt | 2 +- 29 files changed, 45 insertions(+), 45 deletions(-) diff --git a/debian/tests/srcs/atomic/CMakeLists.txt b/debian/tests/srcs/atomic/CMakeLists.txt index 038012bfc..3e925d19d 100644 --- a/debian/tests/srcs/atomic/CMakeLists.txt +++ b/debian/tests/srcs/atomic/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS atomic REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/chrono/CMakeLists.txt b/debian/tests/srcs/chrono/CMakeLists.txt index 7abb1b391..cecb2bdc7 100644 --- a/debian/tests/srcs/chrono/CMakeLists.txt +++ b/debian/tests/srcs/chrono/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS chrono system REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/container/CMakeLists.txt b/debian/tests/srcs/container/CMakeLists.txt index bf79d3ba7..cfca0eec6 100644 --- a/debian/tests/srcs/container/CMakeLists.txt +++ b/debian/tests/srcs/container/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS container system REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/context/CMakeLists.txt b/debian/tests/srcs/context/CMakeLists.txt index a89962b41..2d90727f5 100644 --- a/debian/tests/srcs/context/CMakeLists.txt +++ b/debian/tests/srcs/context/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS context REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/coroutine/CMakeLists.txt b/debian/tests/srcs/coroutine/CMakeLists.txt index 780f2573b..1adae1605 100644 --- a/debian/tests/srcs/coroutine/CMakeLists.txt +++ b/debian/tests/srcs/coroutine/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS coroutine context REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/datetime/CMakeLists.txt b/debian/tests/srcs/datetime/CMakeLists.txt index 690a0aba2..78bbd44d3 100644 --- a/debian/tests/srcs/datetime/CMakeLists.txt +++ b/debian/tests/srcs/datetime/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS date_time REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/exception/CMakeLists.txt b/debian/tests/srcs/exception/CMakeLists.txt index acfd95832..a9f41b4ca 100644 --- a/debian/tests/srcs/exception/CMakeLists.txt +++ b/debian/tests/srcs/exception/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS exception REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/fiber/CMakeLists.txt b/debian/tests/srcs/fiber/CMakeLists.txt index 148c330be..da4ad2f2b 100644 --- a/debian/tests/srcs/fiber/CMakeLists.txt +++ b/debian/tests/srcs/fiber/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS fiber REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/filesystem/CMakeLists.txt b/debian/tests/srcs/filesystem/CMakeLists.txt index aedcdbe7f..2be91e814 100644 --- a/debian/tests/srcs/filesystem/CMakeLists.txt +++ b/debian/tests/srcs/filesystem/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS filesystem REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/graph-parallel/CMakeLists.txt b/debian/tests/srcs/graph-parallel/CMakeLists.txt index 8ae6de351..28412586b 100644 --- a/debian/tests/srcs/graph-parallel/CMakeLists.txt +++ b/debian/tests/srcs/graph-parallel/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(MPI REQUIRED) INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) diff --git a/debian/tests/srcs/graph/CMakeLists.txt b/debian/tests/srcs/graph/CMakeLists.txt index 8b2d37929..b78611ceb 100644 --- a/debian/tests/srcs/graph/CMakeLists.txt +++ b/debian/tests/srcs/graph/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS graph REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -11,4 +11,4 @@ ADD_EXECUTABLE(demo2 demo2.cpp) TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo3 demo3.cpp) -TARGET_LINK_LIBRARIES(demo3 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo3 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/iostreams/CMakeLists.txt b/debian/tests/srcs/iostreams/CMakeLists.txt index 97e3466ee..000c6a4b6 100644 --- a/debian/tests/srcs/iostreams/CMakeLists.txt +++ b/debian/tests/srcs/iostreams/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS iostreams REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/locale/CMakeLists.txt b/debian/tests/srcs/locale/CMakeLists.txt index 684ee01ba..60f4da1cd 100644 --- a/debian/tests/srcs/locale/CMakeLists.txt +++ b/debian/tests/srcs/locale/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS locale REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/log/CMakeLists.txt b/debian/tests/srcs/log/CMakeLists.txt index 8d7a1a8aa..08d1a63f5 100644 --- a/debian/tests/srcs/log/CMakeLists.txt +++ b/debian/tests/srcs/log/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS log log_setup REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/math/CMakeLists.txt b/debian/tests/srcs/math/CMakeLists.txt index 7670d4350..2a3aca4ac 100644 --- a/debian/tests/srcs/math/CMakeLists.txt +++ b/debian/tests/srcs/math/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/mpi/CMakeLists.txt b/debian/tests/srcs/mpi/CMakeLists.txt index 510565552..9d99086ef 100644 --- a/debian/tests/srcs/mpi/CMakeLists.txt +++ b/debian/tests/srcs/mpi/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(MPI REQUIRED) INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) diff --git a/debian/tests/srcs/program-options/CMakeLists.txt b/debian/tests/srcs/program-options/CMakeLists.txt index f5bb0ca7e..a2d4eeffb 100644 --- a/debian/tests/srcs/program-options/CMakeLists.txt +++ b/debian/tests/srcs/program-options/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS program_options REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -11,4 +11,4 @@ ADD_EXECUTABLE(demo2 demo2.cpp) TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/multiple_sources.cfg - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/debian/tests/srcs/python/CMakeLists.txt b/debian/tests/srcs/python/CMakeLists.txt index 029cda081..406b1779c 100644 --- a/debian/tests/srcs/python/CMakeLists.txt +++ b/debian/tests/srcs/python/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Python 3 REQUIRED COMPONENTS Interpreter Development) INCLUDE_DIRECTORIES( ${Python_INCLUDE_DIRS} ) diff --git a/debian/tests/srcs/random/CMakeLists.txt b/debian/tests/srcs/random/CMakeLists.txt index 93163e09a..4b5ce2c16 100644 --- a/debian/tests/srcs/random/CMakeLists.txt +++ b/debian/tests/srcs/random/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS random REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/regex/CMakeLists.txt b/debian/tests/srcs/regex/CMakeLists.txt index 345e5987b..cedd5bdbf 100644 --- a/debian/tests/srcs/regex/CMakeLists.txt +++ b/debian/tests/srcs/regex/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS regex REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/serialization/CMakeLists.txt b/debian/tests/srcs/serialization/CMakeLists.txt index 0c7eae9ec..8a79e67ff 100644 --- a/debian/tests/srcs/serialization/CMakeLists.txt +++ b/debian/tests/srcs/serialization/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS serialization random REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/signals/CMakeLists.txt b/debian/tests/srcs/signals/CMakeLists.txt index cc4374c55..75b107a2d 100644 --- a/debian/tests/srcs/signals/CMakeLists.txt +++ b/debian/tests/srcs/signals/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS signals REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/stacktrace/CMakeLists.txt b/debian/tests/srcs/stacktrace/CMakeLists.txt index b07b32b76..d9e1f2c01 100644 --- a/debian/tests/srcs/stacktrace/CMakeLists.txt +++ b/debian/tests/srcs/stacktrace/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) # stacktrace is not included into the cmake yet diff --git a/debian/tests/srcs/system/CMakeLists.txt b/debian/tests/srcs/system/CMakeLists.txt index 4364a7e45..d27d764ec 100644 --- a/debian/tests/srcs/system/CMakeLists.txt +++ b/debian/tests/srcs/system/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS system REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/test/CMakeLists.txt b/debian/tests/srcs/test/CMakeLists.txt index ac61a2d95..d9747f8cf 100644 --- a/debian/tests/srcs/test/CMakeLists.txt +++ b/debian/tests/srcs/test/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS unit_test_framework REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/thread/CMakeLists.txt b/debian/tests/srcs/thread/CMakeLists.txt index f04b4fec1..d02ba2388 100644 --- a/debian/tests/srcs/thread/CMakeLists.txt +++ b/debian/tests/srcs/thread/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS thread chrono REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) diff --git a/debian/tests/srcs/timer/CMakeLists.txt b/debian/tests/srcs/timer/CMakeLists.txt index c0084543a..56711a0f1 100644 --- a/debian/tests/srcs/timer/CMakeLists.txt +++ b/debian/tests/srcs/timer/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS timer REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/type-erasure/CMakeLists.txt b/debian/tests/srcs/type-erasure/CMakeLists.txt index cf8c69def..16ca0ebaf 100644 --- a/debian/tests/srcs/type-erasure/CMakeLists.txt +++ b/debian/tests/srcs/type-erasure/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS type_erasure REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) @@ -8,4 +8,4 @@ ADD_EXECUTABLE(demo1 demo1.cpp) TARGET_LINK_LIBRARIES(demo1 ${Boost_LIBRARIES}) ADD_EXECUTABLE(demo2 demo2.cpp) -TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES}) diff --git a/debian/tests/srcs/wave/CMakeLists.txt b/debian/tests/srcs/wave/CMakeLists.txt index e96afd58a..dcb8fddff 100644 --- a/debian/tests/srcs/wave/CMakeLists.txt +++ b/debian/tests/srcs/wave/CMakeLists.txt @@ -1,5 +1,5 @@ -project(Boost CXX) cmake_minimum_required(VERSION 3.0) +project(Boost CXX) FIND_PACKAGE(Boost COMPONENTS wave thread REQUIRED) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS}) From d7405b49367dfbb377760751fb42c0535ebb40df Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Sat, 7 Oct 2023 10:29:29 +0200 Subject: [PATCH 3/8] Fix FTBFS during the doc generation. (Closes: #1052892) (cherry picked from commit a2c29ab7f76dc861ac0f9b2de1419dcfb41b3331) Signed-off-by: Adam Emerson --- debian/patches/40.patch | 43 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 debian/patches/40.patch diff --git a/debian/patches/40.patch b/debian/patches/40.patch new file mode 100644 index 000000000..c22fb2d7e --- /dev/null +++ b/debian/patches/40.patch @@ -0,0 +1,43 @@ +Description: Fix FTBFS during doc generation. +Author: Anton Gladky +Bug-Debian: https://bugs.debian.org/1052892 +Last-Update: 2023-10-05 + +Index: boost/libs/accumulators/doc/Jamfile.v2 +=================================================================== +--- boost.orig/libs/accumulators/doc/Jamfile.v2 ++++ boost/libs/accumulators/doc/Jamfile.v2 +@@ -118,7 +118,7 @@ else + { + CP = cp ; + MKDIR = mkdir -p ; +- FROM = /../../html/statsdoc/*.png ; ++ FROM = /html/statsdoc/*.png ; + TOHTML = ./html/images/accumulators ; + TOPDF = /images/accumulators ; + } +Index: boost/tools/boostbook/xsl/source-highlight.xsl +=================================================================== +--- boost.orig/tools/boostbook/xsl/source-highlight.xsl ++++ boost/tools/boostbook/xsl/source-highlight.xsl +@@ -157,20 +157,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + diff --git a/debian/patches/series b/debian/patches/series index 07207f425..58174bca6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ fix-mpi-python37.patch fix_extension.patch 0001-Remove-timestamps-and-dates-from-documentation.patch +40.patch From 192a0efb70a3dffb106473c4ac7083964849f495 Mon Sep 17 00:00:00 2001 From: Adam Emerson Date: Fri, 17 May 2024 14:07:46 -0400 Subject: [PATCH 4/8] Bump to 1.85 Signed-off-by: Adam Emerson --- debian/changelog | 7 + debian/control | 482 +++++++++++++++++++++++------------------------ 2 files changed, 248 insertions(+), 241 deletions(-) diff --git a/debian/changelog b/debian/changelog index 963529f8f..42e9c30c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +boost1.85 (1.85.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream + + -- Adam Emerson Thu, 11 May 2023 11:49:06 -0400 + boost1.82 (1.82.0-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 24848f2ec..ffd2d0533 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: boost1.82 +Source: boost1.85 Homepage: https://www.boost.org/ Section: libs Priority: optional @@ -16,46 +16,46 @@ Vcs-Browser: https://salsa.debian.org/debian/boost Vcs-Git: https://salsa.debian.org/debian/boost.git Standards-Version: 4.6.2 -Package: ceph-libboost1.82-dev +Package: ceph-libboost1.85-dev Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, ${shlibs:Depends}, libstdc++-${gxx:major}-dev -Suggests: ceph-libboost1.82-doc, - ceph-libboost-atomic1.82-dev, - ceph-libboost-chrono1.82-dev, - ceph-libboost-container1.82-dev, - ceph-libboost-context1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-contract1.82-dev, - ceph-libboost-coroutine1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-date-time1.82-dev, - ceph-libboost-exception1.82-dev, - ceph-libboost-fiber1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-filesystem1.82-dev, - ceph-libboost-graph1.82-dev, - ceph-libboost-graph-parallel1.82-dev, - ceph-libboost-iostreams1.82-dev, - ceph-libboost-locale1.82-dev, - ceph-libboost-log1.82-dev, - ceph-libboost-math1.82-dev, - ceph-libboost-mpi1.82-dev, - ceph-libboost-mpi-python1.82-dev, - ceph-libboost-numpy1.82-dev, - ceph-libboost-program-options1.82-dev, - ceph-libboost-python1.82-dev, - ceph-libboost-random1.82-dev, - ceph-libboost-regex1.82-dev, - ceph-libboost-serialization1.82-dev, - ceph-libboost-stacktrace1.82-dev, - ceph-libboost-system1.82-dev, - ceph-libboost-test1.82-dev, - ceph-libboost-thread1.82-dev, - ceph-libboost-timer1.82-dev, - ceph-libboost-type-erasure1.82-dev, - ceph-libboost-wave1.82-dev, - ceph-libboost1.82-tools-dev, +Suggests: ceph-libboost1.85-doc, + ceph-libboost-atomic1.85-dev, + ceph-libboost-chrono1.85-dev, + ceph-libboost-container1.85-dev, + ceph-libboost-context1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-contract1.85-dev, + ceph-libboost-coroutine1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-date-time1.85-dev, + ceph-libboost-exception1.85-dev, + ceph-libboost-fiber1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-filesystem1.85-dev, + ceph-libboost-graph1.85-dev, + ceph-libboost-graph-parallel1.85-dev, + ceph-libboost-iostreams1.85-dev, + ceph-libboost-locale1.85-dev, + ceph-libboost-log1.85-dev, + ceph-libboost-math1.85-dev, + ceph-libboost-mpi1.85-dev, + ceph-libboost-mpi-python1.85-dev, + ceph-libboost-numpy1.85-dev, + ceph-libboost-program-options1.85-dev, + ceph-libboost-python1.85-dev, + ceph-libboost-random1.85-dev, + ceph-libboost-regex1.85-dev, + ceph-libboost-serialization1.85-dev, + ceph-libboost-stacktrace1.85-dev, + ceph-libboost-system1.85-dev, + ceph-libboost-test1.85-dev, + ceph-libboost-thread1.85-dev, + ceph-libboost-timer1.85-dev, + ceph-libboost-type-erasure1.85-dev, + ceph-libboost-wave1.85-dev, + ceph-libboost1.85-tools-dev, libmpfrc++-dev, libntl-dev, - ceph-libboost-nowide1.82-dev + ceph-libboost-nowide1.85-dev Description: Boost C++ Libraries development files The Boost web site provides free, peer-reviewed, portable C++ source libraries. The emphasis is on libraries which work well with the C++ @@ -71,7 +71,7 @@ Description: Boost C++ Libraries development files required to use the Boost.Multiprecision wrapping of the respective library. -Package: ceph-libboost1.82-tools-dev +Package: ceph-libboost1.85-tools-dev Architecture: any Multi-Arch: foreign Section: libdevel @@ -79,7 +79,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: xsltproc, doxygen, docbook-xml (>= 4.2), - docbook-xsl (>= 1.82.2), + docbook-xsl (>= 1.85.2), default-jdk (>= 1.4), fop (>= 0.94) Description: Boost C++ Libraries development tools @@ -94,43 +94,43 @@ Description: Boost C++ Libraries development tools This package provides the auxiliary tools bjam, Boost.Build, bcp, inspect, boostbook and quickbook. -Package: ceph-libboost1.82-all-dev +Package: ceph-libboost1.85-all-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev, - ceph-libboost1.82-tools-dev, - ceph-libboost-atomic1.82-dev, - ceph-libboost-chrono1.82-dev, - ceph-libboost-container1.82-dev, - ceph-libboost-context1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-coroutine1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-date-time1.82-dev, - ceph-libboost-exception1.82-dev, - ceph-libboost-fiber1.82-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - ceph-libboost-filesystem1.82-dev, - ceph-libboost-graph1.82-dev, - ceph-libboost-graph-parallel1.82-dev, - ceph-libboost-iostreams1.82-dev, - ceph-libboost-locale1.82-dev, - ceph-libboost-log1.82-dev, - ceph-libboost-math1.82-dev, - ceph-libboost-mpi1.82-dev, - ceph-libboost-mpi-python1.82-dev, - ceph-libboost-numpy1.82-dev, - ceph-libboost-program-options1.82-dev, - ceph-libboost-python1.82-dev, - ceph-libboost-random1.82-dev, - ceph-libboost-regex1.82-dev, - ceph-libboost-serialization1.82-dev, - ceph-libboost-stacktrace1.82-dev, - ceph-libboost-system1.82-dev, - ceph-libboost-test1.82-dev, - ceph-libboost-thread1.82-dev, - ceph-libboost-timer1.82-dev, - ceph-libboost-type-erasure1.82-dev, - ceph-libboost-wave1.82-dev, - ceph-libboost-nowide1.82-dev + ceph-libboost1.85-dev, + ceph-libboost1.85-tools-dev, + ceph-libboost-atomic1.85-dev, + ceph-libboost-chrono1.85-dev, + ceph-libboost-container1.85-dev, + ceph-libboost-context1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-coroutine1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-date-time1.85-dev, + ceph-libboost-exception1.85-dev, + ceph-libboost-fiber1.85-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + ceph-libboost-filesystem1.85-dev, + ceph-libboost-graph1.85-dev, + ceph-libboost-graph-parallel1.85-dev, + ceph-libboost-iostreams1.85-dev, + ceph-libboost-locale1.85-dev, + ceph-libboost-log1.85-dev, + ceph-libboost-math1.85-dev, + ceph-libboost-mpi1.85-dev, + ceph-libboost-mpi-python1.85-dev, + ceph-libboost-numpy1.85-dev, + ceph-libboost-program-options1.85-dev, + ceph-libboost-python1.85-dev, + ceph-libboost-random1.85-dev, + ceph-libboost-regex1.85-dev, + ceph-libboost-serialization1.85-dev, + ceph-libboost-stacktrace1.85-dev, + ceph-libboost-system1.85-dev, + ceph-libboost-test1.85-dev, + ceph-libboost-thread1.85-dev, + ceph-libboost-timer1.85-dev, + ceph-libboost-type-erasure1.85-dev, + ceph-libboost-wave1.85-dev, + ceph-libboost-nowide1.85-dev Description: Boost C++ Libraries development files (ALL) The Boost web site provides free, peer-reviewed, portable C++ source libraries. The emphasis is on libraries which work well with the C++ @@ -143,18 +143,18 @@ Description: Boost C++ Libraries development files (ALL) This metapackage provides the complete Boost development environment, including all separately-packaged libraries. -Package: ceph-libboost1.82-doc +Package: ceph-libboost1.85-doc Homepage: http://www.boost.org/libs/ Architecture: all Section: doc Depends: ${misc:Depends}, libjs-mathjax -Suggests: ceph-libboost1.82-dev (>= ${source:Version}) +Suggests: ceph-libboost1.85-dev (>= ${source:Version}) Description: Boost.org libraries documentation placeholder This package originally provided documentation, but has since fallen into disrepair and presently provides no documentation. Please use documentation at www.boost.org. -Package: ceph-libboost-atomic1.82.0 +Package: ceph-libboost-atomic1.85.0 Homepage: http://www.boost.org/libs/atomic/ Architecture: any Multi-Arch: same @@ -178,14 +178,14 @@ Description: atomic data types, operations, and memory ordering constraints intrinsics), and falls back to "emulating" atomic operations through locking. -Package: ceph-libboost-atomic1.82-dev +Package: ceph-libboost-atomic1.85-dev Homepage: http://www.boost.org/libs/atomic/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-atomic1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-atomic1.85.0 (= ${binary:Version}) Description: atomic data types, operations, and memory ordering constraints This package forms part of the Boost C++ Libraries collection. . @@ -204,7 +204,7 @@ Description: atomic data types, operations, and memory ordering constraints intrinsics), and falls back to "emulating" atomic operations through locking. -Package: ceph-libboost-chrono1.82.0 +Package: ceph-libboost-chrono1.85.0 Homepage: http://www.boost.org/libs/chrono/ Architecture: any Multi-Arch: same @@ -247,14 +247,14 @@ Description: C++ representation of time duration, time point, and clocks Lastly, Boost.Chrono includes typeof registration for duration and time_point to permit using emulated auto with C++03 compilers. -Package: ceph-libboost-chrono1.82-dev +Package: ceph-libboost-chrono1.85-dev Homepage: http://www.boost.org/libs/chrono/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-chrono1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-chrono1.85.0 (= ${binary:Version}) Description: C++ representation of time duration, time point, and clocks This package forms part of the Boost C++ Libraries collection. . @@ -293,7 +293,7 @@ Description: C++ representation of time duration, time point, and clocks Lastly, Boost.Chrono includes typeof registration for duration and time_point to permit using emulated auto with C++03 compilers. -Package: ceph-libboost-container1.82.0 +Package: ceph-libboost-container1.85.0 Homepage: http://boost.org/libs/container/ Architecture: any Multi-Arch: same @@ -326,14 +326,14 @@ Description: C++ library that implements several well-known containers * slist: the classic pre-standard singly linked list implementation offering constant-time size(). Note that C++11 forward_list has no size(). -Package: ceph-libboost-container1.82-dev +Package: ceph-libboost-container1.85-dev Homepage: http://boost.org/libs/container/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-container1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-container1.85.0 (= ${binary:Version}) Description: C++ library that implements several well-known containers - dev files This package forms part of the Boost C++ Libraries collection. . @@ -361,7 +361,7 @@ Description: C++ library that implements several well-known containers - dev fil * slist: the classic pre-standard singly linked list implementation offering constant-time size(). Note that C++11 forward_list has no size(). -Package: ceph-libboost-context1.82.0 +Package: ceph-libboost-context1.85.0 Homepage: http://www.boost.org/libs/context/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same @@ -380,15 +380,15 @@ Description: provides a sort of cooperative multitasking on a single thread coroutines, cooperative threads (userland threads) or an equivalent to C# keyword yield in C++. -Package: ceph-libboost-context1.82-dev +Package: ceph-libboost-context1.85-dev Homepage: http://www.boost.org/libs/context/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-thread1.82-dev (= ${binary:Version}), - ceph-libboost-context1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-thread1.85-dev (= ${binary:Version}), + ceph-libboost-context1.85.0 (= ${binary:Version}) Description: provides a sort of cooperative multitasking on a single thread This package forms part of the Boost C++ Libraries collection. . @@ -402,7 +402,7 @@ Description: provides a sort of cooperative multitasking on a single thread coroutines, cooperative threads (userland threads) or an equivalent to C# keyword yield in C++. -Package: ceph-libboost-contract1.82.0 +Package: ceph-libboost-contract1.85.0 Homepage: http://boost.org/libs/contract/ Architecture: any Multi-Arch: same @@ -417,14 +417,14 @@ Description: Contract library for C++ terminate or throw), optional compilation and checking of assertions, etc. -Package: ceph-libboost-contract1.82-dev +Package: ceph-libboost-contract1.85-dev Homepage: http://boost.org/libs/contract/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-contract1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-contract1.85.0 (= ${binary:Version}) Description: Contract library for C++ - dev files This package forms part of the Boost C++ Libraries collection. . @@ -434,7 +434,7 @@ Description: Contract library for C++ - dev files terminate or throw), optional compilation and checking of assertions, etc. -Package: ceph-libboost-coroutine1.82.0 +Package: ceph-libboost-coroutine1.85.0 Homepage: http://www.boost.org/libs/coroutine/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same @@ -458,15 +458,15 @@ Description: provides a sort of cooperative multitasking on a single thread . The implementation uses Boost.Context for context switching. -Package: ceph-libboost-coroutine1.82-dev +Package: ceph-libboost-coroutine1.85-dev Homepage: http://www.boost.org/libs/coroutine/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-context1.82-dev (= ${binary:Version}), - ceph-libboost-coroutine1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-context1.85-dev (= ${binary:Version}), + ceph-libboost-coroutine1.85.0 (= ${binary:Version}) Description: provides a sort of cooperative multitasking on a single thread This package forms part of the Boost C++ Libraries collection. . @@ -485,7 +485,7 @@ Description: provides a sort of cooperative multitasking on a single thread . The implementation uses Boost.Context for context switching. -Package: ceph-libboost-date-time1.82.0 +Package: ceph-libboost-date-time1.85.0 Homepage: http://www.boost.org/libs/date_time/ Architecture: any Multi-Arch: same @@ -497,28 +497,28 @@ Description: set of date-time libraries based on generic programming concepts These libraries are intended to make programming with dates and times almost as simple and natural as programming with strings and integers. -Package: ceph-libboost-date-time1.82-dev +Package: ceph-libboost-date-time1.85-dev Homepage: http://www.boost.org/libs/date_time/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-date-time1.82.0 (= ${binary:Version}), - ceph-libboost-serialization1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-date-time1.85.0 (= ${binary:Version}), + ceph-libboost-serialization1.85-dev (= ${binary:Version}) Description: set of date-time libraries based on generic programming concepts This package forms part of the Boost C++ Libraries collection. . These libraries are intended to make programming with dates and times almost as simple and natural as programming with strings and integers. -Package: ceph-libboost-exception1.82-dev +Package: ceph-libboost-exception1.85-dev Homepage: http://www.boost.org/libs/exception/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}) Description: library to help write exceptions and handlers This package forms part of the Boost C++ Libraries collection. . @@ -526,7 +526,7 @@ Description: library to help write exceptions and handlers class hierarchies and to help write exception handling and error reporting code. -Package: ceph-libboost-fiber1.82.0 +Package: ceph-libboost-fiber1.85.0 Homepage: http://www.boost.org/libs/fiber/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same @@ -555,16 +555,16 @@ Description: cooperatively-scheduled micro-/userland-threads compared to a fiber switch with less than a hundred cycles. A fiber runs on a single thread at any point in time. -Package: ceph-libboost-fiber1.82-dev +Package: ceph-libboost-fiber1.85-dev Homepage: http://www.boost.org/libs/fiber/ Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-context1.82-dev (= ${binary:Version}), - ceph-libboost-filesystem1.82-dev (= ${binary:Version}), - ceph-libboost-fiber1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-context1.85-dev (= ${binary:Version}), + ceph-libboost-filesystem1.85-dev (= ${binary:Version}), + ceph-libboost-fiber1.85.0 (= ${binary:Version}) Description: cooperatively-scheduled micro-/userland-threads This package forms part of the Boost C++ Libraries collection. . @@ -588,7 +588,7 @@ Description: cooperatively-scheduled micro-/userland-threads compared to a fiber switch with less than a hundred cycles. A fiber runs on a single thread at any point in time. -Package: ceph-libboost-filesystem1.82.0 +Package: ceph-libboost-filesystem1.85.0 Homepage: http://boost.org/libs/filesystem/ Architecture: any Multi-Arch: same @@ -601,15 +601,15 @@ Description: filesystem operations (portable paths, iteration over directories, manipulate paths, files, and directories. The goal is to facilitate portable script-like operations from within C++ programs. -Package: ceph-libboost-filesystem1.82-dev +Package: ceph-libboost-filesystem1.85-dev Homepage: http://boost.org/libs/filesystem/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-filesystem1.82.0 (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-filesystem1.85.0 (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}) Description: filesystem operations (portable paths, iteration over directories, etc) in C++ This package forms part of the Boost C++ Libraries collection. . @@ -617,7 +617,7 @@ Description: filesystem operations (portable paths, iteration over directories, manipulate paths, files, and directories. The goal is to facilitate portable script-like operations from within C++ programs. -Package: ceph-libboost-graph1.82.0 +Package: ceph-libboost-graph1.85.0 Homepage: http://www.boost.org/libs/graph/ Architecture: any Multi-Arch: same @@ -633,17 +633,17 @@ Description: generic graph components and algorithms in C++ standardized generic interface for traversing graphs is of utmost importance to encourage reuse of graph algorithms and data structures. -Package: ceph-libboost-graph1.82-dev +Package: ceph-libboost-graph1.85-dev Homepage: http://www.boost.org/libs/graph/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-graph1.82.0 (= ${binary:Version}), - ceph-libboost-regex1.82-dev (= ${binary:Version}), - ceph-libboost-serialization1.82-dev (= ${binary:Version}), - ceph-libboost-test1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-graph1.85.0 (= ${binary:Version}), + ceph-libboost-regex1.85-dev (= ${binary:Version}), + ceph-libboost-serialization1.85-dev (= ${binary:Version}), + ceph-libboost-test1.85-dev (= ${binary:Version}) Description: generic graph components and algorithms in C++ This package forms part of the Boost C++ Libraries collection. . @@ -653,7 +653,7 @@ Description: generic graph components and algorithms in C++ standardized generic interface for traversing graphs is of utmost importance to encourage reuse of graph algorithms and data structures. -Package: ceph-libboost-graph-parallel1.82.0 +Package: ceph-libboost-graph-parallel1.85.0 Homepage: http://www.boost.org/libs/graph_parallel/ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -669,15 +669,15 @@ Description: generic graph components and algorithms in C++ the same interfaces as the (sequential) BGL. Code written using the sequential BGL should be easy to parallelize with the parallel BGL. -Package: ceph-libboost-graph-parallel1.82-dev +Package: ceph-libboost-graph-parallel1.85-dev Homepage: http://www.boost.org/libs/graph_parallel/ Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-graph-parallel1.82.0 (= ${binary:Version}), - ceph-libboost-serialization1.82-dev (= ${binary:Version}), - ceph-libboost-test1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-graph-parallel1.85.0 (= ${binary:Version}), + ceph-libboost-serialization1.85-dev (= ${binary:Version}), + ceph-libboost-test1.85-dev (= ${binary:Version}) Description: generic graph components and algorithms in C++ This package forms part of the Boost C++ Libraries collection. . @@ -688,7 +688,7 @@ Description: generic graph components and algorithms in C++ the same interfaces as the (sequential) BGL. Code written using the sequential BGL should be easy to parallelize with the parallel BGL. -Package: ceph-libboost-iostreams1.82.0 +Package: ceph-libboost-iostreams1.85.0 Homepage: http://www.boost.org/libs/iostreams/ Architecture: any Multi-Arch: same @@ -701,15 +701,15 @@ Description: Boost.Iostreams Library which turn models of these concepts into C++ standard library streams and stream buffers. -Package: ceph-libboost-iostreams1.82-dev +Package: ceph-libboost-iostreams1.85-dev Homepage: http://www.boost.org/libs/iostreams/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-regex1.82-dev (= ${binary:Version}), - ceph-libboost-iostreams1.82.0 (= ${binary:Version}), + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-regex1.85-dev (= ${binary:Version}), + ceph-libboost-iostreams1.85.0 (= ${binary:Version}), libbz2-dev, liblzma-dev, zlib1g-dev Description: Boost.Iostreams Library development files This package forms part of the Boost C++ Libraries collection. @@ -718,7 +718,7 @@ Description: Boost.Iostreams Library development files which turn models of these concepts into C++ standard library streams and stream buffers. -Package: ceph-libboost-locale1.82.0 +Package: ceph-libboost-locale1.85.0 Homepage: http://www.boost.org/libs/locale/ Architecture: any Multi-Arch: same @@ -747,15 +747,15 @@ Description: C++ facilities for localization * Support for char and wchar_t * Experimental support for C++0x char16_t and char32_t strings and streams. -Package: ceph-libboost-locale1.82-dev +Package: ceph-libboost-locale1.85-dev Homepage: http://www.boost.org/libs/math/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-thread1.82-dev (= ${binary:Version}), - ceph-libboost-locale1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-thread1.85-dev (= ${binary:Version}), + ceph-libboost-locale1.85.0 (= ${binary:Version}) Description: C++ facilities for localization This package forms part of the Boost C++ Libraries collection. . @@ -779,7 +779,7 @@ Description: C++ facilities for localization * Support for char and wchar_t * Experimental support for C++0x char16_t and char32_t strings and streams. -Package: ceph-libboost-log1.82.0 +Package: ceph-libboost-log1.85.0 Homepage: http://www.boost.org/libs/log/ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -798,19 +798,19 @@ Description: C++ logging library * Performance. The library should have as little performance impact on the user's application as possible. -Package: ceph-libboost-log1.82-dev +Package: ceph-libboost-log1.85-dev Homepage: http://www.boost.org/libs/log/ Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost-log1.82.0 (= ${binary:Version}), - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-atomic1.82-dev (= ${binary:Version}), - ceph-libboost-date-time1.82-dev (= ${binary:Version}), - ceph-libboost-filesystem1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}), - ceph-libboost-regex1.82-dev (= ${binary:Version}), - ceph-libboost-thread1.82-dev (= ${binary:Version}) + ceph-libboost-log1.85.0 (= ${binary:Version}), + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-atomic1.85-dev (= ${binary:Version}), + ceph-libboost-date-time1.85-dev (= ${binary:Version}), + ceph-libboost-filesystem1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}), + ceph-libboost-regex1.85-dev (= ${binary:Version}), + ceph-libboost-thread1.85-dev (= ${binary:Version}) Description: C++ logging library This package forms part of the Boost C++ Libraries collection. . @@ -826,7 +826,7 @@ Description: C++ logging library * Performance. The library should have as little performance impact on the user's application as possible. -Package: ceph-libboost-math1.82.0 +Package: ceph-libboost-math1.85.0 Homepage: http://www.boost.org/libs/math/ Architecture: any Multi-Arch: same @@ -846,14 +846,14 @@ Description: Boost.Math Library * Implementation Toolkit: Provides many of the tools required to implement mathematical special functions. -Package: ceph-libboost-math1.82-dev +Package: ceph-libboost-math1.85-dev Homepage: http://www.boost.org/libs/math/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-math1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-math1.85.0 (= ${binary:Version}) Description: Boost.Math Library development files This package forms part of the Boost C++ Libraries collection. . @@ -868,7 +868,7 @@ Description: Boost.Math Library development files * Implementation Toolkit: Provides many of the tools required to implement mathematical special functions. -Package: ceph-libboost-mpi1.82.0 +Package: ceph-libboost-mpi1.85.0 Homepage: http://www.boost.org/doc/html/mpi.html Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -882,16 +882,16 @@ Description: C++ interface to the Message Passing Interface (MPI) objects for collective algorithms, and the use of modern C++ library techniques to maintain maximal efficiency. -Package: ceph-libboost-mpi1.82-dev +Package: ceph-libboost-mpi1.85-dev Homepage: http://www.boost.org/doc/html/mpi.html Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-serialization1.82-dev (= ${binary:Version}), - ceph-libboost-mpi1.82.0 (= ${binary:Version}), + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-serialization1.85-dev (= ${binary:Version}), + ceph-libboost-mpi1.85.0 (= ${binary:Version}), mpi-default-dev -Suggests: ceph-libboost-graph1.82-dev +Suggests: ceph-libboost-graph1.85-dev Description: C++ interface to the Message Passing Interface (MPI) This package forms part of the Boost C++ Libraries collection. . @@ -901,7 +901,7 @@ Description: C++ interface to the Message Passing Interface (MPI) objects for collective algorithms, and the use of modern C++ library techniques to maintain maximal efficiency. -Package: ceph-libboost-mpi-python1.82.0 +Package: ceph-libboost-mpi-python1.85.0 Homepage: http://www.boost.org/doc/html/mpi/python.html Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, mpi-default-bin @@ -921,13 +921,13 @@ Description: C++ interface to the Message Passing Interface (MPI), Python Bindin . One of the python interpreter packages is required to use the bindings. -Package: ceph-libboost-mpi-python1.82-dev +Package: ceph-libboost-mpi-python1.85-dev Homepage: http://www.boost.org/doc/html/mpi/python.html Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost-mpi1.82-dev (= ${binary:Version}), - ceph-libboost-mpi-python1.82.0 (= ${binary:Version}) + ceph-libboost-mpi1.85-dev (= ${binary:Version}), + ceph-libboost-mpi-python1.85.0 (= ${binary:Version}) Description: C++ interface to the Message Passing Interface (MPI), Python Bindings This package forms part of the Boost C++ Libraries collection. . @@ -939,7 +939,7 @@ Description: C++ interface to the Message Passing Interface (MPI), Python Bindin . This package provides Python Bindings to the C++ interface. -Package: ceph-libboost-nowide1.82.0 +Package: ceph-libboost-nowide1.85.0 Homepage: http://www.boost.org/libs/python/ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -956,13 +956,13 @@ Description: Standard library functions with UTF-8 API on Windows On POSIX platforms, where UTF-8 is already commonly used, the calls in Nowide just alias to their standard counterparts. -Package: ceph-libboost-nowide1.82-dev +Package: ceph-libboost-nowide1.85-dev Homepage: http://www.boost.org/libs/python/ Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost-nowide1.82.0 (= ${binary:Version}) -Suggests: ceph-libboost1.82-doc + ceph-libboost-nowide1.85.0 (= ${binary:Version}) +Suggests: ceph-libboost1.85-doc Description: Standard library functions with UTF-8 API on Windows development files This package forms part of the Boost C++ Libraries collection. . @@ -973,7 +973,7 @@ Description: Standard library functions with UTF-8 API on Windows development fi On POSIX platforms, where UTF-8 is already commonly used, the calls in Nowide just alias to their standard counterparts. -Package: ceph-libboost-numpy1.82.0 +Package: ceph-libboost-numpy1.85.0 Homepage: http://www.boost.org/libs/python/ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -989,13 +989,13 @@ Description: Boost.Python NumPy extensions One of the python interpreter packages is required to use the created extensions. -Package: ceph-libboost-numpy1.82-dev +Package: ceph-libboost-numpy1.85-dev Homepage: http://www.boost.org/libs/python/ Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost-numpy1.82.0 (= ${binary:Version}) -Suggests: ceph-libboost1.82-doc + ceph-libboost-numpy1.85.0 (= ${binary:Version}) +Suggests: ceph-libboost1.85-doc Description: Boost.Python NumPy extensions development files This package forms part of the Boost C++ Libraries collection. . @@ -1006,7 +1006,7 @@ Description: Boost.Python NumPy extensions development files versions of Python in Debian. Code using this library will need also one of the Python development packages. -Package: ceph-libboost-program-options1.82.0 +Package: ceph-libboost-program-options1.85.0 Homepage: http://www.boost.org/libs/program_options/ Architecture: any Multi-Arch: same @@ -1019,14 +1019,14 @@ Description: program options library for C++ (name, value) pairs from the user, via conventional methods such as command line and config file. -Package: ceph-libboost-program-options1.82-dev +Package: ceph-libboost-program-options1.85-dev Homepage: http://www.boost.org/libs/program_options/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-program-options1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-program-options1.85.0 (= ${binary:Version}) Description: program options library for C++ This package forms part of the Boost C++ Libraries collection. . @@ -1034,7 +1034,7 @@ Description: program options library for C++ (name, value) pairs from the user, via conventional methods such as command line and config file. -Package: ceph-libboost-python1.82.0 +Package: ceph-libboost-python1.85.0 Homepage: http://www.boost.org/libs/python/ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends} @@ -1059,15 +1059,15 @@ Description: Boost.Python Library One of the python interpreter packages is required to use the created extensions. -Package: ceph-libboost-python1.82-dev +Package: ceph-libboost-python1.85-dev Homepage: http://www.boost.org/libs/python/ Architecture: any Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-python1.82.0 (= ${binary:Version}), + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-python1.85.0 (= ${binary:Version}), python3-dev, ${python3:Depends}, -Suggests: ceph-libboost1.82-doc, gccxml +Suggests: ceph-libboost1.85-doc, gccxml Description: Boost.Python Library development files This package forms part of the Boost C++ Libraries collection. . @@ -1088,7 +1088,7 @@ Description: Boost.Python Library development files Conflicts: ceph-libboost-python1.67-dev Replaces: ceph-libboost-python1.67-dev -Package: ceph-libboost-random1.82.0 +Package: ceph-libboost-random1.85.0 Homepage: http://www.boost.org/libs/random/ Architecture: any Multi-Arch: same @@ -1101,15 +1101,15 @@ Description: Boost Random Number Library variety of generators and distributions to produce random numbers having useful properties, such as uniform distribution. -Package: ceph-libboost-random1.82-dev +Package: ceph-libboost-random1.85-dev Homepage: http://www.boost.org/libs/random/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}), - ceph-libboost-random1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}), + ceph-libboost-random1.85.0 (= ${binary:Version}) Description: Boost Random Number Library This package forms part of the Boost C++ Libraries collection. . @@ -1119,7 +1119,7 @@ Description: Boost Random Number Library Conflicts: ceph-libboost-random1.67-dev Replaces: ceph-libboost-random1.67-dev -Package: ceph-libboost-regex1.82.0 +Package: ceph-libboost-regex1.85.0 Homepage: http://www.boost.org/libs/regex/ Architecture: any Multi-Arch: same @@ -1140,14 +1140,14 @@ Description: regular expression library for C++ manner analogous to either sed or perl), something that traditional C libraries can not do. -Package: ceph-libboost-regex1.82-dev +Package: ceph-libboost-regex1.85-dev Homepage: http://www.boost.org/libs/regex/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-regex1.82.0 (= ${binary:Version}), + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-regex1.85.0 (= ${binary:Version}), libicu-dev Description: regular expression library for C++ This package forms part of the Boost C++ Libraries collection. @@ -1165,7 +1165,7 @@ Description: regular expression library for C++ Conflicts: ceph-libboost-regex1.67-dev Replaces: ceph-libboost-regex1.67-dev -Package: ceph-libboost-serialization1.82.0 +Package: ceph-libboost-serialization1.85.0 Homepage: http://www.boost.org/libs/serialization/ Architecture: any Multi-Arch: same @@ -1186,14 +1186,14 @@ Description: serialization library for C++ arbitrary set of C++ data structures to a sequence of bytes. archive: to refer to a specific rendering of this stream of bytes. -Package: ceph-libboost-serialization1.82-dev +Package: ceph-libboost-serialization1.85-dev Homepage: http://www.boost.org/libs/serialization/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-serialization1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-serialization1.85.0 (= ${binary:Version}) Description: serialization library for C++ This package forms part of the Boost C++ Libraries collection, containing the following functionalities: @@ -1211,7 +1211,7 @@ Description: serialization library for C++ Conflicts: ceph-libboost-serialization1.67-dev Replaces: ceph-libboost-serialization1.67-dev -Package: ceph-libboost-stacktrace1.82.0 +Package: ceph-libboost-stacktrace1.85.0 Homepage: http://boost.org/libs/stacktrace/ Architecture: any Multi-Arch: same @@ -1223,21 +1223,21 @@ Description: library to capture and print stack traces Boost.Stacktrace library is a simple C++03 library that provides information about call sequence in a human-readable form. -Package: ceph-libboost-stacktrace1.82-dev +Package: ceph-libboost-stacktrace1.85-dev Homepage: http://boost.org/libs/stacktrace/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-stacktrace1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-stacktrace1.85.0 (= ${binary:Version}) Description: library to capture and print stack traces - development files This package forms part of the Boost C++ Libraries collection. . Boost.Stacktrace library is a simple C++03 library that provides information about call sequence in a human-readable form. -Package: ceph-libboost-system1.82.0 +Package: ceph-libboost-system1.85.0 Homepage: http://www.boost.org/libs/system/ Architecture: any Multi-Arch: same @@ -1254,14 +1254,14 @@ Description: Operating system (e.g. diagnostics support) library user-defined sources, each error_code and error_condition has an associated error_category. -Package: ceph-libboost-system1.82-dev +Package: ceph-libboost-system1.85-dev Homepage: http://www.boost.org/libs/system/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85.0 (= ${binary:Version}) Description: Operating system (e.g. diagnostics support) library This package forms part of the Boost C++ Libraries collection. . @@ -1275,7 +1275,7 @@ Description: Operating system (e.g. diagnostics support) library Conflicts: ceph-libboost-system1.67-dev Replaces: ceph-libboost-system1.67-dev -Package: ceph-libboost-test1.82.0 +Package: ceph-libboost-test1.85.0 Homepage: http://www.boost.org/libs/test/ Architecture: any Multi-Arch: same @@ -1289,14 +1289,14 @@ Description: components for writing and executing test suites * Facilities to monitor program execution and produce error reports. * Unit test framework to simplify writing test cases. -Package: ceph-libboost-test1.82-dev +Package: ceph-libboost-test1.85-dev Homepage: http://www.boost.org/libs/test/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-test1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-test1.85.0 (= ${binary:Version}) Description: components for writing and executing test suites This package forms part of the Boost C++ Libraries collection. The library contains several components. @@ -1307,7 +1307,7 @@ Description: components for writing and executing test suites Conflicts: ceph-libboost-test1.67-dev Replaces: ceph-libboost-test1.67-dev -Package: ceph-libboost-thread1.82.0 +Package: ceph-libboost-thread1.85.0 Homepage: http://www.boost.org/libs/thread/ Architecture: any Multi-Arch: same @@ -1321,18 +1321,18 @@ Description: portable C++ multi-threading own machine state including program instruction counter and registers. -Package: ceph-libboost-thread1.82-dev +Package: ceph-libboost-thread1.85-dev Homepage: http://www.boost.org/libs/thread/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-atomic1.82-dev (= ${binary:Version}), - ceph-libboost-chrono1.82-dev (= ${binary:Version}), - ceph-libboost-date-time1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}), - ceph-libboost-thread1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-atomic1.85-dev (= ${binary:Version}), + ceph-libboost-chrono1.85-dev (= ${binary:Version}), + ceph-libboost-date-time1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}), + ceph-libboost-thread1.85.0 (= ${binary:Version}) Description: portable C++ multi-threading This package forms part of the Boost C++ Libraries collection. . @@ -1343,7 +1343,7 @@ Description: portable C++ multi-threading Conflicts: ceph-libboost-thread1.67-dev Replaces: ceph-libboost-thread1.67-dev -Package: ceph-libboost-timer1.82.0 +Package: ceph-libboost-timer1.85.0 Homepage: http://www.boost.org/libs/timer/ Architecture: any Multi-Arch: same @@ -1361,15 +1361,15 @@ Description: C++ wall clock and CPU process timers cpu_timer that automatically reports the elapsed times when an auto_cpu_timer object is destroyed. -Package: ceph-libboost-timer1.82-dev +Package: ceph-libboost-timer1.85-dev Homepage: http://www.boost.org/libs/timer/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-chrono1.82-dev (= ${binary:Version}), - ceph-libboost-timer1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-chrono1.85-dev (= ${binary:Version}), + ceph-libboost-timer1.85.0 (= ${binary:Version}) Description: C++ wall clock and CPU process timers This package forms part of the Boost C++ Libraries collection. . @@ -1384,7 +1384,7 @@ Description: C++ wall clock and CPU process timers Conflicts: ceph-libboost-timer1.67-dev Replaces: ceph-libboost-timer1.67-dev -Package: ceph-libboost-type-erasure1.82.0 +Package: ceph-libboost-type-erasure1.85.0 Homepage: http://www.boost.org/doc/libs/1_60_0/doc/html/boost_typeerasure.html Architecture: any Multi-Arch: same @@ -1398,16 +1398,16 @@ Description: C++ runtime polymorphism based on concepts library combines the superior abstraction capabilities of templates, with the runtime flexibility of virtual functions. -Package: ceph-libboost-type-erasure1.82-dev +Package: ceph-libboost-type-erasure1.85-dev Homepage: http://www.boost.org/doc/libs/1_60_0/doc/html/boost_typeerasure.html Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}), - ceph-libboost-thread1.82-dev (= ${binary:Version}), - ceph-libboost-type-erasure1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}), + ceph-libboost-thread1.85-dev (= ${binary:Version}), + ceph-libboost-type-erasure1.85.0 (= ${binary:Version}) Description: C++ runtime polymorphism based on concepts This package forms part of the Boost C++ Libraries collection. . @@ -1416,7 +1416,7 @@ Description: C++ runtime polymorphism based on concepts library combines the superior abstraction capabilities of templates, with the runtime flexibility of virtual functions. -Package: ceph-libboost-wave1.82.0 +Package: ceph-libboost-wave1.85.0 Homepage: http://www.boost.org/libs/wave/ Architecture: any Multi-Arch: same @@ -1430,16 +1430,16 @@ Description: C99/C++ preprocessor library packed behind a simple to use interface, which integrates well with the well known idioms of the Standard Template Library (STL). -Package: ceph-libboost-wave1.82-dev +Package: ceph-libboost-wave1.85-dev Homepage: http://www.boost.org/libs/wave/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-serialization1.82-dev (= ${binary:Version}), - ceph-libboost-wave1.82.0 (= ${binary:Version}), - ceph-libboost-filesystem1.82-dev (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-serialization1.85-dev (= ${binary:Version}), + ceph-libboost-wave1.85.0 (= ${binary:Version}), + ceph-libboost-filesystem1.85-dev (= ${binary:Version}) Description: C99/C++ preprocessor library This package forms part of the Boost C++ Libraries collection. . @@ -1448,7 +1448,7 @@ Description: C99/C++ preprocessor library packed behind a simple to use interface, which integrates well with the well known idioms of the Standard Template Library (STL). -Package: ceph-libboost-json1.82.0 +Package: ceph-libboost-json1.85.0 Homepage: https://www.boost.org/doc/libs/release/libs/json/ Architecture: any Multi-Arch: same @@ -1464,15 +1464,15 @@ Description: C++ containers and algorithms that implement JSON Whatever JSON output you produce with this library will be readable by most common JSON implementations in any language. -Package: ceph-libboost-json1.82-dev +Package: ceph-libboost-json1.85-dev Homepage: https://www.boost.org/doc/libs/release/libs/json/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, ceph-libboost1.21-dev (= ${binary:Version}), - ceph-libboost-container1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}) + ceph-libboost-container1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}) Description: C++ containers and algorithms that implement JSON This library focuses on a common and popular use-case: parsing and serializing to and from a container called value which holds @@ -1483,7 +1483,7 @@ Description: C++ containers and algorithms that implement JSON Whatever JSON output you produce with this library will be readable by most common JSON implementations in any language. -Package: ceph-libboost-url1.82.0 +Package: ceph-libboost-url1.85.0 Homepage: https://www.boost.org/doc/libs/release/libs/url/ Architecture: any Multi-Arch: same @@ -1501,15 +1501,15 @@ Description: C++ library that implements "URL" functionality to validate, parse, examine, and modify urls, and apply normalization or resolution algorithms. -Package: ceph-libboost-url1.82-dev +Package: ceph-libboost-url1.85-dev Homepage: https://www.boost.org/doc/libs/release/libs/url/ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - ceph-libboost1.82-dev (= ${binary:Version}), - ceph-libboost-system1.82-dev (= ${binary:Version}), - ceph-libboost-url1.82.0 (= ${binary:Version}) + ceph-libboost1.85-dev (= ${binary:Version}), + ceph-libboost-system1.85-dev (= ${binary:Version}), + ceph-libboost-url1.85.0 (= ${binary:Version}) Description: C++ library that implements "URL" C++ library which provides containers and algorithms which model a "URL," the Uniform Resource Identifier (URI) specification (henceforth referred to From 024aa398e14ead5b794b7ddaae5db02edb8bdb97 Mon Sep 17 00:00:00 2001 From: Adam Emerson Date: Mon, 20 May 2024 10:40:59 -0400 Subject: [PATCH 5/8] Fix use of removed functions in bcp Signed-off-by: Adam Emerson --- ...x-removed-boost-filesystem-functions.patch | 167 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 168 insertions(+) create mode 100644 debian/patches/0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch diff --git a/debian/patches/0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch b/debian/patches/0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch new file mode 100644 index 000000000..76b16baab --- /dev/null +++ b/debian/patches/0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch @@ -0,0 +1,167 @@ +From a7a6cf7784a3d2f85c6108395a8d8f3631e68f5e Mon Sep 17 00:00:00 2001 +Message-ID: +From: Adam Emerson +Date: Mon, 20 May 2024 10:13:43 -0400 +Subject: [PATCH] tools/bcp: Fix removed boost::filesystem functions + +--- + tools/bcp/add_dependent_lib.cpp | 5 +++-- + tools/bcp/add_path.cpp | 30 +++++++++++++++--------------- + tools/bcp/copy_path.cpp | 6 +++--- + tools/bcp/file_types.cpp | 2 +- + 4 files changed, 22 insertions(+), 21 deletions(-) + +diff --git a/tools/bcp/add_dependent_lib.cpp b/tools/bcp/add_dependent_lib.cpp +index 48529142f..521b70d09 100644 +--- a/tools/bcp/add_dependent_lib.cpp ++++ b/tools/bcp/add_dependent_lib.cpp +@@ -15,6 +15,7 @@ + #include "bcp_imp.hpp" + #include "fileview.hpp" + #include ++#include + #include + #include + #include +@@ -43,12 +44,12 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st + // + // Don't add files created by build system: + // +- if((p.leaf() == "bin") || (p.leaf() == "bin-stage")) ++ if((p.filename() == "bin") || (p.filename() == "bin-stage")) + return; + // + // Don't add version control directories: + // +- if((p.leaf() == "CVS") || (p.leaf() == ".svn")) ++ if((p.filename() == "CVS") || (p.filename() == ".svn")) + return; + // + // don't add directories not under version control: +diff --git a/tools/bcp/add_path.cpp b/tools/bcp/add_path.cpp +index 8a1fee33d..747bb8c78 100644 +--- a/tools/bcp/add_path.cpp ++++ b/tools/bcp/add_path.cpp +@@ -15,6 +15,7 @@ + #include "bcp_imp.hpp" + #include "fileview.hpp" + #include ++#include + #include + #include + #include +@@ -24,8 +25,7 @@ void bcp_implementation::add_path(const fs::path& p) + { + if (m_excluded.find(p) != m_excluded.end()) + return; +- fs::path normalized_path = p; +- normalized_path.normalize(); ++ fs::path normalized_path = p.lexically_normal(); + if(fs::exists(m_boost_path / normalized_path)) + { + if(fs::is_directory(m_boost_path / normalized_path)) +@@ -45,12 +45,12 @@ void bcp_implementation::add_directory(const fs::path& p) + // + // Don't add files created by build system: + // +- if((p.leaf() == "bin") || (p.leaf() == "bin-stage")) ++ if((p.filename() == "bin") || (p.filename() == "bin-stage")) + return; + // + // Don't add version control directories: + // +- if((p.leaf() == "CVS") || (p.leaf() == ".svn")) ++ if((p.filename() == "CVS") || (p.filename() == ".svn")) + return; + // + // don't add directories not under version control: +@@ -180,7 +180,7 @@ void bcp_implementation::add_file(const fs::path& p) + { + // only concatonate if it's a relative path + // rather than a URL: +- fs::path dep(p.branch_path() / s); ++ fs::path dep(p.parent_path() / s); + if(!m_dependencies.count(dep)) + { + m_dependencies[dep] = p; // set up dependency tree +@@ -355,13 +355,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile) + continue; + } + include_file = i->str(); +- fs::path test_file(m_boost_path / p.branch_path() / include_file); +- if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost")) ++ fs::path test_file(m_boost_path / p.parent_path() / include_file); ++ if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost")) + { +- if(!m_dependencies.count(p.branch_path() / include_file)) ++ if(!m_dependencies.count(p.parent_path() / include_file)) + { +- m_dependencies[p.branch_path() / include_file] = p; +- add_pending_path(p.branch_path() / include_file); ++ m_dependencies[p.parent_path() / include_file] = p; ++ add_pending_path(p.parent_path() / include_file); + } + } + else if(fs::exists(m_boost_path / include_file)) +@@ -405,13 +405,13 @@ void bcp_implementation::add_file_dependencies(const fs::path& p, bool scanfile) + ++i; + continue; + } +- fs::path test_file(m_boost_path / p.branch_path() / include_file); +- if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost")) ++ fs::path test_file(m_boost_path / p.parent_path() / include_file); ++ if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.parent_path().string() != "boost")) + { +- if(!m_dependencies.count(p.branch_path() / include_file)) ++ if(!m_dependencies.count(p.parent_path() / include_file)) + { +- m_dependencies[p.branch_path() / include_file] = p; +- add_pending_path(p.branch_path() / include_file); ++ m_dependencies[p.parent_path() / include_file] = p; ++ add_pending_path(p.parent_path() / include_file); + } + } + else if(fs::exists(m_boost_path / include_file)) +diff --git a/tools/bcp/copy_path.cpp b/tools/bcp/copy_path.cpp +index 4143c79e6..bed68d92f 100644 +--- a/tools/bcp/copy_path.cpp ++++ b/tools/bcp/copy_path.cpp +@@ -56,11 +56,11 @@ void bcp_implementation::copy_path(const fs::path& p) + // + // create the path to the new file if it doesn't already exist: + // +- create_path(p.branch_path()); ++ create_path(p.parent_path()); + // + // do text based copy if requested: + // +- if((p.leaf() == "Jamroot") && m_namespace_name.size()) ++ if((p.filename() == "Jamroot") && m_namespace_name.size()) + { + static std::vector v1, v2; + v1.clear(); +@@ -240,7 +240,7 @@ void bcp_implementation::create_path(const fs::path& p) + if(!fs::exists(m_dest_path / p)) + { + // recurse then create the path: +- create_path(p.branch_path()); ++ create_path(p.parent_path()); + fs::create_directory(m_dest_path / p); + } + } +diff --git a/tools/bcp/file_types.cpp b/tools/bcp/file_types.cpp +index 297d304cf..69f60276a 100644 +--- a/tools/bcp/file_types.cpp ++++ b/tools/bcp/file_types.cpp +@@ -52,7 +52,7 @@ bool bcp_implementation::is_binary_file(const fs::path& p) + "|" + "(Jamfile|makefile|configure)", + boost::regex::perl | boost::regex::icase); +- return !boost::regex_match(p.leaf().generic_string(), e); ++ return !boost::regex_match(p.filename().generic_string(), e); + + } + +-- +2.45.1 + diff --git a/debian/patches/series b/debian/patches/series index 58174bca6..feadb0dbd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ fix-mpi-python37.patch fix_extension.patch 0001-Remove-timestamps-and-dates-from-documentation.patch 40.patch +0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch From 6983faa3816f6757c37c91408418c56158598019 Mon Sep 17 00:00:00 2001 From: Adam Emerson Date: Mon, 20 May 2024 10:41:33 -0400 Subject: [PATCH 6/8] Remove no longer needed Phoenix fix Signed-off-by: Adam Emerson --- debian/patches/116.patch | 24 ------------------------ debian/patches/series | 1 - 2 files changed, 25 deletions(-) delete mode 100644 debian/patches/116.patch diff --git a/debian/patches/116.patch b/debian/patches/116.patch deleted file mode 100644 index 3b04155f9..000000000 --- a/debian/patches/116.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 50973dc10ea16931245ea61a00b2ce9041acc5ba Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Wed, 4 Jan 2023 17:33:31 +0100 -Subject: [PATCH] Avoid boost::phoenix::placeholders::uarg1..10 ODR violations - -Those variables, defined in an include file, had external linkage, causing ODR -violations. Make them const to implicitly give them internal linkage. ---- - include/boost/phoenix/stl/tuple.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/phoenix/include/boost/phoenix/stl/tuple.hpp b/libs/phoenix/include/boost/phoenix/stl/tuple.hpp -index a83014ac..7f61a402 100644 ---- a/libs/phoenix/include/boost/phoenix/stl/tuple.hpp -+++ b/libs/phoenix/include/boost/phoenix/stl/tuple.hpp -@@ -110,7 +110,7 @@ namespace boost { namespace phoenix { - namespace placeholders { - #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT) - #define BOOST_PP_LOCAL_MACRO(N) \ -- auto uarg##N = \ -+ auto const uarg##N = \ - boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1); - #include BOOST_PP_LOCAL_ITERATE() - } diff --git a/debian/patches/series b/debian/patches/series index feadb0dbd..364c156e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 15.patch 20_remove_privacy_breach.patch -116.patch fix-mpi-python37.patch fix_extension.patch 0001-Remove-timestamps-and-dates-from-documentation.patch From 55f34507d322314fb0294629b7c0bb406de07aec Mon Sep 17 00:00:00 2001 From: Adam Emerson Date: Mon, 20 May 2024 11:15:31 -0400 Subject: [PATCH 7/8] Remove patches that no longer apply Signed-off-by: Adam Emerson --- ...estamps-and-dates-from-documentation.patch | 89 ------------------- debian/patches/15.patch | 25 ------ debian/patches/series | 2 - 3 files changed, 116 deletions(-) delete mode 100644 debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch delete mode 100644 debian/patches/15.patch diff --git a/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch b/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch deleted file mode 100644 index e38562c0d..000000000 --- a/debian/patches/0001-Remove-timestamps-and-dates-from-documentation.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 7c9c189ea32470cd683939c11fabf78f0b2f3f17 Mon Sep 17 00:00:00 2001 -From: Vagrant Cascadian -Date: Sat, 22 Apr 2023 19:53:22 -0700 -Subject: [PATCH] Remove timestamps and dates from documentation. - -https://reproducible-builds.org/docs/timestamps/ ---- - libs/circular_buffer/doc/circular_buffer.qbk | 2 -- - libs/units/doc/units.qbk | 1 - - tools/boostbook/xsl/html-base.xsl | 22 -------------------- - tools/quickbook/doc/block.qbk | 4 ++-- - 4 files changed, 2 insertions(+), 27 deletions(-) - -diff --git a/libs/circular_buffer/doc/circular_buffer.qbk b/libs/circular_buffer/doc/circular_buffer.qbk -index a7177e4c..217c42b6 100644 ---- a/libs/circular_buffer/doc/circular_buffer.qbk -+++ b/libs/circular_buffer/doc/circular_buffer.qbk -@@ -596,8 +596,6 @@ Paul A. Bristow refactored the documentation in 2013 to use the full power of Qu - - [section:version_id Documentation Version Info] - --Last edit to Quickbook file __FILENAME__ was at __TIME__ on __DATE__. -- - [tip This should appear on the pdf version - (but may be redundant on a html version where the last edit date is on the first (home) page).] - -diff --git a/libs/units/doc/units.qbk b/libs/units/doc/units.qbk -index 0c7345fc..b160ef21 100644 ---- a/libs/units/doc/units.qbk -+++ b/libs/units/doc/units.qbk -@@ -1309,7 +1309,6 @@ the design and implementation of this library. - - __boostroot - --Last edit to Quickbook file __FILENAME__ was at __TIME__ on __DATE__. - - [tip This should appear on the pdf version (but may be redundant on html).] - [/ Useful on pdf version. See also Last revised timestamp on first page of html version.] -diff --git a/tools/boostbook/xsl/html-base.xsl b/tools/boostbook/xsl/html-base.xsl -index a1031710..cfba8727 100644 ---- a/tools/boostbook/xsl/html-base.xsl -+++ b/tools/boostbook/xsl/html-base.xsl -@@ -234,28 +234,6 @@ set toc,title - - -- --

-- -- Last revised: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

-- - - - -diff --git a/tools/quickbook/doc/block.qbk b/tools/quickbook/doc/block.qbk -index dbfdb8d2..bcf3f406 100644 ---- a/tools/quickbook/doc/block.qbk -+++ b/tools/quickbook/doc/block.qbk -@@ -602,8 +602,8 @@ Quickbook has some predefined macros that you can already use. - - [table Predefined Macros - [[Macro] [Meaning] [Example]] -- [[[^\__DATE__]] [Today's date] [__DATE__]] -- [[[^\__TIME__]] [The current time] [__TIME__]] -+ [[[^\__DATE__]] [Today's date] [2022-04-20]] -+ [[[^\__TIME__]] [The current time] [01:42:48 PM]] - [[[^\__FILENAME__]][Quickbook source filename] [__FILENAME__]] - ] - --- -2.39.2 - diff --git a/debian/patches/15.patch b/debian/patches/15.patch deleted file mode 100644 index 9bf56e5e2..000000000 --- a/debian/patches/15.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d87190a3b1ea23d6d684b21751e6f65927e6083f Mon Sep 17 00:00:00 2001 -From: Evan Lenz -Date: Tue, 23 Aug 2022 10:37:15 -0700 -Subject: [PATCH] Remove template rule conflict for text nodesa -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016321 - - -fix https://github.com/boostorg/boostbook/issues/14 ---- - xsl/annotation.xsl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: boost1.80-1.80.0/tools/boostbook/xsl/annotation.xsl -=================================================================== ---- boost1.80-1.80.0.orig/tools/boostbook/xsl/annotation.xsl -+++ boost1.80-1.80.0/tools/boostbook/xsl/annotation.xsl -@@ -426,7 +426,7 @@ - - - -- -+ - - - diff --git a/debian/patches/series b/debian/patches/series index 364c156e8..20b537498 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,5 @@ -15.patch 20_remove_privacy_breach.patch fix-mpi-python37.patch fix_extension.patch -0001-Remove-timestamps-and-dates-from-documentation.patch 40.patch 0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch From dc0b93f4e007ecf520a83c818bee0b1f7d9fb8b1 Mon Sep 17 00:00:00 2001 From: Adam Emerson Date: Tue, 21 May 2024 02:48:23 -0400 Subject: [PATCH 8/8] Turn off stacktrace.from_exception on arm64 This can cause a memory leak when used against libcxx on Arm64 and Boost errors out when compiling it. Signed-off-by: Adam Emerson --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 9008c698e..2207f9b6b 100755 --- a/debian/rules +++ b/debian/rules @@ -151,7 +151,7 @@ BUILD_CONTEXT = no endif ifeq ($(DEB_BUILD_ARCH), arm64) -JAM_OPT += pch=off +JAM_OPT += pch=off boost.stacktrace.from_exception=off endif # if we're building with context, coroutine, fiber, add the libraries to the list