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.

Sign up for GitHub

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

Jump to bottom

[qt5] Update to 5.15.4 #24660

Merged
merged 2 commits into from
May 13, 2022
Merged

[qt5] Update to 5.15.4 #24660

merged 2 commits into from
May 13, 2022

Conversation

Osyotr
Copy link
Contributor

@Osyotr Osyotr commented May 11, 2022

Testing build on CI...

@Osyotr
Copy link
Contributor Author

Osyotr commented May 11, 2022 •
edited
Loading

A little step-by-step tutorial on how to update qt5:

  1. Modify qt_port_hashes.cmake:
    Adjust QT_MAJOR_MINOR_VER and QT_PATCH_VER. Do not edit vcpkg.json, it will be overridden.
    switch QT_UPDATE_VERSION to ON

  2. Get new hashes (will also update vcpkg.json):
    vcpkg install qt5[all] qt5-androidextras qt5-doc qt5-macextras qt5-winextras qt5-x11extras qt5-wayland --allow-unsupported --triplet=x64-windows
    You may want to temporary remove llvm dependency from qt5-tools[doc] to speed things up.

  3. Use new hashes (qt_new_hashes.cmake):
    Sort lines ascending (In Notepad++: Edit -> Line Operations -> Sort lines lexicographically ascending)
    Replace hashes in vcpkg_port_hashes.cmake

  4. Switch QT_UPDATE_VERSION back to OFF in qt_port_hashes.cmake:

  5. Remove installed Qt5 libraries (either vcpkg remove qt5-base --recurse --triplet=x64-windows or remove installed directory)
    Verify that qt5-base builds:
    vcpkg install qt5-base[core] --triplet=x64-windows

  6. Commit results

  7. vcpkg x-add-version --all
    Amend last commit

  8. Check number of modified files (should be 84 + number of additionally modified files)

Push and create PR.

@Neumann-A
Copy link
Contributor

Temporary remove platform restrictions in vcpkg.json and get remaining hashes:

use --allow-unsupported

Bump version

might be misunderstood. Don't bump version in vcpkg.json

vcpkg remove qt5

you mean vcpkg remove qt5-base --recurse

@JonLiu1993 JonLiu1993 self-assigned this May 12, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label May 12, 2022
@Neumann-A
Copy link
Contributor

You probably want to remove qt_port_hashes_latest.cmake and deprecate the latest feature.
You can also add qt5 to the port list so that you don't have to manually update the version in that file.

@Osyotr
Deprecate "latest" feature
9699e7f 
Also update "qt5" port when updating versions
@JonLiu1993 JonLiu1993 added requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function info:reviewed Pull Request changes follow basic guidelines and removed requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels May 13, 2022
@BillyONeal BillyONeal merged commit 8113465 into microsoft:master May 13, 2022
@BillyONeal
Copy link
Member

Thanks for the update!

@Osyotr Osyotr deleted the qt_5154_update branch May 14, 2022 00:08
@davidebeatrici davidebeatrici mentioned this pull request May 17, 2022
Open
@Osyotr Osyotr mentioned this pull request Sep 7, 2022
Merged
@Osyotr Osyotr mentioned this pull request Oct 28, 2022
Merged
@Osyotr Osyotr mentioned this pull request Jan 4, 2023
Merged
@Osyotr Osyotr mentioned this pull request Apr 6, 2023
Merged
@Osyotr Osyotr mentioned this pull request Jun 7, 2023
Merged
7 tasks
This was referenced Oct 5, 2023
Closed
Merged
This was referenced Dec 28, 2023
Closed
Merged
@carsten-grimm-at-ipolog carsten-grimm-at-ipolog mentioned this pull request Mar 12, 2024
Merged
7 tasks
@carsten-grimm-at-ipolog carsten-grimm-at-ipolog mentioned this pull request May 27, 2024
Merged
7 tasks
vicroms pushed a commit that referenced this pull request May 30, 2024
@carsten-grimm-at-ipolog
[qt5] update to 5.15.14 (#38967)
b0d9d51 
Fixes #38962.
Fixes #38966.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

Changes:
* update Qt5 to 5.15.14 following [these
instructions](#24660 (comment)).
* added patch for CVE-2024-36048 to `qt5-networkauth`.
* removed patch for CVE-2023-32762 from `qt5-base` as Qt 5.15.14 is no
longer affected.
* removed patch for CVE-2023-33285 from `qt5-base` as Qt 5.15.14 is no
longer affected.
* removed patch for CVE-2023-32573 from `qt5-svg` as Qt 5.15.14 is no
longer affected.
@Osyotr Osyotr mentioned this pull request Sep 5, 2024
Merged
@Osyotr Osyotr mentioned this pull request Nov 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JonLiu1993 JonLiu1993 JonLiu1993 approved these changes

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

@JonLiu1993 JonLiu1993

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Osyotr @Neumann-A @BillyONeal @JonLiu1993