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

Patch macdeployqt #5488

Merged
merged 3 commits into from
Jun 1, 2021
Merged

Conversation

MartinDelille
Copy link
Contributor

Specify library name and version: qt/5.15.2

This is also a good place to share with all of us why you are submitting this PR (specially if it is a new addition to ConanCenter): is it a dependency of other libraries you want to package? Are you the author of the library? Thanks!


  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the
    conan-center hook activated.

fix #5487


if (plugins && !deploymentInfo.qtPath.isEmpty()) {
- deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
+ deploymentInfo.pluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
Copy link
Contributor

Choose a reason for hiding this comment

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

From the visible design perspective - I think it'd be better to fill the pluginPath from the shared.cpp, at the same place as the qtPath.
Then, here you'd need to only check that !deploymentInfo.pluginPath.isEmpty().

@ericLemanissier
Copy link
Contributor

Thanks ! Could you please report the bug at bugreports.qt.io, and submit the patch for review at codereview.qt.io ?

@conan-center-bot

This comment has been minimized.

@MartinDelille
Copy link
Contributor Author

The issue has already been adressed here: qt/qttools@03abcba

Shall I generate the patch from this commit instead ?

Do we agree that the CI failure has nothing to do with my change ?

@Minimonium
Copy link
Contributor

Minimonium commented May 9, 2021

Shall I generate the patch from this commit instead?

That would be ideal.

@MartinDelille
Copy link
Contributor Author

Unfortunately, the patch doesn't apply correctly, probably due to the fact that other commits have modified the file:

git log --oneline v5.15.2..dev src/macdeployqt/macdeployqt/main.cpp
03abcbabb macdeployqt: Fix plugin resolution bugs for non-standard installs
e6ad15080 Merge remote-tracking branch 'origin/5.15' into dev
b2f3eb655 Merge remote-tracking branch 'origin/5.15' into dev
6b2f32f3d Fix Qt6 build

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
@conan-center-bot

This comment has been minimized.

@MartinDelille
Copy link
Contributor Author

@ericLemanissier I fixed the patch because it looks like the QLibraryInfo class changed in Qt 6:

Should I submit a patch to the 5.15 branch ?

@conan-center-bot
Copy link
Collaborator

All green in build 3 (15b4572ceb551183f3d4c115028bb1e07fdbf9d5):

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

@ghost
Copy link

ghost commented May 17, 2021

I detected other pull requests that are modifying qt/5.x.x recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@ghost ghost mentioned this pull request May 17, 2021
4 tasks
@conan-center-bot conan-center-bot requested a review from czoido May 17, 2021 11:56
@MartinDelille
Copy link
Contributor Author

Is there missing for this PR to be accepted ?

@prince-chrismc
Copy link
Contributor

My only question is will there be another 5.x.x release that will include this fix in the near future?

If no, I'll approve 🙃

@ghost ghost mentioned this pull request May 29, 2021
4 tasks
@wdobbe
Copy link
Contributor

wdobbe commented May 29, 2021

@prince-chrismc Qt company has announced that updates to qt 5.15 will only available to commercial customers. So it is not very likely that we will get a new 5.x release. Although I think KDE maintains a Qt 5.15 fork with patches.

@conan-center-bot conan-center-bot merged commit 9583988 into conan-io:master Jun 1, 2021
madebr pushed a commit to madebr/conan-center-index that referenced this pull request Jun 21, 2021
* Patch macdeployqt fix conan-io#5487

* Update recipes/qt/5.x.x/patches/fix-macdeployqt.diff

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>

* QLibraryInfo::path => location

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
@MartinDelille MartinDelille deleted the patch-macdeployqt branch July 15, 2021 12:16
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.

[package] qt/5.15.2: Plugins not deployed on MacOS
7 participants