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

Qt 5.8 and Plasma 5.9 #23446

Merged
merged 7 commits into from Mar 4, 2017
Merged

Qt 5.8 and Plasma 5.9 #23446

merged 7 commits into from Mar 4, 2017

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Mar 3, 2017

Motivation

Package updates:

  • Qt 5 has been updated to 5.8.0 (new default).
  • Plasma 5 has been updated from 5.8.6 to 5.9.3.
  • libxkbcommon has been updated from 0.6.1 to 0.7.1 (needed by Plasma 5.9) (mass-rebuild).

Testing

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Travis will not be able to rebuild all the dependent packages, but I am rebuilding locally and I will push additional package fixes as necessary.

@mention-bot
Copy link

@ttuegel, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dezgeg, @vandenoever and @vcunat to be potential reviewers.

ttuegel and others added 7 commits March 4, 2017 15:08
Qt 5.8 is now the default version.
Fix build failure with Qt 5.8.0
Build fails with Qt 5.8 due to an ambiguous overloaded member function.
So that pkg-config can be used to find 'moc' etc. (Currently it points
to a non-existing path.)

Fixes NixOS#22945 ('Linux kbuild incompatible with "nix-shell -p qt5.full"').
@ttuegel
Copy link
Member Author

ttuegel commented Mar 4, 2017

@bjornfor I added your mass-rebuild Qt patch to this branch. I tweaked it slightly because I missed some Darwin-specific fixes for Qt 5.8 when I updated.

The only way this will get tested is if Hydra builds it, so I'm sending it into staging now.

@ttuegel ttuegel merged commit 5e9a356 into NixOS:staging Mar 4, 2017
@ttuegel ttuegel deleted the plasma-5.9 branch March 4, 2017 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants