Skip to content

[wxWidgets] update to 3.1.5#17314

Closed
electron271 wants to merge 5 commits intomicrosoft:masterfrom
electron271:patch-3
Closed

[wxWidgets] update to 3.1.5#17314
electron271 wants to merge 5 commits intomicrosoft:masterfrom
electron271:patch-3

Conversation

@electron271
Copy link

Describe the pull request

  • What does your PR fix?

    Fixes [wxWidgets] update to 3.1.5 #17313

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    UWP is not supported

  • Does your PR follow the maintainer guide?

    I think so..

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

No

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@electron271
Copy link
Author

how exactly to update the patch?

@JonLiu1993 JonLiu1993 requested review from PhoebeHui and removed request for PhoebeHui April 16, 2021 02:20
@JonLiu1993 JonLiu1993 self-assigned this Apr 16, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 16, 2021
@SamuelMarks
Copy link
Contributor

@electron271 You might also want to look at #17072 and #17111

@JonLiu1993
Copy link
Contributor

@electron271 ,usually update the port, there are the following steps:

  1. Convert the control file to the vcpkg.json file, and modify the version inside to the target version. If the version is a special combination method, you need to use version, version-string, version-semver or version-date respectively. For details, please refer to here. If there is port-version before update, it needs to be set to 0 or deleted.
  2. Modify the ref and hash value in portfile.cmake.
  3. If you need to update the patch in the port, you need to investigate the port history update record and combine the target version in the soure to remake the patch.
  • If the previous patch has been successfully added to the source of the target version, you can delete the patch.
  • If the latest version of the source does not contain the modifications in the patch and the patch cannot be used normally, you need to remake the patch.
  • If the latest version of the source does not contain the patch modification content, the patch can be used directly, just keep the patch intact and use it directly.

The above is the most basic way to update ports. Of course, this is the only way to update all ports. We have more small details and gradual update strategies that need to be paid attention to at any time. Hope these can help you, thanks for your contribution

"version-semver": "3.1.4",
"port-version": 7,
"version-semver": "3.1.5",
"port-version": 8,
Copy link
Contributor

Choose a reason for hiding this comment

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

@electron271 ,please delete port-version or set port-version to 0

{
"git-tree": "b284aa561d3ec113a892e6fb37e4b4333bf60517",
"version-semver": "3.1.5",
"port-version": 8
Copy link
Contributor

Choose a reason for hiding this comment

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

please delete port-version or set port-version to 0

@JonLiu1993
Copy link
Contributor

@electron271 ,I found that the current problem of CI is due to the incorrect use of patch. You can try to remake the patch.

Applying patch fix-stl-build-vs2019-16.6.patch
CMake Error at scripts/cmake/z_vcpkg_apply_patches.cmake:57 (message):
  Applying patch failed: Checking patch include/wx/hashmap.h...

@electron271
Copy link
Author

how would I remake the patch?

@JonLiu1993
Copy link
Contributor

how would I remake the patch?

@electron271 ,You can follow the steps below

Direct to the libs path src: such as :C:\fixDate\vcpkg\buildtrees\date\src\date-2.4

Git init .
Git add .
Git commit -m  "test amp"
Modify source
git diff | out-file -enc ascii fix-.patch

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[wxWidgets] update to 3.1.5

3 participants