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

Meta qt6 PR #22835

Merged
merged 25 commits into from
Mar 4, 2024
Merged

Meta qt6 PR #22835

merged 25 commits into from
Mar 4, 2024

Conversation

ericLemanissier
Copy link
Contributor

@ericLemanissier ericLemanissier commented Feb 21, 2024

Specify library name and version: qt/6.*

This PR gathers the content of the currently opened PRs, hoping to get some attention from the team:

I only used merge commits, so merging this meta-PR automatically closes the PRs above. Also, if one of the PRs above is merged before this meta-PR, I'll simply merge master into this meta-PR and said PR content will disappear from this meta-PR

call for review @conan-io/barbarians


Copy link
Contributor

🤖 Beep Boop! This pull request is making changes to 'recipes/qt//'.

👋 @ericLemanissier @jwillikers @MartinDelille you might be interested. 😉

Qt6: minor formatting fixes
@conan-center-bot conan-center-bot added Failed Version conflict There is a version conflict when solving the dependencies graph labels Feb 21, 2024
@conan-center-bot conan-center-bot removed Failed Version conflict There is a version conflict when solving the dependencies graph labels Feb 26, 2024
@conan-center-bot

This comment has been minimized.

Copy link
Contributor

Hooks produced the following warnings for commit 41876ae
qt/6.6.0@#bac4461938ab0c7ed23b437df9eaefcf
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.6.2@#b77502dcae9f19ef847f1bd6393dc7c0
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.6.1@#628421be515be9aff36451afdeb658f7
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.5.3@#86d73fbad1196bfd13c3b0985559ad70
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
qt/6.3.2@#9940811a1c20089b8f4f6cb67e4addcc
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
qt/6.4.2@#3c39bda0b3d11aa4cc3096f7477a48a2
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.

@ericLemanissier
Copy link
Contributor Author

The build is now finished. You can take a look at the results here

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@ericLemanissier
Copy link
Contributor Author

@uilianries @danimtb what's happening here ?
@conan-center-bot complained twice that

command 'git merge --no-ff https://github.com/conan-io/conan-center-index/commit/56a3277676b5f42ddcbcbc12f6ab97a31c30d321' failed with exit code 1:
Auto-merging recipes/qt/6.x.x/conanfile.py
CONFLICT (content): Merge conflict in recipes/qt/6.x.x/conanfile.py
Automatic merge failed; fix conflicts and then commit the result.

On my machine, running $ git merge --no-ff 56a3277 just returns Already up to date. The conflict has already been solved in the last merge comit.

@conan-center-bot

This comment has been minimized.

Signed-off-by: Uilian Ries <[email protected]>
@ericLemanissier
Copy link
Contributor Author

The build is now finished. You can take a look at the results here

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 12 (b4ff473dbde7e937eba9e4911591668a72fb2ee0):

  • qt/6.6.2:
    All packages built successfully! (All logs)

  • qt/6.6.1:
    All packages built successfully! (All logs)

  • qt/6.6.0:
    All packages built successfully! (All logs)

  • qt/6.5.3:
    All packages built successfully! (All logs)

  • qt/6.4.2:
    All packages built successfully! (All logs)

  • qt/6.3.2:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 12 (b4ff473dbde7e937eba9e4911591668a72fb2ee0):

  • qt/6.6.2:
    All packages built successfully! (All logs)

  • qt/6.6.1:
    All packages built successfully! (All logs)

  • qt/6.5.3:
    All packages built successfully! (All logs)

  • qt/6.6.0:
    All packages built successfully! (All logs)

  • qt/6.4.2:
    All packages built successfully! (All logs)

  • qt/6.3.2:
    All packages built successfully! (All logs)

Copy link
Contributor

github-actions bot commented Mar 4, 2024

Hooks produced the following warnings for commit b4ff473
qt/6.6.2@#e1444e010ab3fdd5f82092604caa93bc
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.6.1@#a6ca82cea9584c51e224c5270a2a788a
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.6.0@#6523c75714e57de02c42d487cddb7a25
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackendd.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library '.\res\archdatadir\plugins\tls\qschannelbackend.dll' links to system library 'ncrypt' but it is not in cpp_info.system_libs.
qt/6.5.3@#2aa61f2eec5babd2403d843d35ecd20d
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
qt/6.4.2@#b5b6e983433792ac8ce55b685b2402cf
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
qt/6.3.2@#89875f8f844f146775371714403ce0e8
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.
post_package(): WARN: [MISSING SYSTEM LIBS (KB-H043)] Library './res/archdatadir/plugins/platforms/libqcocoa_debug.dylib' links to system library 'ColorSync' but it is not in cpp_info.frameworks.

@AbrilRBS AbrilRBS self-assigned this Mar 4, 2024
@conan-center-bot conan-center-bot merged commit 13bc0dd into conan-io:master Mar 4, 2024
38 checks passed
@ericLemanissier ericLemanissier deleted the meta_qt6 branch March 4, 2024 15:19
@ericLemanissier
Copy link
Contributor Author

thanks

Cogitri pushed a commit to dampsoft/conan-center-index that referenced this pull request Apr 4, 2024
* qt: add QT_NO_DEBUG define in release build

* fix condition for QT_NO_DEBUG define

* Qt6: add d3d12 system lib on Windows

Qt 6.6.0 added `d3d12` to the list of system libraries on Windows it links against:
qt/qtbase@84fb0de#diff-2d8b127aed7a6123be24b80481b760ec4e9cc251e19d668d936dc09e87147a0e

This is currently breaking the build in conan-io#18794.

* Qt6: make d3d12 conditional on Qt version

d3d12.dll was added with Windows 10. Don't want to potentially limit the range of supported OS versions unnecessarily.

* Qt6: update all system dependency lists

* Fix a typo

* qt6: add tools macros

fixes conan-io#22530

* require explicitely gstreamer

* bump deps

* fix gstreamer consumption

* fix cmake_find_mode of deps

* Qt6: minor formatting fixes

* qt 6.6.2

generated with:
conan config install https://github.com/conan-io/conan-extensions.git
conan cci:upgrade-qt-recipe 6.6.2

* fix patching

* trigger CI without conflict

Signed-off-by: Uilian Ries <[email protected]>

---------

Signed-off-by: Uilian Ries <[email protected]>
Co-authored-by: Alex Maystrenko <[email protected]>
Co-authored-by: Martin Valgur <[email protected]>
Co-authored-by: Uilian Ries <[email protected]>
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.

9 participants