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

Update to latest QGIS release (3.40.2) and up vcpkg revision to prepare for Qt 6.8.2 #5944

Merged
merged 6 commits into from
Jan 17, 2025

Conversation

nirvn
Copy link
Member

@nirvn nirvn commented Jan 15, 2025

Title says it all

@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Jan 16, 2025

@nirvn nirvn changed the title Update to latest QGIS release (3.40.2) and up vcpkg revision to prepare for Qt 6.8.3 Update to latest QGIS release (3.40.2) and up vcpkg revision to prepare for Qt 6.8.2 Jan 16, 2025
@m-kuhn
Copy link
Member

m-kuhn commented Jan 17, 2025

Fantastic work @nirvn .
Do we finally need to keep the vcpkg-make overlay?

Regarding the other two overlays, can we leave a sentence somewhere to remind us why we have these (and that will help us remember what's needed to go back to the base registry for them)?

@nirvn
Copy link
Member Author

nirvn commented Jan 17, 2025

@m-kuhn , you are correct, we don't need the port now that we downgraded libb2. For the record, to my own future self or others, that port was needed to fix the macos compilation, not iOS. We were hitting this issue being address in this PR (microsoft/vcpkg#43121) on macos.

As for the two added ports, I've filed an issue for libb2 here to raise the ongoing build failure on iOS: microsoft/vcpkg#43326

For zxing-cpp, the issue has to do with its version 2.3 having upgraded the minimum c++ version to 20. I think we can downgrade here for a while and try again in a year or so :) not sure it's worth opening an issue with vcpkg itself on this one.

@nirvn nirvn merged commit 204210a into master Jan 17, 2025
25 checks passed
@nirvn nirvn deleted the up_up_up branch January 17, 2025 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants