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

[qt] Update qt 6.7.1 #38845

Merged
merged 53 commits into from
Jun 11, 2024
Merged

[qt] Update qt 6.7.1 #38845

merged 53 commits into from
Jun 11, 2024

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented May 21, 2024 •
edited
Loading

Closes #38835
Closes #39040

@Neumann-A
Remove pulgin deployment into tools. Using qt.conf will work
79d08e4
@Neumann-A
fix Cups casing
4bec3d8
@Neumann-A
bump port version
7aced28
@Neumann-A
v db
03215ea
@Neumann-A
make osx work
f54f0d3
@Neumann-A
v db
1918363
@Neumann-A
remove duplicated options
2bdb1a0
@Neumann-A
add cppwinrt as a dependency
eaff4f8
@Neumann-A
v db
9547c97
@Neumann-A
remove cppwinrt dependency
2fb1516
@Neumann-A
control dbus linkage on linux
bba4ed2
@Neumann-A
remove trailing ,
ae08c1b
@Neumann-A
v db
e7f2104
@Neumann-A
fix qtdeclarative now depending on qtsvg
18206b3
@Neumann-A
dbus only for linux
750199e
@Neumann-A
political correctness wording
d6f01eb
@Neumann-A
Add cups as a default feature
86334f0
@Neumann-A
v db
7d59d59
@Neumann-A
fix missing keyword
2d20cd8
@Neumann-A
v db
9aacc92
@Neumann-A
move qtwebengine rescources to location expected by qt.conf
0c0550a
@Neumann-A
v db
f9474a4
@Neumann-A
fix logic
9d7aa2f
@Neumann-A
disable cups as a default feature on linux (CI does not have it insta…
4417ebb 
…lled)
@Neumann-A
v db
3593ba3
@Neumann-A
Fix typo
210b592
@Neumann-A
v db
598db88
@Neumann-A
Merge remote-tracking branch 'upstream/master' into fix_qt_details
043da0a
@Neumann-A
[Qt] Update to 6.7.1
8c806c7
@Neumann-A
v db
c4a53ba
@carsten-grimm-at-ipolog
Copy link
Contributor

This update will also fix Issue #38968.

@WangWeiLin-MV WangWeiLin-MV linked an issue May 28, 2024 that may be closed by this pull request
[qtnetworkauth] apply official patch for CVE-2024-36048 #38968
Closed
@Neumann-A
Copy link
Contributor Author

So question now:

  • Should I finish the update to 6.7.1 now or should I wait for qtdeclarative being fixed by upstream? (https://bugreports.qt.io/browse/QTBUG-125481)
  • or should I try updating everything but keep qtdeclarative at 6.7.0 (which might create other issues?)
  • or simply wait for 6.7.2 and hope they resolve it until then?

@LilyWangLL LilyWangLL requested a review from vicroms May 29, 2024 08:57
@carsten-grimm-at-ipolog
Copy link
Contributor

So question now:

  • Should I finish the update to 6.7.1 now or should I wait for qtdeclarative being fixed by upstream? (https://bugreports.qt.io/browse/QTBUG-125481)
  • or should I try updating everything but keep qtdeclarative at 6.7.0 (which might create other issues?)
  • or simply wait for 6.7.2 and hope they resolve it until then?

If you decide to wait, there could be a separate pull request for the (as of yet unrated) vulnerability CVE-2024-36048 from #38968. That might take away one reason to upgrade to 6.7.1 now.

@Neumann-A
Copy link
Contributor Author

I expect the cve fix to be merged faster any way.

@carsten-grimm-at-ipolog
Copy link
Contributor

I expect the cve fix to be merged faster any way.

@Neumann-A , I have added a pr for the cve patch: #39056.

@nirvn
Copy link
Contributor

nirvn commented Jun 5, 2024

https://codereview.qt-project.org/c/qt/qtdeclarative/+/565938

Light at the end of the tunnel

@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_6.7.1
919a197 
# Conflicts:
#	ports/qtbase/vcpkg.json
#	ports/qtdeclarative/vcpkg.json
#	ports/qtinterfaceframework/vcpkg.json
#	ports/qtnetworkauth/vcpkg.json
#	ports/qttools/vcpkg.json
#	ports/qtwebengine/vcpkg.json
#	versions/baseline.json
#	versions/q-/qtbase.json
#	versions/q-/qtdeclarative.json
#	versions/q-/qtinterfaceframework.json
#	versions/q-/qtnetworkauth.json
#	versions/q-/qttools.json
#	versions/q-/qtwebengine.json
@Neumann-A
add patch for qtdeclarative fixing qml
2f760a9
@Neumann-A
qtbase: fix wasm and dbus
9338710
@Neumann-A
v db
de65944
@Neumann-A
remove cups default feature
307ecee
@Neumann-A
v db
772adf2
@Neumann-A
fix deploy patch
486d2b4
@Neumann-A
v db
80b283d
@Neumann-A
dont depend on dbus in static builds
ea261ee
@Neumann-A
v db
012921b
@Neumann-A
remove cve patch since it is included
356ab31
@Neumann-A
v db
39f7f8f
@Neumann-A
Merge branch 'microsoft:master' into update_qt_6.7.1
88fd73b
@Neumann-A Neumann-A marked this pull request as ready for review June 6, 2024 08:48
@BillyONeal BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Jun 11, 2024
@BillyONeal BillyONeal merged commit 0a34f76 into microsoft:master Jun 11, 2024
17 checks passed
@Neumann-A Neumann-A deleted the update_qt_6.7.1 branch June 11, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillyONeal BillyONeal BillyONeal approved these changes

@vicroms vicroms Awaiting requested review from vicroms

Assignees

@LilyWangLL LilyWangLL

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
5 participants
@Neumann-A @carsten-grimm-at-ipolog @nirvn @BillyONeal @LilyWangLL