Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ports/cpprestsdk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
vcpkg_download_distfile(PATCH_PR_1820
URLS https://github.com/microsoft/cpprestsdk/commit/396259a0f88e6f908c6d841f13c113d5f0d0ec26.patch
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately this commit will disappear when the PR is gone :(

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. What's the alternative? Vendoring the patch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, given that cpprestsdk is a Microsoft repository, is there any chance we can get a speed up in reviewing and merging the original PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. What's the alternative? Vendoring the patch?

Yes, it would have to be included here.

Also, given that cpprestsdk is a Microsoft repository, is there any chance we can get a speed up in reviewing and merging the original PR?

At this point I think either getting taken is unlikely, both because cpprestsdk is effectively dead at this point (there are already several PRs there to fix build breaks on recent platforms which are unreviewed) and because the proposed change introduces undefined behavior.

My own changes have been waiting for literally years too, e.g. microsoft/cpprestsdk#1767

SHA512 2235feddc11633041eb27fadb154515c2270d2f187f3bab4cac3f0b73f7ff034a56d4540700ccae36be216f480915da5203b660f9401e371999dbce888a421bf
FILENAME char_traits.patch
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cpprestsdk
Expand All @@ -11,6 +17,7 @@ vcpkg_from_github(
fix-clang-dllimport.patch # workaround for https://github.com/microsoft/cpprestsdk/issues/1710
silence-stdext-checked-array-iterators-warning.patch
fix-asio-error.patch
${PATCH_PR_1820}
)

vcpkg_check_features(
Expand Down
2 changes: 1 addition & 1 deletion ports/cpprestsdk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cpprestsdk",
"version": "2.10.19",
"port-version": 3,
"port-version": 4,
"description": [
"C++11 JSON, REST, and OAuth library",
"The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services."
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2022,7 +2022,7 @@
},
"cpprestsdk": {
"baseline": "2.10.19",
"port-version": 3
"port-version": 4
},
"cppslippi": {
"baseline": "1.4.3.16",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cpprestsdk.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86500cf9f3b462296cd78a268eb4b643424b44e4",
"version": "2.10.19",
"port-version": 4
},
{
"git-tree": "9f5e160191038cbbd2470e534c43f051c80e7d44",
"version": "2.10.19",
Expand Down