Skip to content

[qt5] Update to 5.15.2#14678

Merged
dan-shaw merged 32 commits intomicrosoft:masterfrom
Neumann-A:update_qt_5_15_2
Jan 20, 2021
Merged

[qt5] Update to 5.15.2#14678
dan-shaw merged 32 commits intomicrosoft:masterfrom
Neumann-A:update_qt_5_15_2

Conversation

@Neumann-A
Copy link
Copy Markdown
Contributor

@Neumann-A Neumann-A commented Nov 20, 2020 •
edited
Loading

TODO: qt5-mqtt, test qt5-webengine
(mqtt currently missing git tag)
closes #14675

depends: #15049

Probably requires VM update for linux to be green again. (If somebody could figure out which tests are failing.)

Somebody needs to fix qt5-webengine again......the first error is easy the second one not so much

The error:
ERROR: Feature 'xcb' was enabled, but the pre-condition 'features.thread && libs.xcb && tests.xcb_syslibs && features.xkbcommon-x11' failed.
probably due to:
test config.qtbase_gui.libraries.xcb_util FAILED
so xcb_util needs to be installed within CI (solved)

Neumann-A
Neumann-A commented Nov 20, 2020
View reviewed changes
bl-ue
bl-ue reviewed Nov 20, 2020
View reviewed changes
bl-ue
bl-ue reviewed Nov 20, 2020
View reviewed changes
@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Nov 23, 2020
@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Nov 23, 2020

@JackBoosY @strega-nil could somebody investigate the problems vcpkg_from_git has with the official git of qt https://code.qt.io/cgit/qt/qtmqtt.git. qt5-mqtt is currently using a github mirror which hasn't yet updated to 5.15.2 so this PR will be blocked until then or the problem with vcpkg_from_git and the official git are resolved

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Nov 24, 2020 •
edited
Loading

@Neumann-A Seems 5.15.2 doesn't published on the github.
See https://github.com/qt/qtmqtt/tags
So as you said, we need to wait for the upstream publish that version.

@JackBoosY JackBoosY added the depends:upstream-changes Waiting on a change to the upstream project label Nov 24, 2020
@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Nov 24, 2020

@JackBoosY:

So as you said, we need to wait for the upstream publish that version.

we only need to wait if we use the github mirror. If we could use the official git at https://code.qt.io/cgit/qt/qtmqtt.git we wouldn't need to wait since it has the tag. The problem is that I wasn't able to get vcpkg_from_git to work with the official git repro. (Should probably be considered a vcpkg bug. I already ran into a few issues with vcpkg_from_git where it wasn't able to download from a git repro)

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Nov 24, 2020

@Neumann-A Maybe some parameters caused that. You can print the clone command and try it manually on you machine.

@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Nov 24, 2020

@JackBoosY. I already tried to make it work (e.g. by making --depth 1 and everything optional) but without success (I didn't try very long). vcpkg_from_git is doing a bit more than a simple git clone

@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Nov 24, 2020

@JackBoosY Also needs to have tag depends_vm_update

@JackBoosY JackBoosY added the depends:vm-update PR contains changes to the VM provisioning scripts label Nov 25, 2020
dweckmann
dweckmann suggested changes Dec 1, 2020
View reviewed changes
Neumann-A and others added 4 commits December 1, 2020 10:35
@Neumann-A
fix latest version info
1a89ad2
@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_5_15_2
b8830ae 
# Conflicts:
#	ports/qt5-base/CONTROL
@Neumann-A
switch to vcpkg_from_git
433205c 
adjust vcpkg_from_git to handle tags.
add OUT_REF for vcpkg_from_git to enable scriptable update of ports
@Neumann-A
regenerate docs
18733e9
@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 8, 2021
@JackBoosY JackBoosY linked an issue Jan 8, 2021 that may be closed by this pull request
[qt5-webengine] build failure #15086
Closed
@vicroms
Copy link
Copy Markdown
Member

vicroms commented Jan 11, 2021

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 11, 2021

Azure Pipelines successfully started running 1 pipeline(s).

@Neumann-A Neumann-A marked this pull request as ready for review January 11, 2021 16:27
ras0219
ras0219 approved these changes Jan 11, 2021
View reviewed changes
@Neumann-A @ras0219
Remove 'Port-Version:0' from qt5-location
a109769 
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Jan 11, 2021

The mac build failed due to a transient infrastructure issue ( #15584 ). /azp run after the other entries come back green should fix it.

@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Jan 12, 2021

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 12, 2021

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 18, 2021

Can you please resolve the conflicts?

@JackBoosY JackBoosY linked an issue Jan 18, 2021 that may be closed by this pull request
[qt5-webengine] build failure #15712
Closed
@JackBoosY JackBoosY mentioned this pull request Jan 18, 2021
Closed
@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_5_15_2
a116a4a 
# Conflicts:
#	port_versions/baseline.json
#	port_versions/q-/qt5.json
#	ports/qt5/CONTROL
@Neumann-A
fix versions
4db7369
@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Jan 19, 2021

@JackBoosY You probably want to remove depends:different-pr

@strega-nil strega-nil removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 19, 2021
@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jan 20, 2021
@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Jan 20, 2021

Let's merge this PR.

@dan-shaw dan-shaw merged commit 8e926cc into microsoft:master Jan 20, 2021
@dan-shaw
Copy link
Copy Markdown
Contributor

dan-shaw commented Jan 20, 2021

Thanks everyone!

@Neumann-A Neumann-A deleted the update_qt_5_15_2 branch January 20, 2021 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BillyONeal BillyONeal BillyONeal left review comments

+4 more reviewers

@bl-ue bl-ue bl-ue left review comments

@dweckmann dweckmann dweckmann requested changes

@ras0219 ras0219 ras0219 approved these changes

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[qt5-webengine] build failure [qt5-webengine] build failure [qt5] update to 5.15.2

10 participants

@Neumann-A @JackBoosY @vicroms @BillyONeal @dan-shaw @ras0219 @dweckmann @bl-ue @strega-nil @NancyLi1013