-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[qtkeychain] switch to Qt6; add qtkeychain-qt5; update to 0.13.1 #20185
Conversation
5d73408
to
ea85a8b
Compare
Originally I planned to fail the port build if neither qt5 nor qt6 feature was selected and intentionally not select one by default because accidentally pulling in either could result in a big increase in build time. CI is not happy about this because CI doesn't pick either, so I guess one or the other needs to be picked as a default feature. I am leaning towards picking the newer one and leaving users who need to stay with Qt5 to explicitly opt to do so. However this could surprise users who are already using this port with Qt5. Thoughts? |
cc @Neumann-A for review this PR. |
exclusive features are forbidden by policy (i know there exist some, but they were allowed before the policy was enforced) |
What is the alternative then? Use separate packages for building QtKeychain with Qt5 or Qt6? |
I got some curious errors building this with Qt6 on Windows:
These errors occurred in this GitHub Actions job. The logs are available as a GitHub Actions artifact. |
yes, i think so |
Ping @BillyONeal and @ras0219-msft, should the new package be for Qt5 or Qt6? I think it would make sense to keep the existing package with Qt5, but the generic |
@Be-ing Please use qt6. |
That does not answer my question. Which package name should use Qt6? |
According to our policy, we should not to add the conflict features, so please keep this port name since port qt is qt6 in the master branch. |
I think |
ea85a8b
to
5e07aea
Compare
5e07aea
to
6ad5400
Compare
6ad5400
to
3d6d4bd
Compare
On further thought, I think |
Accepted. |
CI seems to be down for unrelated reasons. |
Will rerun this PR after #20730 merge. |
11c64ca
to
28935a9
Compare
28935a9
to
58e7cf1
Compare
58e7cf1
to
bee0902
Compare
Well, this is weird. Since adding |
bee0902
to
1d9e3fb
Compare
13fe130
to
124abfa
Compare
There was a problem hiding this 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 356918c4c16c4ef67b6f869a852eb60bd438bcf6 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json
index b6f6b59..d64613f 100644
--- a/versions/q-/qtkeychain.json
+++ b/versions/q-/qtkeychain.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "8362147ae2e80b848447dc2f88ad96965fe790c9",
+ "git-tree": "463e5f361e6d29d2ac477813e32872f63b6889c5",
"version": "0.13.1",
"port-version": 0
},
124abfa
to
b575f7c
Compare
and add libsecret as a dependency for Linux
b575f7c
to
75b28b5
Compare
CI is passing now skipping building translations for arm64-windows. I don't do any builds for arm64-windows and my users aren't asking for arm64-windows builds so I don't mind this. The libsecret build option is working for Linux. If anyone else wants to work on building qtkeychain for Qt6 with translated error messages on arm64-windows, go ahead, but I am tired of working on this one little PR and would like to move on. |
Thanks @Be-ing for the work to make this happen and sorry that we haven't given it enough attention to push things through. In contrast to @JackBoosY's suggestion at #20185 (comment), we absolutely should not pull the rug out from underneath existing users that expect Therefore, I've opened #21420 that cherry-picks the qtkeychain commit from this PR but swaps them (back to the original arrangement?). Thanks once again; I hope we can get this merged soon. |
and update to 0.13.1
What does your PR fix?
Fixes qtkeychain unable to build with Qt6. Also add libsecret dependency on Linux.
Which triplets are supported/not supported? Have you updated the CI baseline?
all
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