Skip to content

[qt-advanced-docking-system] update to 3.6.1#13340

Merged
ras0219-msft merged 6 commits intomicrosoft:masterfrom
stijnherfst:master
Sep 15, 2020
Merged

[qt-advanced-docking-system] update to 3.6.1#13340
ras0219-msft merged 6 commits intomicrosoft:masterfrom
stijnherfst:master

Conversation

@stijnherfst
Copy link
Contributor

Updated to release version 3.6.1
There should be no triplet regressions

@JackBoosY
Copy link
Contributor

@Neumann-A Could you please review this PR?

Thanks.

@JackBoosY JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label Sep 4, 2020
@stijnherfst
Copy link
Contributor Author

I see it has a dependency on x11extras on Linux. How can I add this to the control file as a dependency, but then only for that platform?
if (UNIX) target_link_libraries(qtadvanceddocking PUBLIC Qt5::X11Extras) endif()

@stijnherfst
Copy link
Contributor Author

So the last issue is that the linux build has a dependency on x11extras. Do I add this as a general (for all platforms) dependency or can I add this to the PORTFILE as a dependency only for Linux?

@Neumann-A
Copy link
Contributor

Do I add this as a general (for all platforms) dependency or can I add this to the PORTFILE as a dependency only for Linux?

only for linux
Build-Depends: qt5-base[core], qt5-x11extras (linux), <otherdependencies?>

@stijnherfst stijnherfst marked this pull request as ready for review September 6, 2020 21:59
@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Sep 7, 2020
Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! LGTM once my comments are addressed.

@stijnherfst
Copy link
Contributor Author

Not sure why the hash is failing on those platforms and not on the others ones. Just tested locally and it doesn't complain about a different hash.

@stijnherfst
Copy link
Contributor Author

stijnherfst commented Sep 9, 2020

For some reason vcpkg pulls binaries out of some folder in appdata even though you've explicitly called vcpkg remove qt-advanced-docking-system.

@ras0219-msft
Copy link
Contributor

You can use --editable to force rebuilding the package instead of restoring it from your local machine cache.

@ras0219-msft ras0219-msft merged commit 0ad0d1e into microsoft:master Sep 15, 2020
@ras0219-msft
Copy link
Contributor

LGTM, thanks for the update!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

5 participants