Skip to content

Commit

Permalink
[Boost] Update to 1.85 (#38523)
Browse files Browse the repository at this point in the history 
closes #38201
supersedes #38237

Lets see if I forgot to cherry pick something.

---------

Co-authored-by: Yury Bura <yurybura@gmail.com>
  • Loading branch information
@Neumann-A @yurybura
Neumann-A and yurybura committed May 10, 2024
1 parent 090344c commit cbf4a66
Show file tree
Hide file tree
Showing 497 changed files with 3,715 additions and 2,710 deletions.
30 changes: 30 additions & 0 deletions ports/autodock-vina/fix-compatibility-with-boost-1.85.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
src/lib/vina.h | 2 +-
src/split/split.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/vina.h b/src/lib/vina.h
index a44cf9b..daed498 100644
--- a/src/lib/vina.h
+++ b/src/lib/vina.h
@@ -35,7 +35,7 @@
#include <boost/program_options.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/exception.hpp>
-#include <boost/filesystem/convenience.hpp> // filesystem::basename
+#include <boost/filesystem/operations.hpp> // filesystem::basename
#include <boost/thread/thread.hpp> // hardware_concurrency // FIXME rm ?
#include <boost/algorithm/string.hpp>
//#include <openbabel/mol.h>
diff --git a/src/split/split.cpp b/src/split/split.cpp
index b42e78a..daee547 100644
--- a/src/split/split.cpp
+++ b/src/split/split.cpp
@@ -30,7 +30,7 @@
#include <boost/program_options.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/exception.hpp>
-#include <boost/filesystem/convenience.hpp> // filesystem::basename
+#include <boost/filesystem/operations.hpp> // filesystem::basename

#include "file.h"
#include "parse_error.h"
4 changes: 3 additions & 1 deletion ports/autodock-vina/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ vcpkg_from_github(
REF v${VERSION}
SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
HEAD_REF develop
PATCHES fix-compatibility-with-boost-1.83.patch
PATCHES
fix-compatibility-with-boost-1.83.patch
fix-compatibility-with-boost-1.85.patch
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
Expand Down
2 changes: 1 addition & 1 deletion ports/autodock-vina/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "autodock-vina",
"version-semver": "1.2.5",
"port-version": 1,
"port-version": 2,
"description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
"homepage": "http://vina.scripps.edu/",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion ports/boost-accumulators/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/accumulators
REF boost-${VERSION}
SHA512 169d7454bb961ac801db88e0437879ec5aabc8875d5526cb306e56cfb5f4b6dd2e95e5f8815b4c30aeb44ffd2db9c70e12e19b79ccad0f2379775220e941f5b7
SHA512 7eb409a8e62de8d525c56ef247542fe9bbb61738cc463fcf0023cbb56ab153253898b3decd109f132851facd35f5b76f0ad4a2f4441fd4fd9ba840ff4c805ffd
HEAD_REF master
)

Expand Down
47 changes: 23 additions & 24 deletions ports/boost-accumulators/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,98 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-accumulators",
"version": "1.84.0",
"port-version": 1,
"version": "1.85.0",
"description": "Boost accumulators module",
"homepage": "https://github.com/boostorg/accumulators",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-array",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-circular-buffer",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-core",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-fusion",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-mpl",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-numeric-conversion",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-parameter",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-preprocessor",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-range",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-serialization",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-static-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-tuple",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-type-traits",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-typeof",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-ublas",
"version>=": "1.84.0"
"version>=": "1.85.0"
}
]
}
2 changes: 1 addition & 1 deletion ports/boost-algorithm/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/algorithm
REF boost-${VERSION}
SHA512 d7614816293080982df97725e4994aadf62c0215336b74297d9143cae27d253e666256e0a0759bb2b563396d6cc205fbb6bcc54db383add612efdff2168b4b53
SHA512 6cf6b95e688a7841b699a7f0fbfa1ff10025298e05b3333c5bc2a412a176545955d3089bb90eb66b313241bcd56e941b27e858045633bcb10705d9068486bed8
HEAD_REF master
)

Expand Down
41 changes: 20 additions & 21 deletions ports/boost-algorithm/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,86 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-algorithm",
"version": "1.84.0",
"port-version": 1,
"version": "1.85.0",
"description": "Boost algorithm module",
"homepage": "https://github.com/boostorg/algorithm",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-array",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-bind",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-concept-check",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-core",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-exception",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-function",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-iterator",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-mpl",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-range",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-regex",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-static-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-tuple",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-type-traits",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-unordered",
"version>=": "1.84.0"
"version>=": "1.85.0"
}
]
}
2 changes: 1 addition & 1 deletion ports/boost-align/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/align
REF boost-${VERSION}
SHA512 53774a2411f856112845469ce89a4b34bee6e7d13796764d1e6d397526747e4a7c798abd755f2eed5a48fe3c792e7bc8e0cc2418e8c6ee7f992fa98d73fc86c6
SHA512 8c284d39a5565c73bd866974d5b7392e1a4a59380b8ba3e5693b29cf8de34db67fcfc644dc0d204dc0ba0b3c43022b0607c84f03f413ce34f6a73cef5d8fc021
HEAD_REF master
)

Expand Down
15 changes: 7 additions & 8 deletions ports/boost-align/vcpkg.json
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-align",
"version": "1.84.0",
"port-version": 1,
"version": "1.85.0",
"description": "Boost align module",
"homepage": "https://github.com/boostorg/align",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-cmake",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-config",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-core",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-headers",
"version>=": "1.84.0"
"version>=": "1.85.0"
},
{
"name": "boost-static-assert",
"version>=": "1.84.0"
"version>=": "1.85.0"
}
]
}
2 changes: 1 addition & 1 deletion ports/boost-any/portfile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/any
REF boost-${VERSION}
SHA512 0adfb10eeeffe9c479d2dfa2663828530b00191bec64c8b8d3adeff20220b0789078981bf4a3bf7e0808a44f61bafc9f3f1f488a316954008835a9205042f356
SHA512 d4a5e2bc40b3997eccd070827b3bfdf96221667aa95ff62e702235d7301d7712d6a13a2b368eb877a2aa4f3882a638a81736040998d23d34424849e61b961947
HEAD_REF master
)

Expand Down
Loading

0 comments on commit cbf4a66

Please sign in to comment.