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

[pull] master from microsoft:master #165

Merged
merged 3 commits into from
May 28, 2024
Merged

[pull] master from microsoft:master #165

merged 3 commits into from
May 28, 2024

Commits on May 28, 2024

  1. [FFmpeg] chromium patch (#38683) 

    Required to build qtwebengine and probably chromium itself with ffmpeg
on linux-dynamic
    @Neumann-A
    Neumann-A authored May 28, 2024
    Configuration menu
    Copy the full SHA
    9828b5b View commit details
    Browse the repository at this point in the history

  2. [kf5kio] Fix port quirks (#38965) 

    Simplified from #34088:
- Remove stray `--trace-expand`
- Don't require `qt5-base` default-features.
- Disable uncontrolled gssapi dependency (might be silently satisfied by
`krb5` or system libs, but `krb5` needs extra fixes).
Unblocks PRs which trigger curl and kf5kio, e.g. #37196, #38901, #37599,
#38967.
  Tested in #37196.
    @dg0yt
    dg0yt authored May 28, 2024
    Configuration menu
    Copy the full SHA
    ad80822 View commit details
    Browse the repository at this point in the history

  3. [libsodium] Update to 1.0.20 (#38954) 

    Fixes #38947
- [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.
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~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.

---------

Co-authored-by: Lily Wang <[email protected]>
    @LilyWangLL
    LilyWangLL and Lily Wang authored May 28, 2024
    Configuration menu
    Copy the full SHA
    dee924d View commit details
    Browse the repository at this point in the history