Skip to content

plasma5: 5.22.5 -> 5.23.0#141670

Closed
andrevmatos wants to merge 3 commits intoNixOS:stagingfrom
andrevmatos:kde/plasma5
Closed

plasma5: 5.22.5 -> 5.23.0#141670
andrevmatos wants to merge 3 commits intoNixOS:stagingfrom
andrevmatos:kde/plasma5

Conversation

@andrevmatos
Copy link
Member

@andrevmatos andrevmatos commented Oct 14, 2021

Motivation for this change

Based on staging because it seems to require #141128 , which is still pending. Pulling only the PR patches for frameworks 5.87 (and the base, 5.86, also still on staging) is enough to get this built on top of master.
I'm running this fine here on Wayland. Still testing.
If anyone wants to contribute and extend, feel free to do so.

Observed issues so far with this build:
  • digital clock widget is empty/invisible; it seems some template string is broken
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Oct 14, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Oct 14, 2021
@nyanloutre
Copy link
Member

This apparently fix this bug : https://bugs.kde.org/show_bug.cgi?id=441904

I will test it

Comment on lines 12 to +13
'';
preBuild = ''
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
'';
preBuild = ''

kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
kwindowsystem kdeclarative plasma-framework
kwindowsystem kdeclarative plasma-framework wayland-scanner wayland
Copy link
Member

@SuperSandro2000 SuperSandro2000 Oct 15, 2021

Choose a reason for hiding this comment

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

wayland-scanner goes to nativeBuildInputs IIRC you may need to add protocols to buildInputs.

./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
# Fix build against libglvnd 1.3.4+
# Remove with release 5.22.90
(fetchpatch {
Copy link
Member

Choose a reason for hiding this comment

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

Please remove the unused fetchpatch from inputs.

buildInputs = [ kwayland libXrandr qtx11extras ];
buildInputs = [
kwayland libXrandr qtx11extras
plasma-wayland-protocols wayland-scanner wayland
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
plasma-wayland-protocols wayland-scanner wayland
plasma-wayland-protocols wayland

wayland-scanner goes to native.

./hwclock-path.patch
./tzdir.patch
# https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/563
(fetchpatch {
Copy link
Member

Choose a reason for hiding this comment

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

Please remove the unused fetchpatch from inputs.

@bhankas
Copy link
Contributor

bhankas commented Oct 17, 2021

There seems to be another PR open for same (#139657). Can we consolidate efforts into single PR?

@andrevmatos andrevmatos mentioned this pull request Oct 17, 2021
12 tasks
@andrevmatos
Copy link
Member Author

Yes, I just spotted it, weirdly it seems to have been created after mine, but PR number is lower, therefore I'll close this draft in favor of that one.

@andrevmatos andrevmatos deleted the kde/plasma5 branch June 21, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants