-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[wt] update to 4.6.1 #22772
[wt] update to 4.6.1 #22772
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/wt/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
Oops, just noticed PR #22771. I guess that one is a little bit more complete in its removal of absolute paths. |
I'd update the license, but I think SPDX misses the proper generic OpenSSL exception. Wt is dual-licensed: |
You could include the change # RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") here. Thank you for your fast response and your PR here! :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 3afbc7b286c1cf4717f20753a0a4d15b9ab4d342 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/w-/wt.json b/versions/w-/wt.json
index f078001..d94a29e 100644
--- a/versions/w-/wt.json
+++ b/versions/w-/wt.json
@@ -1,8 +1,8 @@
{
"versions": [
{
- "git-tree": "33f58101ede3c439ebde420d673b60a7e6c7ae2d",
- "version-string": "4.6.1",
+ "git-tree": "23dae432c7e821ccd04fc6f8b669a1dd8da36c48",
+ "version": "4.6.1",
"port-version": 0
},
{
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/wt/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/wt/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
@RockinRoel, Thanks for your pr, I noticed PR #22771 also changed the wt port, If the two prs are merged at the same time, there will be conflicts. I suggest that we wait for pr #22771 to merge, and then update with pr #22771 as the benchmark version. What do you think? |
@JonLiu1993 Yes, that's fine by me. |
Setting WTHTTP_CONFIGURATION and CONFIGURATION to empty string as well, because these would otherwise be filled in with an absolute path. Setting them to empty string ensures they won't be used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/wt/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/wt/vcpkg.json
Valid values for the license field are listed at https://spdx.org/licenses/
All features are tested successfully in the following triplet:
|
LGTM, thanks for following up with upstream! |
What does your PR fix?
Updates Wt to 4.6.1
Setting WTHTTP_CONFIGURATION and CONFIGURATION to empty string as well, because these would otherwise be filled in with an absolute path. Setting them to empty string ensures they won't be used.
See issue #9646 on the Wt Redmine
Which triplets are supported/not supported? Have you updated the CI baseline?
all
No
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes