Skip to content

Update Qt 5.15 patches#166933

Merged
ttuegel merged 4 commits intoNixOS:stagingfrom
ttuegel:staging-qt-5-patches
Apr 13, 2022
Merged

Update Qt 5.15 patches#166933
ttuegel merged 4 commits intoNixOS:stagingfrom
ttuegel:staging-qt-5-patches

Conversation

@ttuegel
Copy link
Copy Markdown
Member

@ttuegel ttuegel commented Apr 2, 2022 •
edited
Loading

Description of changes
  1. Update Qt 5.15 patches from the KDE patch set.
  2. Build qtbase with libdrm as required for qtwayland. Remove a patch that worked around the missing libdrm.
  3. Fix how in-tree patches are included in Qt 5 modules.
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Apr 2, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 2, 2022
@ttuegel
Copy link
Copy Markdown
Member Author

ttuegel commented Apr 3, 2022

I'm still running nixpkgs-review, but I did run the Plasma test for NixOS without trouble.

ttuegel added 4 commits April 6, 2022 08:52
@ttuegel
qt515: update KDE patches
a4fbb92
@ttuegel
qtModule: allow shared patches
dc7f259 
Allow modules to include version-independent patches in addition to
version-dependent packages. Prior to this change, modules could only provide
version-independent patches _instead of_ version-dependent patches.
@ttuegel
qtbase: build with libdrm
40b789c 
qtwayland requires qtbase to be built with libdrm support, and other modules
might benefit from it, too.
@ttuegel
qtwayland: include app_id patch in module definition
35e673d
@ttuegel ttuegel force-pushed the staging-qt-5-patches branch from cc1cf9d to 35e673d Compare April 6, 2022 13:53
@sternenseemann sternenseemann mentioned this pull request Apr 7, 2022
Closed
@periklis periklis removed their request for review April 13, 2022 12:49
@ttuegel
Copy link
Copy Markdown
Member Author

ttuegel commented Apr 13, 2022

I finally finished rebuilding everything. I didn't find any new failures.

@ttuegel ttuegel merged commit 45f6ec7 into NixOS:staging Apr 13, 2022
@ttuegel ttuegel deleted the staging-qt-5-patches branch April 13, 2022 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@qknight qknight Awaiting requested review from qknight

@bkchr bkchr Awaiting requested review from bkchr

@abbradar abbradar Awaiting requested review from abbradar

Assignees

No one assigned

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@ttuegel