Skip to content
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

Merged
merged 3 commits into from
Jan 28, 2022
Merged

[wt] update to 4.6.1 #22772

merged 3 commits into from
Jan 28, 2022

Conversation

RockinRoel
Copy link
Contributor

  • 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

Copy link

@github-actions github-actions bot left a 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
Copy link
Contributor Author

Oops, just noticed PR #22771. I guess that one is a little bit more complete in its removal of absolute paths.

@RockinRoel
Copy link
Contributor Author

RockinRoel commented Jan 24, 2022

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/

I'd update the license, but I think SPDX misses the proper generic OpenSSL exception. Wt is dual-licensed: GPL-2.0-only with OpenSSL exxception, or a paid proprietary license.

@autoantwort
Copy link
Contributor

Oops, just noticed PR #22771. I guess that one is a little bit more complete in its removal of absolute paths.

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! :)

ports/wt/vcpkg.json Outdated Show resolved Hide resolved
Copy link

@github-actions github-actions bot left a 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/

Copy link

@github-actions github-actions bot left a 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/

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Jan 25, 2022
@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed info:reviewed Pull Request changes follow basic guidelines labels Jan 25, 2022
@JonLiu1993
Copy link
Member

@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?

@RockinRoel
Copy link
Contributor Author

@JonLiu1993 Yes, that's fine by me.

@JonLiu1993 JonLiu1993 added depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Jan 25, 2022
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.
Copy link

@github-actions github-actions bot left a 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/

@JonLiu1993 JonLiu1993 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 28, 2022
Copy link

@github-actions github-actions bot left a 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/

@JonLiu1993
Copy link
Member

All features are tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-windows-static

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Jan 28, 2022
@ras0219-msft ras0219-msft merged commit c89dce3 into microsoft:master Jan 28, 2022
@ras0219-msft
Copy link
Contributor

LGTM, thanks for following up with upstream!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants