Build 1.85

debian/changelog

@@ -1,3 +1,21 @@
+boost1.85 (1.85.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream
+
+ -- Adam Emerson <[email protected]>  Thu, 11 May 2023 11:49:06 -0400
+
+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 <[email protected]>  Mon, 19 Jun 2023 15:32:59 +0200
+
 boost1.82 (1.82.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

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: <a7a6cf7784a3d2f85c6108395a8d8f3631e68f5e.1716215730.git.aemerson@redhat.com>
+From: Adam Emerson <[email protected]>
+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 <boost/regex.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <iostream>
+@@ -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 <boost/regex.hpp>
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <iostream>
+@@ -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<char> 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
+

debian/patches/40.patch

@@ -0,0 +1,43 @@
+Description: Fix FTBFS during doc generation.
+Author: Anton Gladky <[email protected]>
+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 @@
+   <xsl:template name="highlight-text-ident-length">
+     <xsl:param name="text"/>
+     <xsl:param name="pos" select="1"/>
+-    <xsl:choose>
+-      <xsl:when test="string-length($text) + 1 = $pos">
+-        <xsl:value-of select="$pos - 1"/>
+-      </xsl:when>
+-      <xsl:when test="contains($id-chars, substring($text, $pos, 1))">
+-        <xsl:call-template name ="highlight-text-ident-length">
+-          <xsl:with-param name="text" select="$text"/>
+-          <xsl:with-param name="pos" select="$pos + 1"/>
+-        </xsl:call-template>
+-      </xsl:when>
+-      <xsl:otherwise>
+-        <xsl:value-of select="$pos - 1"/>
+-      </xsl:otherwise>
+-    </xsl:choose>
+   </xsl:template>
+
+   <xsl:template name="highlight-text-number-length">

debian/patches/series

@@ -1,5 +1,5 @@
-15.patch
 20_remove_privacy_breach.patch
-116.patch
 fix-mpi-python37.patch
-fix_extension.patch
+fix_extension.patch
+40.patch
+0001-tools-bcp-Fix-removed-boost-filesystem-functions.patch

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

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})

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})

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})

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})

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})

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})

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})

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})
+TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES})

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})
+TARGET_LINK_LIBRARIES(demo2 ${Boost_LIBRARIES})

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})