Skip to content

Commit cbf4a66

Browse files
Neumann-Ayurybura
Neumann-A
and
yurybura
authored
[Boost] Update to 1.85 (#38523)
closes #38201 supersedes #38237 Lets see if I forgot to cherry pick something. --------- Co-authored-by: Yury Bura <yurybura@gmail.com>
1 parent 090344c commit cbf4a66

497 files changed

Lines changed: 3715 additions & 2710 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ports/autodock-vina/fix-compatibility-with-boost-1.85.patch‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
src/lib/vina.h | 2 +-
2+
src/split/split.cpp | 2 +-
3+
2 files changed, 2 insertions(+), 2 deletions(-)
4+
5+
diff --git a/src/lib/vina.h b/src/lib/vina.h
6+
index a44cf9b..daed498 100644
7+
--- a/src/lib/vina.h
8+
+++ b/src/lib/vina.h
9+
@@ -35,7 +35,7 @@
10+
#include <boost/program_options.hpp>
11+
#include <boost/filesystem/fstream.hpp>
12+
#include <boost/filesystem/exception.hpp>
13+
-#include <boost/filesystem/convenience.hpp> // filesystem::basename
14+
+#include <boost/filesystem/operations.hpp> // filesystem::basename
15+
#include <boost/thread/thread.hpp> // hardware_concurrency // FIXME rm ?
16+
#include <boost/algorithm/string.hpp>
17+
//#include <openbabel/mol.h>
18+
diff --git a/src/split/split.cpp b/src/split/split.cpp
19+
index b42e78a..daee547 100644
20+
--- a/src/split/split.cpp
21+
+++ b/src/split/split.cpp
22+
@@ -30,7 +30,7 @@
23+
#include <boost/program_options.hpp>
24+
#include <boost/filesystem/fstream.hpp>
25+
#include <boost/filesystem/exception.hpp>
26+
-#include <boost/filesystem/convenience.hpp> // filesystem::basename
27+
+#include <boost/filesystem/operations.hpp> // filesystem::basename
28+
29+
#include "file.h"
30+
#include "parse_error.h"

‎ports/autodock-vina/portfile.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ vcpkg_from_github(
66
REF v${VERSION}
77
SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
88
HEAD_REF develop
9-
PATCHES fix-compatibility-with-boost-1.83.patch
9+
PATCHES
10+
fix-compatibility-with-boost-1.83.patch
11+
fix-compatibility-with-boost-1.85.patch
1012
)
1113

1214
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

‎ports/autodock-vina/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "autodock-vina",
33
"version-semver": "1.2.5",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
66
"homepage": "http://vina.scripps.edu/",
77
"dependencies": [

‎ports/boost-accumulators/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/accumulators
66
REF boost-${VERSION}
7-
SHA512 169d7454bb961ac801db88e0437879ec5aabc8875d5526cb306e56cfb5f4b6dd2e95e5f8815b4c30aeb44ffd2db9c70e12e19b79ccad0f2379775220e941f5b7
7+
SHA512 7eb409a8e62de8d525c56ef247542fe9bbb61738cc463fcf0023cbb56ab153253898b3decd109f132851facd35f5b76f0ad4a2f4441fd4fd9ba840ff4c805ffd
88
HEAD_REF master
99
)
1010

‎ports/boost-accumulators/vcpkg.json‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,98 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-accumulators",
4-
"version": "1.84.0",
5-
"port-version": 1,
4+
"version": "1.85.0",
65
"description": "Boost accumulators module",
76
"homepage": "https://github.com/boostorg/accumulators",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-array",
12-
"version>=": "1.84.0"
11+
"version>=": "1.85.0"
1312
},
1413
{
1514
"name": "boost-assert",
16-
"version>=": "1.84.0"
15+
"version>=": "1.85.0"
1716
},
1817
{
1918
"name": "boost-circular-buffer",
20-
"version>=": "1.84.0"
19+
"version>=": "1.85.0"
2120
},
2221
{
2322
"name": "boost-cmake",
24-
"version>=": "1.84.0"
23+
"version>=": "1.85.0"
2524
},
2625
{
2726
"name": "boost-concept-check",
28-
"version>=": "1.84.0"
27+
"version>=": "1.85.0"
2928
},
3029
{
3130
"name": "boost-config",
32-
"version>=": "1.84.0"
31+
"version>=": "1.85.0"
3332
},
3433
{
3534
"name": "boost-core",
36-
"version>=": "1.84.0"
35+
"version>=": "1.85.0"
3736
},
3837
{
3938
"name": "boost-fusion",
40-
"version>=": "1.84.0"
39+
"version>=": "1.85.0"
4140
},
4241
{
4342
"name": "boost-headers",
44-
"version>=": "1.84.0"
43+
"version>=": "1.85.0"
4544
},
4645
{
4746
"name": "boost-iterator",
48-
"version>=": "1.84.0"
47+
"version>=": "1.85.0"
4948
},
5049
{
5150
"name": "boost-mpl",
52-
"version>=": "1.84.0"
51+
"version>=": "1.85.0"
5352
},
5453
{
5554
"name": "boost-numeric-conversion",
56-
"version>=": "1.84.0"
55+
"version>=": "1.85.0"
5756
},
5857
{
5958
"name": "boost-parameter",
60-
"version>=": "1.84.0"
59+
"version>=": "1.85.0"
6160
},
6261
{
6362
"name": "boost-preprocessor",
64-
"version>=": "1.84.0"
63+
"version>=": "1.85.0"
6564
},
6665
{
6766
"name": "boost-range",
68-
"version>=": "1.84.0"
67+
"version>=": "1.85.0"
6968
},
7069
{
7170
"name": "boost-serialization",
72-
"version>=": "1.84.0"
71+
"version>=": "1.85.0"
7372
},
7473
{
7574
"name": "boost-static-assert",
76-
"version>=": "1.84.0"
75+
"version>=": "1.85.0"
7776
},
7877
{
7978
"name": "boost-throw-exception",
80-
"version>=": "1.84.0"
79+
"version>=": "1.85.0"
8180
},
8281
{
8382
"name": "boost-tuple",
84-
"version>=": "1.84.0"
83+
"version>=": "1.85.0"
8584
},
8685
{
8786
"name": "boost-type-traits",
88-
"version>=": "1.84.0"
87+
"version>=": "1.85.0"
8988
},
9089
{
9190
"name": "boost-typeof",
92-
"version>=": "1.84.0"
91+
"version>=": "1.85.0"
9392
},
9493
{
9594
"name": "boost-ublas",
96-
"version>=": "1.84.0"
95+
"version>=": "1.85.0"
9796
}
9897
]
9998
}

‎ports/boost-algorithm/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/algorithm
66
REF boost-${VERSION}
7-
SHA512 d7614816293080982df97725e4994aadf62c0215336b74297d9143cae27d253e666256e0a0759bb2b563396d6cc205fbb6bcc54db383add612efdff2168b4b53
7+
SHA512 6cf6b95e688a7841b699a7f0fbfa1ff10025298e05b3333c5bc2a412a176545955d3089bb90eb66b313241bcd56e941b27e858045633bcb10705d9068486bed8
88
HEAD_REF master
99
)
1010

‎ports/boost-algorithm/vcpkg.json‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,86 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-algorithm",
4-
"version": "1.84.0",
5-
"port-version": 1,
4+
"version": "1.85.0",
65
"description": "Boost algorithm module",
76
"homepage": "https://github.com/boostorg/algorithm",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-array",
12-
"version>=": "1.84.0"
11+
"version>=": "1.85.0"
1312
},
1413
{
1514
"name": "boost-assert",
16-
"version>=": "1.84.0"
15+
"version>=": "1.85.0"
1716
},
1817
{
1918
"name": "boost-bind",
20-
"version>=": "1.84.0"
19+
"version>=": "1.85.0"
2120
},
2221
{
2322
"name": "boost-cmake",
24-
"version>=": "1.84.0"
23+
"version>=": "1.85.0"
2524
},
2625
{
2726
"name": "boost-concept-check",
28-
"version>=": "1.84.0"
27+
"version>=": "1.85.0"
2928
},
3029
{
3130
"name": "boost-config",
32-
"version>=": "1.84.0"
31+
"version>=": "1.85.0"
3332
},
3433
{
3534
"name": "boost-core",
36-
"version>=": "1.84.0"
35+
"version>=": "1.85.0"
3736
},
3837
{
3938
"name": "boost-exception",
40-
"version>=": "1.84.0"
39+
"version>=": "1.85.0"
4140
},
4241
{
4342
"name": "boost-function",
44-
"version>=": "1.84.0"
43+
"version>=": "1.85.0"
4544
},
4645
{
4746
"name": "boost-headers",
48-
"version>=": "1.84.0"
47+
"version>=": "1.85.0"
4948
},
5049
{
5150
"name": "boost-iterator",
52-
"version>=": "1.84.0"
51+
"version>=": "1.85.0"
5352
},
5453
{
5554
"name": "boost-mpl",
56-
"version>=": "1.84.0"
55+
"version>=": "1.85.0"
5756
},
5857
{
5958
"name": "boost-range",
60-
"version>=": "1.84.0"
59+
"version>=": "1.85.0"
6160
},
6261
{
6362
"name": "boost-regex",
64-
"version>=": "1.84.0"
63+
"version>=": "1.85.0"
6564
},
6665
{
6766
"name": "boost-static-assert",
68-
"version>=": "1.84.0"
67+
"version>=": "1.85.0"
6968
},
7069
{
7170
"name": "boost-throw-exception",
72-
"version>=": "1.84.0"
71+
"version>=": "1.85.0"
7372
},
7473
{
7574
"name": "boost-tuple",
76-
"version>=": "1.84.0"
75+
"version>=": "1.85.0"
7776
},
7877
{
7978
"name": "boost-type-traits",
80-
"version>=": "1.84.0"
79+
"version>=": "1.85.0"
8180
},
8281
{
8382
"name": "boost-unordered",
84-
"version>=": "1.84.0"
83+
"version>=": "1.85.0"
8584
}
8685
]
8786
}

‎ports/boost-align/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/align
66
REF boost-${VERSION}
7-
SHA512 53774a2411f856112845469ce89a4b34bee6e7d13796764d1e6d397526747e4a7c798abd755f2eed5a48fe3c792e7bc8e0cc2418e8c6ee7f992fa98d73fc86c6
7+
SHA512 8c284d39a5565c73bd866974d5b7392e1a4a59380b8ba3e5693b29cf8de34db67fcfc644dc0d204dc0ba0b3c43022b0607c84f03f413ce34f6a73cef5d8fc021
88
HEAD_REF master
99
)
1010

‎ports/boost-align/vcpkg.json‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-align",
4-
"version": "1.84.0",
5-
"port-version": 1,
4+
"version": "1.85.0",
65
"description": "Boost align module",
76
"homepage": "https://github.com/boostorg/align",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-assert",
12-
"version>=": "1.84.0"
11+
"version>=": "1.85.0"
1312
},
1413
{
1514
"name": "boost-cmake",
16-
"version>=": "1.84.0"
15+
"version>=": "1.85.0"
1716
},
1817
{
1918
"name": "boost-config",
20-
"version>=": "1.84.0"
19+
"version>=": "1.85.0"
2120
},
2221
{
2322
"name": "boost-core",
24-
"version>=": "1.84.0"
23+
"version>=": "1.85.0"
2524
},
2625
{
2726
"name": "boost-headers",
28-
"version>=": "1.84.0"
27+
"version>=": "1.85.0"
2928
},
3029
{
3130
"name": "boost-static-assert",
32-
"version>=": "1.84.0"
31+
"version>=": "1.85.0"
3332
}
3433
]
3534
}

‎ports/boost-any/portfile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/any
66
REF boost-${VERSION}
7-
SHA512 0adfb10eeeffe9c479d2dfa2663828530b00191bec64c8b8d3adeff20220b0789078981bf4a3bf7e0808a44f61bafc9f3f1f488a316954008835a9205042f356
7+
SHA512 d4a5e2bc40b3997eccd070827b3bfdf96221667aa95ff62e702235d7301d7712d6a13a2b368eb877a2aa4f3882a638a81736040998d23d34424849e61b961947
88
HEAD_REF master
99
)
1010

0 commit comments

Comments
 (0)