summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/bluedevil/Manifest4
-rw-r--r--kde-plasma/bluedevil/bluedevil-5.24.4.ebuild (renamed from kde-plasma/bluedevil/bluedevil-5.22.5.ebuild)4
-rw-r--r--kde-plasma/bluedevil/bluedevil-5.24.5.ebuild (renamed from kde-plasma/bluedevil/bluedevil-5.23.3.ebuild)4
-rw-r--r--kde-plasma/breeze-grub/Manifest4
-rw-r--r--kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild (renamed from kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild)2
-rw-r--r--kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild (renamed from kde-plasma/breeze-grub/breeze-grub-5.23.3.ebuild)4
-rw-r--r--kde-plasma/breeze-gtk/Manifest4
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild (renamed from kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild)3
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild (renamed from kde-plasma/breeze-gtk/breeze-gtk-5.23.3-r1.ebuild)5
-rw-r--r--kde-plasma/breeze-gtk/files/breeze-gtk-5.23.3-fix-unneeded-outline.patch52
-rw-r--r--kde-plasma/breeze-plymouth/Manifest4
-rw-r--r--kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild (renamed from kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild)4
-rw-r--r--kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild (renamed from kde-plasma/breeze-plymouth/breeze-plymouth-5.23.3.ebuild)4
-rw-r--r--kde-plasma/breeze/Manifest4
-rw-r--r--kde-plasma/breeze/breeze-5.24.4.ebuild (renamed from kde-plasma/breeze/breeze-5.22.5.ebuild)8
-rw-r--r--kde-plasma/breeze/breeze-5.24.5.ebuild (renamed from kde-plasma/breeze/breeze-5.23.3.ebuild)8
-rw-r--r--kde-plasma/discover/Manifest4
-rw-r--r--kde-plasma/discover/discover-5.24.4.ebuild (renamed from kde-plasma/discover/discover-5.22.5.ebuild)17
-rw-r--r--kde-plasma/discover/discover-5.24.5.ebuild (renamed from kde-plasma/discover/discover-5.23.3.1.ebuild)10
-rw-r--r--kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch30
-rw-r--r--kde-plasma/drkonqi/Manifest4
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.24.4.ebuild (renamed from kde-plasma/drkonqi/drkonqi-5.22.5.ebuild)6
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.24.5.ebuild (renamed from kde-plasma/drkonqi/drkonqi-5.23.3.ebuild)4
-rw-r--r--kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch37
-rw-r--r--kde-plasma/kactivitymanagerd/Manifest4
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kde-cli-tools/Manifest4
-rw-r--r--kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild (renamed from kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild (renamed from kde-plasma/kde-cli-tools/kde-cli-tools-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kde-gtk-config/Manifest4
-rw-r--r--kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch25
-rw-r--r--kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild (renamed from kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild)6
-rw-r--r--kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild (renamed from kde-plasma/kde-gtk-config/kde-gtk-config-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kdecoration/Manifest4
-rw-r--r--kde-plasma/kdecoration/kdecoration-5.24.4.ebuild (renamed from kde-plasma/kdecoration/kdecoration-5.22.5.ebuild)5
-rw-r--r--kde-plasma/kdecoration/kdecoration-5.24.5.ebuild (renamed from kde-plasma/kdecoration/kdecoration-5.23.3.ebuild)5
-rw-r--r--kde-plasma/kdeplasma-addons/Manifest4
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch65
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch31
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-weather-fix-cursor.patch35
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch61
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch47
-rw-r--r--kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch44
-rw-r--r--kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild (renamed from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild)12
-rw-r--r--kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild (renamed from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild)7
-rw-r--r--kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild71
-rw-r--r--kde-plasma/kdeplasma-addons/metadata.xml1
-rw-r--r--kde-plasma/kgamma/Manifest4
-rw-r--r--kde-plasma/kgamma/kgamma-5.24.4.ebuild (renamed from kde-plasma/kgamma/kgamma-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kgamma/kgamma-5.24.5.ebuild (renamed from kde-plasma/kgamma/kgamma-5.23.3.ebuild)4
-rw-r--r--kde-plasma/khotkeys/Manifest4
-rw-r--r--kde-plasma/khotkeys/files/khotkeys-5.23.3-delete-widgets-w-entry.patch118
-rw-r--r--kde-plasma/khotkeys/khotkeys-5.24.4.ebuild (renamed from kde-plasma/khotkeys/khotkeys-5.22.5.ebuild)4
-rw-r--r--kde-plasma/khotkeys/khotkeys-5.24.5.ebuild (renamed from kde-plasma/khotkeys/khotkeys-5.23.3-r1.ebuild)6
-rw-r--r--kde-plasma/kinfocenter/Manifest4
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild (renamed from kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild)37
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild (renamed from kde-plasma/kinfocenter/kinfocenter-5.23.3.ebuild)35
-rw-r--r--kde-plasma/kinfocenter/metadata.xml3
-rw-r--r--kde-plasma/kmenuedit/Manifest4
-rw-r--r--kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild (renamed from kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild (renamed from kde-plasma/kmenuedit/kmenuedit-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kscreen/Manifest4
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch31
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch31
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch28
-rw-r--r--kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch29
-rw-r--r--kde-plasma/kscreen/kscreen-5.24.4.ebuild (renamed from kde-plasma/kscreen/kscreen-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild52
-rw-r--r--kde-plasma/kscreen/kscreen-5.24.5.ebuild (renamed from kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild)6
-rw-r--r--kde-plasma/kscreenlocker/Manifest4
-rw-r--r--kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild (renamed from kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild)8
-rw-r--r--kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild (renamed from kde-plasma/kscreenlocker/kscreenlocker-5.23.3.ebuild)8
-rw-r--r--kde-plasma/ksshaskpass/Manifest4
-rw-r--r--kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild (renamed from kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild)4
-rw-r--r--kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild (renamed from kde-plasma/ksshaskpass/ksshaskpass-5.23.3.ebuild)4
-rw-r--r--kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch21
-rw-r--r--kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch59
-rw-r--r--kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild (renamed from kde-plasma/ksysguard/ksysguard-5.22.0.ebuild)21
-rw-r--r--kde-plasma/ksystemstats/Manifest4
-rw-r--r--kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild (renamed from kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild)9
-rw-r--r--kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild (renamed from kde-plasma/ksystemstats/ksystemstats-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kwallet-pam/Manifest4
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild (renamed from kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild (renamed from kde-plasma/kwallet-pam/kwallet-pam-5.23.3.ebuild)4
-rw-r--r--kde-plasma/kwayland-integration/Manifest4
-rw-r--r--kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild (renamed from kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild)15
-rw-r--r--kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild (renamed from kde-plasma/kwayland-integration/kwayland-integration-5.23.3.ebuild)9
-rw-r--r--kde-plasma/kwayland-server/Manifest4
-rw-r--r--kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch109
-rw-r--r--kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch57
-rw-r--r--kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch73
-rw-r--r--kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch44
-rw-r--r--kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch44
-rw-r--r--kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild46
-rw-r--r--kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild (renamed from kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild)19
-rw-r--r--kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild (renamed from kde-plasma/kwayland-server/kwayland-server-5.23.3.ebuild)13
-rw-r--r--kde-plasma/kwin/Manifest4
-rw-r--r--kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch63
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.3-enable-window-rules-for-all-xdg-toplevel.patch132
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch49
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.3-revert-2560288e.patch35
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch32
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch214
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch26
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch41
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch50
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch44
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch93
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch36
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch32
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch65
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch59
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch42
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch32
-rw-r--r--kde-plasma/kwin/kwin-5.24.4-r1.ebuild145
-rw-r--r--kde-plasma/kwin/kwin-5.24.5-r1.ebuild (renamed from kde-plasma/kwin/kwin-5.22.5.ebuild)36
-rw-r--r--kde-plasma/kwin/kwin-5.24.5.ebuild (renamed from kde-plasma/kwin/kwin-5.23.3-r1.ebuild)23
-rw-r--r--kde-plasma/kwrited/Manifest4
-rw-r--r--kde-plasma/kwrited/kwrited-5.24.4.ebuild (renamed from kde-plasma/kwrited/kwrited-5.22.5.ebuild)4
-rw-r--r--kde-plasma/kwrited/kwrited-5.24.5.ebuild (renamed from kde-plasma/kwrited/kwrited-5.23.3.ebuild)4
-rw-r--r--kde-plasma/layer-shell-qt/Manifest4
-rw-r--r--kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild (renamed from kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild)5
-rw-r--r--kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild (renamed from kde-plasma/layer-shell-qt/layer-shell-qt-5.23.3.ebuild)5
-rw-r--r--kde-plasma/libkscreen/Manifest4
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.24.4.ebuild (renamed from kde-plasma/libkscreen/libkscreen-5.22.5.ebuild)15
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.24.5.ebuild (renamed from kde-plasma/libkscreen/libkscreen-5.23.3.ebuild)15
-rw-r--r--kde-plasma/libksysguard/Manifest4
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch28
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.24.4.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.22.5.ebuild)7
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.24.5.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.23.3.ebuild)4
-rw-r--r--kde-plasma/libkworkspace/Manifest4
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch108
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch48
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild)6
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild)9
-rw-r--r--kde-plasma/milou/Manifest4
-rw-r--r--kde-plasma/milou/milou-5.24.4.ebuild (renamed from kde-plasma/milou/milou-5.22.5.ebuild)4
-rw-r--r--kde-plasma/milou/milou-5.24.5.ebuild (renamed from kde-plasma/milou/milou-5.23.3.ebuild)4
-rw-r--r--kde-plasma/oxygen/Manifest4
-rw-r--r--kde-plasma/oxygen/oxygen-5.24.4.ebuild (renamed from kde-plasma/oxygen/oxygen-5.22.5.ebuild)11
-rw-r--r--kde-plasma/oxygen/oxygen-5.24.5.ebuild (renamed from kde-plasma/oxygen/oxygen-5.23.3.ebuild)11
-rw-r--r--kde-plasma/plasma-browser-integration/Manifest4
-rw-r--r--kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild (renamed from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild)5
-rw-r--r--kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild (renamed from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.3.ebuild)5
-rw-r--r--kde-plasma/plasma-desktop/Manifest5
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch132
-rw-r--r--kde-plasma/plasma-desktop/metadata.xml1
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild)15
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild)18
-rw-r--r--kde-plasma/plasma-disks/Manifest4
-rw-r--r--kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild (renamed from kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild (renamed from kde-plasma/plasma-disks/plasma-disks-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-firewall/Manifest4
-rw-r--r--kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild (renamed from kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild)4
-rw-r--r--kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild (renamed from kde-plasma/plasma-firewall/plasma-firewall-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-integration/Manifest4
-rw-r--r--kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild (renamed from kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild (renamed from kde-plasma/plasma-integration/plasma-integration-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-meta/metadata.xml1
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild)7
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.23.3.ebuild)7
-rw-r--r--kde-plasma/plasma-nm/Manifest4
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild)15
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-pa/Manifest4
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild (renamed from kde-plasma/plasma-pa/plasma-pa-5.23.3.ebuild)6
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild (renamed from kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild)11
-rw-r--r--kde-plasma/plasma-sdk/Manifest4
-rw-r--r--kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild (renamed from kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild (renamed from kde-plasma/plasma-sdk/plasma-sdk-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-systemmonitor/Manifest4
-rw-r--r--kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild (renamed from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild (renamed from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-thunderbolt/Manifest4
-rw-r--r--kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild (renamed from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild (renamed from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-vault/Manifest4
-rw-r--r--kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild (renamed from kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild (renamed from kde-plasma/plasma-vault/plasma-vault-5.23.3.ebuild)4
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/Manifest4
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild)2
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.3.ebuild)2
-rw-r--r--kde-plasma/plasma-workspace/Manifest4
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch33
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch35
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch30
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch75
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch41
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch54
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch40
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch92
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch137
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch34
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch41
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch72
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch39
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch30
-rw-r--r--kde-plasma/plasma-workspace/metadata.xml2
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild)51
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild226
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.24.5.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild)45
-rw-r--r--kde-plasma/plymouth-kcm/Manifest4
-rw-r--r--kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild (renamed from kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild)4
-rw-r--r--kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild (renamed from kde-plasma/plymouth-kcm/plymouth-kcm-5.23.3.ebuild)4
-rw-r--r--kde-plasma/polkit-kde-agent/Manifest4
-rw-r--r--kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild (renamed from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild)4
-rw-r--r--kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild (renamed from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.3.ebuild)4
-rw-r--r--kde-plasma/powerdevil/Manifest4
-rw-r--r--kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch71
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.24.4.ebuild (renamed from kde-plasma/powerdevil/powerdevil-5.22.5.ebuild)7
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.24.5.ebuild (renamed from kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild)9
-rw-r--r--kde-plasma/sddm-kcm/Manifest4
-rw-r--r--kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild (renamed from kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild)5
-rw-r--r--kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild (renamed from kde-plasma/sddm-kcm/sddm-kcm-5.23.3.ebuild)4
-rw-r--r--kde-plasma/systemsettings/Manifest4
-rw-r--r--kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch27
-rw-r--r--kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch32
-rw-r--r--kde-plasma/systemsettings/systemsettings-5.24.4.ebuild (renamed from kde-plasma/systemsettings/systemsettings-5.22.5.ebuild)8
-rw-r--r--kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild65
-rw-r--r--kde-plasma/systemsettings/systemsettings-5.24.5.ebuild (renamed from kde-plasma/systemsettings/systemsettings-5.23.3.ebuild)4
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/Manifest4
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch32
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild (renamed from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild)10
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild48
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5.ebuild (renamed from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.3.ebuild)10
-rw-r--r--kde-plasma/xembed-sni-proxy/Manifest4
-rw-r--r--kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild (renamed from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild)4
-rw-r--r--kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild (renamed from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.3.ebuild)4
229 files changed, 3302 insertions, 1772 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index da5e083c7dee..f9382b305060 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
-DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
-DIST bluedevil-5.23.3.tar.xz 171180 BLAKE2B 90cafca76cd93520ace67749b856019d8bc6d1e80dc5a6316354316b7307fe73f9ebfc1682851d9cb79b42299feeafac0d1e11308f017c471c0219bc84a7ec48 SHA512 726b7f11ebd9759dddb869f87d62175f96fbea5bd6ff33cf86b4c132c52167fcb9ad4426a807c4aae7011f184941297bfb939f8e2fd522e31e43f3df32cebc5f
+DIST bluedevil-5.24.4.tar.xz 173188 BLAKE2B 5a576132bdc2b96960bb5e374f84cf0e4653f8b1973147ebf31a432d4a0246ef0e4038ee4de3b0c4bc37e06946e094fd6452d1c8f35ea7fb7ec91877572770ef SHA512 90501c9b71a2a509275d105b3d29b397c9845ce6c66239168f38fb54e89909744210243cab41ac24dcdb38e5988429b94622bf05715537edcd011508b6bf5957
+DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild
index c4ed728f052b..b556abdcbb05 100644
--- a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
index a5596eaace02..0f52e59f206e 100644
--- a/kde-plasma/bluedevil/bluedevil-5.23.3.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 9abdb06599cf..2adcb658cf49 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
-DIST breeze-grub-5.23.3.tar.xz 3145652 BLAKE2B 1dfb2b1dd9ed4cd7beea2189a16a62d0a76ae6680eae631862f3e9401cc74c7b18032d49cde06def7a047924a2571b4b6ab56457fcdb264412fcd6214f19fb30 SHA512 03737c1681f2f4b1234f9dfdbed015501ae4f36e71655029b3777c5e4275a3265239a4272298d229420a4758f0417c87bed81e149928b74c1db1c12854e96749
+DIST breeze-grub-5.24.4.tar.xz 3143308 BLAKE2B 522acf1644e325b9bb965dabaa49a257b7eff12351a483dc9acff4f7565f0f6d8fb9ea2b808aa869a54422161c8abacd9e3d38531c87c622a4ee0a29ddace3b7 SHA512 0275e69f046ac61c1b159cc4f4eb78a605fffa9be809fd3b9752fa928906e94ff7af085a1ed917b2973ac626c260c2f3528b17afb2cd07171a650089bad26425
+DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild
index 4928f6df65ef..7551a15b6314 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.23.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
index e05a4cd33bed..af842b702646 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.23.3.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
LICENSE="GPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 121ffea3cbd0..8484606f6991 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
-DIST breeze-gtk-5.23.3.tar.xz 47608 BLAKE2B 2bda56f8a0c3d7f40bb72518d7976f860246cdc5dbe483a5b0ca33d05ae83e5e61a41ddd48051b1c496c01a14121edd6526f367963449d700698a7f6f4049fb5 SHA512 91772c13b7a055d8fcfe452871009412337b0dbda3f34df1c9060ba682cc86de785e2c7709a43685aa6b69e740a89dc2bfcf88af3738e69103c4a65ef216c117
+DIST breeze-gtk-5.24.4.tar.xz 43796 BLAKE2B 2aa910eecd6030d10dbfa91cd8011386512fe7afb491aedd289acf2b69f5a4c6af4feb236e9ca92a51c4f90d705b470bbae299776bc5a9bef910512d548a27e7 SHA512 f131efd7405cbfbf8e577bd2fa9f499963809f9a4fce003add737523b758e062f4735ce8969a60c1641d97445a141d05bfe03dd7785106c372bbc78ebf6c1602
+DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild
index 706ef57ba239..db378cc0e98b 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
dev-lang/sassc
$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
- >=dev-util/cmake-3.16
>=kde-plasma/breeze-${PVCUT}:5
"
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.23.3-r1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
index 93b076e2fed7..325c2a0fc59f 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.23.3-r1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,12 +18,9 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
dev-lang/sassc
$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
- >=dev-util/cmake-3.16
>=kde-plasma/breeze-${PVCUT}:5
"
-PATCHES=( "${FILESDIR}/${P}-fix-unneeded-outline.patch" ) # KDE-bug 443626
-
python_check_deps() {
has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
}
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.23.3-fix-unneeded-outline.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.23.3-fix-unneeded-outline.patch
deleted file mode 100644
index b835094140a5..000000000000
--- a/kde-plasma/breeze-gtk/files/breeze-gtk-5.23.3-fix-unneeded-outline.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6834ee83d09b7c56fbe3d137b660db25484573f3 Mon Sep 17 00:00:00 2001
-From: Yaroslav Sidlovsky <zawertun@gmail.com>
-Date: Thu, 18 Nov 2021 14:15:36 +0300
-Subject: [PATCH] Fixed toolbar buttons style, removing unneeded outline
-
-BUG: 443626
-
-
-(cherry picked from commit 23ba2a8dc728cd7105e5994ed1d4dc143f7d69a1)
----
- src/gtk3/widgets/_button.scss | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/gtk3/widgets/_button.scss b/src/gtk3/widgets/_button.scss
-index 4bd0ce7..e7250ee 100644
---- a/src/gtk3/widgets/_button.scss
-+++ b/src/gtk3/widgets/_button.scss
-@@ -176,6 +176,7 @@ $_dot_color: gtk("@theme_button_decoration_focus");
-
- @include button(normal);
- &.flat {
-+ @include button(undecorated);
- // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
- // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but
- // it won't fade out when the pointer leave the button allocation area. To make the transition more evident
-@@ -228,12 +229,15 @@ $_dot_color: gtk("@theme_button_decoration_focus");
- }
- &.flat:backdrop {
- -gtk-icon-effect: none;
-+ @include button(undecorated);
- color: gtk("@theme_button_foreground_backdrop");
- }
- &.flat:disabled {
-+ @include button(undecorated);
- color: gtk("@theme_button_foreground_insensitive");
- }
- &.flat:backdrop:disabled {
-+ @include button(undecorated);
- color: gtk("@theme_button_foreground_backdrop_insensitive");
- }
- &:disabled {
-@@ -357,6 +361,7 @@ button {
- &.flat:backdrop,
- &.flat:disabled,
- &.flat:backdrop:disabled {
-+ @include button(undecorated);
- color: gtkalpha($button_color, 0.8);
- }
- &:disabled {
---
-GitLab
-
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 273e00de1f41..adf2face6e3f 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
-DIST breeze-plymouth-5.23.3.tar.xz 110572 BLAKE2B 6a4fcc6b2dab223b4d1eabd4906488383f8c28cad5196190fe0cad99c2d1705060ba5cd1270f9ecdc6a9943de2159bb124d3188ff72392c81c47dfff4ec7e4a3 SHA512 80742a019f149840c2aeb463deb52f139091102cc584ad5b200aadb09258beefabea0f7a36166fbd821dcc0b5493da16307f5efba6258f78d40d04de26aa889a
+DIST breeze-plymouth-5.24.4.tar.xz 110792 BLAKE2B 4a8e7f9328e20a0c5d0fe182be0af32ee009ed8210c50adff7e8ff25956dc17309e92c9d3ac64a6b2b79826bd00f74a30d6d49a68bf88d6744db6894e9220592 SHA512 b5cb5b845a28c3bb2eb39df5896f95fe46f280cd7d736bba11cebe52c43f77f989e96200d7cb861d57067ec908da34126d44b6f1847507135a1190812fb14436
+DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild
index f5cd73b9ebd6..188483457ed0 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
inherit cmake kde.org
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
index ec9a8ea4970a..9f8cb32ddecb 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.3.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
inherit cmake kde.org
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index b2d2cf35ad7e..9163eae66b0a 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
-DIST breeze-5.23.3.tar.xz 73813760 BLAKE2B d12713b7b155eaab00e224ec6a638c583e5ddc35c2fceae884df06eab30d4c364002ed3dab671a268270f1ee1f63bf2261e30924c442fcdd266a5ac9b5d293ed SHA512 53fe6657fa34a95e1eb0772761b9fe3c783755824c077b6fa5e01557448cb471379138e8ddc6a837bfb6e712c8890b14fe9641938ee8d4bf04cdca89a485c093
+DIST breeze-5.24.4.tar.xz 43037332 BLAKE2B 2ce9d430291610f58aec732b7dcf8dc36c591a17ba0481f891faf18c7b2b2bbe3dbc0ba0a519a25c7b083de75d899bbab95886fed3b3b3c51ad8b300f1caffbd SHA512 476d01b61696bc0886c172b883df382ca9cd9128b81fadbcf3135e0f2e70789faa96a536a998267074f31e9145b4b2de4c62e47e8752b352f2702e797023e6ce
+DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0
diff --git a/kde-plasma/breeze/breeze-5.22.5.ebuild b/kde-plasma/breeze/breeze-5.24.4.ebuild
index afeb0d84c6cb..3d50e72e704a 100644
--- a/kde-plasma/breeze/breeze-5.22.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -35,9 +35,7 @@ RDEPEND="
>=kde-plasma/kdecoration-${PVCUT}:5
X? ( x11-libs/libxcb )
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kpackage-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
PDEPEND="
>=kde-frameworks/breeze-icons-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/breeze/breeze-5.23.3.ebuild b/kde-plasma/breeze/breeze-5.24.5.ebuild
index 76a474649d74..85267450136c 100644
--- a/kde-plasma/breeze/breeze-5.23.3.ebuild
+++ b/kde-plasma/breeze/breeze-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -35,9 +35,7 @@ RDEPEND="
>=kde-plasma/kdecoration-${PVCUT}:5
X? ( x11-libs/libxcb )
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kpackage-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
PDEPEND="
>=kde-frameworks/breeze-icons-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index df449f8ff8ac..47a13aa1d86b 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,2 @@
-DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
-DIST discover-5.23.3.1.tar.xz 8237056 BLAKE2B e7c1fe93c263185add04824d2a7196f6059134d92ba6dd93c7a46d23a00888a725c611b3824b88a2e5132874b1fbaab46278e97eb0f971e0c2722cdc1318f93a SHA512 99a625a53772624dc626c347500a74196bf7c9c9444aa37523516aae24b536bf160b46b084f8faa189c0fccc6c520f453ffd3d61b753f4d0965d337421ab2029
+DIST discover-5.24.4.tar.xz 8260620 BLAKE2B 3e908ee51eaac93254ab11be2f5961ad7f1fd0162335c855db412067db489e1c47846f089e61ff13096bc567b94329a18bedbcbf18712b68f0119c353a07c5c5 SHA512 d11fa406c9a44047de94b1e4047367205d35a142aecda79df934603a0c2cf04b761054235b3acd28030d6ee48f64005b44baf154ca4a279b5396268f75fc7191
+DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
diff --git a/kde-plasma/discover/discover-5.22.5.ebuild b/kde-plasma/discover/discover-5.24.4.ebuild
index 72f770eee56d..be46b5a49318 100644
--- a/kde-plasma/discover/discover-5.22.5.ebuild
+++ b/kde-plasma/discover/discover-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -46,7 +46,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
firmware? ( >=sys-apps/fwupd-1.5.0 )
flatpak? (
- >=dev-libs/appstream-0.12.8:=
+ >=dev-libs/appstream-0.14.4:=
sys-apps/flatpak
)
telemetry? ( dev-libs/kuserfeedback:5 )
@@ -56,15 +56,16 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
- "${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
- ecm_punt_bogus_dep KF5 Archive
+ ecm_punt_kf_module Archive
+ # we don't do anything with this
+ sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+ -e "s/^pkg_check_modules.*Ostree/#&/" \
+ -i CMakeLists.txt || die
}
src_configure() {
diff --git a/kde-plasma/discover/discover-5.23.3.1.ebuild b/kde-plasma/discover/discover-5.24.5.ebuild
index ffb613b84536..67d530c388e1 100644
--- a/kde-plasma/discover/discover-5.23.3.1.ebuild
+++ b/kde-plasma/discover/discover-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -61,7 +61,11 @@ PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
- ecm_punt_bogus_dep KF5 Archive
+ ecm_punt_kf_module Archive
+ # we don't do anything with this
+ sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+ -e "s/^pkg_check_modules.*Ostree/#&/" \
+ -i CMakeLists.txt || die
}
src_configure() {
diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
deleted file mode 100644
index e2c21ac1b997..000000000000
--- a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 1 Jul 2021 22:24:40 +0200
-Subject: [PATCH] Make building updates KCM optional
-
-Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa27fc77a..26387b2f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
- add_subdirectory(discover)
- add_subdirectory(exporter)
- add_subdirectory(update)
--add_subdirectory(kcm)
-+
-+option(WITH_KCM "Build and install the updates KCM" ON)
-+if(WITH_KCM)
-+ add_subdirectory(kcm)
-+endif()
-
- option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
- if(WITH_NOTIFIER)
---
-GitLab
-
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 7aae37edc525..483bb4fe5d86 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,2 @@
-DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
-DIST drkonqi-5.23.3.tar.xz 792904 BLAKE2B c43960357687c76faf785ba97da50cdc6fc735530baa8d3ffa99e241f7210c8a23ac68d43d0531f757b72504d36839cc1b6c0d6b98167392d7f7fbaa99a7d3ee SHA512 b7669eae07021fb8e9aa09185c3478667a3b48a209513d6eb814909099dbeef386afe892b922a030dac780503a9ffecbe57f44b169b493bd5c0434e32194bc5c
+DIST drkonqi-5.24.4.tar.xz 795152 BLAKE2B 8dcd661657a529bbfbdac60ddd71fbb424c6646122945ac3587c29e7f4667556bf6e4730c25a4658279308b4b109cefe2663d5a9612cfe4cbc7d16cf23a935c2 SHA512 9b0fb85a7df964e670761d4a1e9ea8601c64a478247ada2ec7a1a8d420a64f33b85b94f2d7f6db20365f499656653644cfc703bf8f10311fefa42fdebeaac9f1
+DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild
index 3fe7e2fb89d4..0489a66fa83a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -46,8 +46,6 @@ RDEPEND="${COMMON_DEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-5.22.3-unused-dep.patch" )
-
src_test() {
# needs network access, bug #698510
local myctestargs=(
diff --git a/kde-plasma/drkonqi/drkonqi-5.23.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
index 8c03ecd357f4..7b77a04bebbb 100644
--- a/kde-plasma/drkonqi/drkonqi-5.23.3.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
deleted file mode 100644
index d34638be71f5..000000000000
--- a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 59dceeb53196063c568201d0c567bea7887b1cc4 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 3 Jul 2021 20:32:11 +0200
-Subject: [PATCH] Remove unused KService dep
-
----
- src/CMakeLists.txt | 1 -
- src/statusnotifier.cpp | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1c176188..6ec2120e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -96,7 +96,6 @@ target_link_libraries(
- DrKonqiInternal
- KF5::I18n
- KF5::CoreAddons
-- KF5::Service
- KF5::ConfigWidgets
- KF5::JobWidgets
- KF5::KIOCore
-diff --git a/src/statusnotifier.cpp b/src/statusnotifier.cpp
-index 41271874..c5f795c0 100644
---- a/src/statusnotifier.cpp
-+++ b/src/statusnotifier.cpp
-@@ -17,7 +17,6 @@
- #include <KIdleTime>
- #include <KLocalizedString>
- #include <KNotification>
--#include <KService>
- #include <KStatusNotifierItem>
-
- #include "crashedapplication.h"
---
-GitLab
-
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 60ea9acfe092..6a6f28465e9e 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,2 @@
-DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
-DIST kactivitymanagerd-5.23.3.tar.xz 104368 BLAKE2B 598d967fdc37bdf50853bb6b49fa48905822023e6aed1caa7542b93726783485752ee7f3c0593bac2765b181397f6d9a84523045a527f397c2f426fc47142e06 SHA512 7c5e683f646f34d68aed5435952d26c219cfa8306e076b728ef2f9519bed26b173b00b15acd7709b4f401a2a957013d21e6cc775e71d35e3d1232ee648da7bd2
+DIST kactivitymanagerd-5.24.4.tar.xz 105184 BLAKE2B db0a37ec38410352c5ebbda15be0b4c3502626841cfdaf998df7af0cfd64345244e2d0aa4aa34826affac3a1deb72c50be80e49ad981da5cb26ec8f165231c72 SHA512 8d088d018db467fe838104a0217d23fe0649f863b66e72d7c75947d77f71204270f682bfd7dfd6c7ccf2aac4d3591f02dca9ebd3c70a2fc184ef9fc5689cd326
+DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild
index ba0601edbc10..a2e2bf34c5d2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
index ad18b9fd8faa..87126d8750aa 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.3.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index be57f5f8a307..baab021370cf 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
-DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
-DIST kde-cli-tools-5.23.3.tar.xz 631848 BLAKE2B b55c01423f81d58932a9cd6b79b7dbb2a92b2a1fdabaea208c817fc13c4561752aa9c6263e6f504d5b8a10e3a16f2e46133d76b71c350e222a4fad745c6d6efd SHA512 0800e88dcb82f2aa24e643b124138ac0abe45b0cbace4364f90fc23bc9d9f137f13344afa21a9cd1b3942fc91000b91de30eb0daf03fb53676e23a7eb08533ad
+DIST kde-cli-tools-5.24.4.tar.xz 632548 BLAKE2B d98bb0bfea948812f119d3f500967fe4bc4288bf2f74fa06c6ea967e52ef94fefce052c4b3aa35e5dfa9545f0981ad5f1940ff4b72116a4634c78ceef97f32a3 SHA512 3526ebf755475f6f32d1d74c74f1808fba36945891f2af2b113c95279508cf4576c72e445fe79e7a054fffc8b5be16c5952935f4f3557c17775e4266549b7b6f
+DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild
index 0469158c261e..a004399d626b 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
index 656d0a4e757a..01626b69fa9a 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.3.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index eefb4aa8ec41..bd04d3621de7 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
-DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
-DIST kde-gtk-config-5.23.3.tar.xz 71088 BLAKE2B 77d4967ee4524aa7639865c8599334df6aee8d81077eb4477e791ca85ae9a6fb4619ec230482a0d860af37c75b58d0cae04f3c756e018985780c77514622f92c SHA512 44a9030af6079b8a1723a41cb6f92435990869da3b8feffadefc22f83c0eded21abd6f2301e83089ca85d17aabd341d2be72e47b173dbd684b1e8cf4399f9146
+DIST kde-gtk-config-5.24.4.tar.xz 71580 BLAKE2B 438334ecffacd6ec3c1dbb130b64fa566d509f96e81920205278d0928c47196cde62bca34602041bd05594ea79548f633733d711b9501e722c0091e731b7b7c3 SHA512 ac2df456007925879027bb44b28aedab50d1cefd3c493e3688764dad90536958fb27990cc340e1956434bf6fd1440f46bc5e8a95f7f9f5b7e33420d4c32e42b1
+DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
deleted file mode 100644
index 77831e3ebb21..000000000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 090cfb2db4bc9c032cd7a7c12cf2a317c248e3c6 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Mon, 2 Aug 2021 13:52:38 +0200
-Subject: [PATCH] Drop unused dependency on gtk+-2.0
-
-FWICT it's not actually used anywhere.
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45d02ef..f102642 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,6 @@ find_package(Sass REQUIRED)
- find_package(XSettingsd)
-
- pkg_check_modules(GTK+3 REQUIRED IMPORTED_TARGET gtk+-3.0)
--pkg_check_modules(GTK+2 REQUIRED IMPORTED_TARGET gtk+-2.0)
- pkg_check_modules(GLib2 REQUIRED IMPORTED_TARGET glib-2.0)
- pkg_check_modules(GObject REQUIRED IMPORTED_TARGET gobject-2.0)
- pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
---
-GitLab
-
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild
index 58aaf0fd540d..8bbe52c868c7 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -40,8 +40,6 @@ BDEPEND="
dev-lang/sassc
"
-PATCHES=( "${FILESDIR}/${PN}-5.22.5-drop-gtk2-dep.patch" )
-
src_configure() {
local mycmakeargs=(
-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
index 8ebcf8b1fc84..0292f04f0263 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.3.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 54704005bee4..fe5f82499f9b 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
-DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
-DIST kdecoration-5.23.3.tar.xz 47340 BLAKE2B 46ceccf7fc314478500334d5269afd9cd09b510af9511925ff2b0b6205c89d73c1984a4ab4f2a5d079c17025a06767afa17a625d55c8de11e729625855c2c3ed SHA512 f56668f1533541e72590688a62ecc7e2c10128db974dc9815719a6dbb9c1af53aec0cdb1d8adb4a60a7fc6faa8b5ddb48fa963283435550abc6033d47d729b5d
+DIST kdecoration-5.24.4.tar.xz 48784 BLAKE2B 0714c129101481aa19b134bd04f6dbbbf41436513cd513097ee45e131818f75bad454b66baf9e9b3defc0239fe07f85a21d3b9b59bcb90d0e08be2944e223857 SHA512 2c8d3a276c71be757b333de58aa5b667cf182b606e8553f75db51414c51a5b38adc140da9c11b9753b1c0ba438ca267d3c32023d9c3c4eec43a2ed88c9fc56a8
+DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild
index 05ca73c822e3..dd18504d63bf 100644
--- a/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -19,6 +19,7 @@ IUSE=""
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.23.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
index be4395b9d913..8b05ae4be600 100644
--- a/kde-plasma/kdecoration/kdecoration-5.23.3.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -19,6 +19,7 @@ IUSE=""
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
"
RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 735dfc755fa5..eaf879aac46e 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
-DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
-DIST kdeplasma-addons-5.23.3.tar.xz 628756 BLAKE2B cdad86cfa30b6c8884cfae6b60e6478b4f39f451e9670404e0245e35bfad382f7116d6818049b7d0958fff99d3db25e3634c942ac9193c0d0b1384a51044d2f3 SHA512 d1908134c187f9a73288ce8c5c2f90db38714be450dff4591fbb748655dc9926949372b5f93d486700a8a6e725c8e12b4e471318f3bd61971b77052520ca8e8c
+DIST kdeplasma-addons-5.24.4.tar.xz 635392 BLAKE2B 5297560f822a44d3bfe2e73517df64c80f0f7917f25f955b6964dd36e422d9015854fa94c19d347a0859938691ef1b99e61a2a360371e3e9c9747966899ab554 SHA512 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4
+DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
deleted file mode 100644
index 485acd542a83..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Jul 2020 22:22:13 +0200
-Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
-
----
- CMakeLists.txt | 7 ++++++-
- applets/CMakeLists.txt | 4 +++-
- dataengines/CMakeLists.txt | 4 +++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c4697a52..e5d14bc8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- IconThemes
- KIO
- KCMUtils
-- Kross
- Notifications
- Plasma
- Runner
-@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- NewStuff
- )
-
-+find_package(KF5Kross CONFIG QUIET)
-+set_package_properties(KF5Kross PROPERTIES
-+ PURPOSE "Needed for Comic applet"
-+ TYPE OPTIONAL
-+)
-+
- find_package(KF5Purpose CONFIG QUIET)
- set_package_properties(KF5Purpose PROPERTIES
- DESCRIPTION "Framework for cross-application services and actions"
-diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
-index 93b637b1b..6af5ffc67 100644
---- a/applets/CMakeLists.txt
-+++ b/applets/CMakeLists.txt
-@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
- add_subdirectory(binary-clock)
- add_subdirectory(calculator)
- add_subdirectory(colorpicker)
--add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+ add_subdirectory(comic)
-+endif()
- add_subdirectory(dict)
- if(NOT WIN32)
- # uses the command line tool 'quota', does not make sense on Windows
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
-index 8d91dd84f..38f715b11 100644
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -1,3 +1,5 @@
-- add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+ add_subdirectory(comic)
-+endif()
- add_subdirectory(potd)
- add_subdirectory(konsoleprofiles)
---
-2.27.0
-
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
deleted file mode 100644
index 55fed8152434..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-mediaframe-fix-path-URLs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5e16b5ab644748fbf38c2b7fa7113d8dc99bcc28 Mon Sep 17 00:00:00 2001
-From: Patrick Northon <northon_patrick3@yahoo.ca>
-Date: Sun, 7 Nov 2021 20:36:45 -0500
-Subject: [PATCH] [mediaframe] Make files added from paths into URLs.
-
-This make it consistent with individual files added and fix a problem where the url isn't converted to a path properly in some conditions when the url doesn't contain the schema (file://).
-
-BUG: 445071
-
-
-(cherry picked from commit 181cc49c4d44a4ac926051ebf9a53d0a8fc6b253)
----
- applets/mediaframe/plugin/mediaframe.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/mediaframe/plugin/mediaframe.cpp b/applets/mediaframe/plugin/mediaframe.cpp
-index 45e37eeae..8729d7b83 100644
---- a/applets/mediaframe/plugin/mediaframe.cpp
-+++ b/applets/mediaframe/plugin/mediaframe.cpp
-@@ -125,7 +125,7 @@ void MediaFrame::add(const QString &path, AddOption option)
- while (dirIterator.hasNext()) {
- dirIterator.next();
-
-- filePath = dirIterator.filePath();
-+ filePath = "file://" + dirIterator.filePath();
- paths.append(filePath);
- m_allFiles.append(filePath);
- // qDebug() << "Appended" << filePath;
---
-GitLab
-
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-weather-fix-cursor.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-weather-fix-cursor.patch
deleted file mode 100644
index d5b5ea84f609..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.23.3-weather-fix-cursor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ea18868f6b49577b1349438d6e058199705a25b0 Mon Sep 17 00:00:00 2001
-From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-Date: Fri, 12 Nov 2021 15:55:50 +0000
-Subject: [PATCH] applets/weather: Make cursor a pointing hand when hovering
- over source link
-
-Currently it's a normal pointer, which doesn't indicate that it's a clickable link.
-
-
-(cherry picked from commit 508fde69075026db28e7078a7e105acf1cc9c102)
----
- applets/weather/package/contents/ui/FullRepresentation.qml | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/applets/weather/package/contents/ui/FullRepresentation.qml b/applets/weather/package/contents/ui/FullRepresentation.qml
-index dc1583032..4a6d4bdff 100644
---- a/applets/weather/package/contents/ui/FullRepresentation.qml
-+++ b/applets/weather/package/contents/ui/FullRepresentation.qml
-@@ -40,6 +40,13 @@ ColumnLayout {
-
- Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-
-+ MouseArea {
-+ anchors.fill: parent
-+ hoverEnabled: true
-+ acceptedButtons: Qt.NoButton
-+ cursorShape: !!parent.creditUrl ? Qt.PointingHandCursor : Qt.ArrowCursor
-+ }
-+
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignRight
- font {
---
-GitLab
-
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
new file mode 100644
index 000000000000..4cb01a05ba84
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
@@ -0,0 +1,61 @@
+https://invent.kde.org/plasma/kdeplasma-addons/-/commit/27710b95a3fd53019b4b053cbdf720354fd939d2
+https://bugs.kde.org/show_bug.cgi?id=452596
+https://bugs.gentoo.org/840755
+
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 17 Apr 2022 06:26:35 +0200
+Subject: [PATCH] Remove unneeded check for comic Dataengine being valid
+
+BUG: 452596
+
+We do not really care, if the metadata of the plugin is valid, as long as we can
+properly create the dataengine from it.
+
+Test Plan:
+With plasma-frameworks master, and this on Plasma/5.24 based revision, the dataengine can properly be loaded.
+
+When intenitionally exporting a defunct plugin:
+```cpp
+class Dummy : public QObject
+{
+ Q_OBJECT
+
+public:
+ Dummy(QObject *parent, const QVariantList &args) {
+ }
+};
+K_PLUGIN_CLASS_WITH_JSON(Dummy, "plasma-dataengine-comic.json")
+```
+The applet does not crash.
+--- a/applets/comic/comic.cpp
++++ b/applets/comic/comic.cpp
+@@ -465,7 +465,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
+ const QString id = mCurrent.id();
+ setConfigurationRequired(id.isEmpty());
+
+- if (!id.isEmpty() && mEngine && mEngine->isValid()) {
++ if (!id.isEmpty() && mEngine) {
+ setBusy(true);
+
+ const QString identifier = id + QLatin1Char(':') + identifierSuffix;
+@@ -485,7 +485,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
+ slotScaleToContent();
+ } else {
+ qWarning() << "Either no identifier was specified or the engine could not be created:"
+- << "id" << id << "engine valid:" << (mEngine && mEngine->isValid());
++ << "id" << id << "engine valid:" << mEngine;
+ setConfigurationRequired(true);
+ }
+ updateContextMenu();
+--- a/applets/comic/comicarchivejob.cpp
++++ b/applets/comic/comicarchivejob.cpp
+@@ -80,7 +80,7 @@ bool ComicArchiveJob::isValid() const
+ break;
+ }
+
+- return mEngine->isValid() && mZip && mZip->isOpen();
++ return mZip && mZip->isOpen();
+ }
+
+ void ComicArchiveJob::setToIdentifier(const QString &toIdentifier)
+GitLab
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch
new file mode 100644
index 000000000000..5e692fa1fedb
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch
@@ -0,0 +1,47 @@
+From d3bb3dc1d96ef7d734503e6d78dc3ce35106a628 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Thu, 5 May 2022 10:16:45 +0800
+Subject: [PATCH] wallpapers/potd: Give random chooser a seed in
+ simonstalenhagprovider
+
+Make the seed depend on the current date.
+
+CCBUG: 453391
+---
+ dataengines/potd/simonstalenhagprovider.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/dataengines/potd/simonstalenhagprovider.cpp b/dataengines/potd/simonstalenhagprovider.cpp
+index ebcb3423f..fe273ec79 100644
+--- a/dataengines/potd/simonstalenhagprovider.cpp
++++ b/dataengines/potd/simonstalenhagprovider.cpp
+@@ -6,10 +6,11 @@
+
+ #include "simonstalenhagprovider.h"
+
++#include <random>
++
+ #include <QDebug>
+ #include <QJsonArray>
+ #include <QJsonDocument>
+-#include <QRandomGenerator>
+
+ #include <KIO/Job>
+ #include <KPluginFactory>
+@@ -28,8 +29,11 @@ static QJsonValue randomArrayValueByKey(const QJsonObject &object, QLatin1String
+ return result;
+ }
+
+- auto arraySize = array.size();
+- return array.at(QRandomGenerator::global()->bounded(arraySize));
++ // Plasma 5.24.0 release date
++ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate()));
++ std::uniform_int_distribution<int> distrib(0, array.size() - 1);
++
++ return array.at(distrib(randomEngine));
+ }
+
+ SimonStalenhagProvider::SimonStalenhagProvider(QObject *parent, const QVariantList &args)
+--
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch
new file mode 100644
index 000000000000..af9ef33516e9
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch
@@ -0,0 +1,44 @@
+From 326ae3a24ccb1f1b526f4742a84e4ce24046effd Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Thu, 5 May 2022 10:19:22 +0800
+Subject: [PATCH] wallpapers/potd: Give random chooser a seed in flickrprovider
+
+Make the seed depend on the current date.
+
+BUG: 453391
+FIXED-IN: 5.24.6
+---
+ dataengines/potd/flickrprovider.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp
+index fe542f2b5..3861bd700 100644
+--- a/dataengines/potd/flickrprovider.cpp
++++ b/dataengines/potd/flickrprovider.cpp
+@@ -7,8 +7,9 @@
+
+ #include "flickrprovider.h"
+
++#include <random>
++
+ #include <QDebug>
+-#include <QRandomGenerator>
+ #include <QRegularExpression>
+ #include <QUrlQuery>
+
+@@ -127,7 +128,11 @@ void FlickrProvider::xmlRequestFinished(KJob *_job)
+ }
+
+ if (m_photoList.begin() != m_photoList.end()) {
+- QUrl url(m_photoList.at(QRandomGenerator::global()->bounded(m_photoList.size())));
++ // Plasma 5.24.0 release date
++ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate()));
++ std::uniform_int_distribution<int> distrib(0, m_photoList.size() - 1);
++
++ QUrl url(m_photoList.at(distrib(randomEngine)));
+ KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
+ connect(imageJob, &KIO::StoredTransferJob::finished, this, &FlickrProvider::imageRequestFinished);
+ } else {
+--
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
index b5c194d2234d..2005be239a27 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -15,7 +15,7 @@ DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="comic share webengine"
+IUSE="share webengine"
RESTRICT="test" # bug 727846
@@ -45,7 +45,6 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
- comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
"
@@ -55,11 +54,12 @@ RDEPEND="${DEPEND}
>=kde-plasma/plasma-workspace-${PVCUT}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch
+)
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package comic KF5Kross)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package webengine Qt5WebEngine)
)
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
index cbcb1e038b78..9a10ede0eccc 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.3-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -55,8 +55,7 @@ RDEPEND="${DEPEND}
"
PATCHES=(
- "${FILESDIR}"/${P}-mediaframe-fix-path-URLs.patch
- "${FILESDIR}"/${P}-weather-fix-cursor.patch
+ "${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391
)
src_configure() {
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild
new file mode 100644
index 000000000000..76cd0ceb3de6
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kholidays-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kunitconversion-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Disk quota applet" sys-fs/quota
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index d16f4073e6dc..8aace809aa2b 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -9,7 +9,6 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag>
<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
<flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index c49a6adc80ee..a95f4d3b6c58 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
-DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
-DIST kgamma5-5.23.3.tar.xz 83204 BLAKE2B b3779fb2185cfc617b9f1b0a2095ab5db8db878240bfcfe6a35d3da7369a72f35118b46ea542cd4f5d3255e99aa29a0cd744e4d19ca8b1343425c9fb9367d661 SHA512 95cd3287d00adcba06acc59fbe0e4cc4ad4f4fcbb3e6589248415f5160f40a7fdcad636d94de22b38c302a23569dbdf30478c0148357ec7bbd2ec91eb82c13d9
+DIST kgamma5-5.24.4.tar.xz 83524 BLAKE2B eaf9d141212b7ac00abeb2a65e18b733f437237c9383cb05fa7088364326ecded1311666fbcc229fea1833ecb28d54539fb5defcf4bd127b3507984d407a2bfd SHA512 ea8d6c064aef3d89b80b5a8f1f83993eccda65e473b2da81ae55709407e0fb146e0b61d8dfcc940374a908de73cafc4c395c3d9f898d5cf0d5744b965f8c010e
+DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f
diff --git a/kde-plasma/kgamma/kgamma-5.22.5.ebuild b/kde-plasma/kgamma/kgamma-5.24.4.ebuild
index e43ef2fee5b9..30f59eedc23c 100644
--- a/kde-plasma/kgamma/kgamma-5.22.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
KDE_ORG_NAME="${PN}5"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kgamma/kgamma-5.23.3.ebuild b/kde-plasma/kgamma/kgamma-5.24.5.ebuild
index 9e840b337945..da312bb63954 100644
--- a/kde-plasma/kgamma/kgamma-5.23.3.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
KDE_ORG_NAME="${PN}5"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 7243b6e7e224..000df04463b0 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
-DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
-DIST khotkeys-5.23.3.tar.xz 1851076 BLAKE2B 4434fb6b31397fa30cf716c97644e4a301b90b8841bfb02397514ceb8fc385050e2c1c92d03a8a5ced5534e9282cdf9bfa0279b69f9c76acdab0a63e95ceb94c SHA512 5ab9608714348e6db5c06b533881b74f07dc860a97c2088ce51037747021f6adb00c8b4cdad53f195ed0823a7bc81b78086ac02820ffa5f3a31a7163f0f38d33
+DIST khotkeys-5.24.4.tar.xz 1852708 BLAKE2B 9de6c96a3638ca739f198233e9fd0ebb56a44da2f64fee7e6a0eb39807c5ee1f9b13dcd42acd8e8b2bd08c2489f5bbf1a1c7f420e3fe8972805ae2e1437d5e05 SHA512 8c2b436a541b9be707081118aa69f1a2b6e45ea2be07e87abe736d932bbe456bdbf0be7cdbae4ca34c942311bc991447904eda09ec7da1199ab51e88d2963c5f
+DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.23.3-delete-widgets-w-entry.patch b/kde-plasma/khotkeys/files/khotkeys-5.23.3-delete-widgets-w-entry.patch
deleted file mode 100644
index 9e8ae22f2d53..000000000000
--- a/kde-plasma/khotkeys/files/khotkeys-5.23.3-delete-widgets-w-entry.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From a4137ac8f7b18824568fbee0f3e2dce7551841b7 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Wed, 13 Oct 2021 13:52:15 +0200
-Subject: [PATCH] when deleting an entry, also delete the widgets
-
-previously what would happen is that KCMHotkeys::currentChanged would
-run, find the new index (-1,-1) now invalid and show the global settings
-instead. this however left the simple_action's underlying widgets still
-sitting around referring to the previous index AND holding a dangling
-trigger point that would eventually crash when the simple_action would
-be poked by anything
-
-instead force unset the internal state of the simple_action when showing
-the global settings.
-
-FIXED-IN: 5.23.5
-BUG: 443656
-
-
-(cherry picked from commit 97f9339fd96d97e012347f8f7fca987bbe4fca0d)
----
- kcm_hotkeys/kcm_hotkeys.cpp | 3 +++
- kcm_hotkeys/simple_action_data_widget.cpp | 18 +++++++++++-------
- kcm_hotkeys/simple_action_data_widget.h | 3 +++
- kcm_hotkeys/triggers/trigger_widget_base.cpp | 8 ++++++++
- 4 files changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/kcm_hotkeys/kcm_hotkeys.cpp b/kcm_hotkeys/kcm_hotkeys.cpp
-index d3ed315..4dc4664 100644
---- a/kcm_hotkeys/kcm_hotkeys.cpp
-+++ b/kcm_hotkeys/kcm_hotkeys.cpp
-@@ -120,6 +120,9 @@ void KCMHotkeys::currentChanged(const QModelIndex &pCurrent, const QModelIndex &
- }
-
- if (!current.isValid()) {
-+ if (previous.isValid()) { // throw away old widget and stuff lest we have dangling pointers https://bugs.kde.org/show_bug.cgi?id=443656
-+ d->simple_action->unsetActionData();
-+ }
- return showGlobalSettings();
- }
-
-diff --git a/kcm_hotkeys/simple_action_data_widget.cpp b/kcm_hotkeys/simple_action_data_widget.cpp
-index e20ccaa..eb8c4c1 100644
---- a/kcm_hotkeys/simple_action_data_widget.cpp
-+++ b/kcm_hotkeys/simple_action_data_widget.cpp
-@@ -60,14 +60,22 @@ void SimpleActionDataWidget::doCopyToObject()
- }
- }
-
--void SimpleActionDataWidget::setActionData(KHotKeys::SimpleActionData *pData)
-+void SimpleActionDataWidget::unsetActionData()
- {
-- _data = pData;
-+ _data = nullptr;
-
-- // Now go and work on the trigger
- delete currentTrigger;
- currentTrigger = nullptr;
-
-+ delete currentAction;
-+ currentAction = nullptr;
-+}
-+
-+void SimpleActionDataWidget::setActionData(KHotKeys::SimpleActionData *pData)
-+{
-+ unsetActionData();
-+ _data = pData;
-+
- if (KHotKeys::Trigger *trg = data()->trigger()) {
- switch (trg->type()) {
- case KHotKeys::Trigger::ShortcutTriggerType:
-@@ -95,10 +103,6 @@ void SimpleActionDataWidget::setActionData(KHotKeys::SimpleActionData *pData)
- extend(currentTrigger, i18n("Trigger"));
- }
-
-- // Now go and work on the action
-- delete currentAction;
-- currentAction = nullptr;
--
- if (KHotKeys::Action *act = data()->action()) {
- switch (act->type()) {
- case KHotKeys::Action::MenuEntryActionType:
-diff --git a/kcm_hotkeys/simple_action_data_widget.h b/kcm_hotkeys/simple_action_data_widget.h
-index bc203b1..7c347c5 100644
---- a/kcm_hotkeys/simple_action_data_widget.h
-+++ b/kcm_hotkeys/simple_action_data_widget.h
-@@ -32,6 +32,9 @@ public:
- */
- void setActionData(KHotKeys::SimpleActionData *action);
-
-+ /// Throws away the held widgets and state.
-+ void unsetActionData();
-+
- KHotKeys::SimpleActionData *data()
- {
- return static_cast<KHotKeys::SimpleActionData *>(_data);
-diff --git a/kcm_hotkeys/triggers/trigger_widget_base.cpp b/kcm_hotkeys/triggers/trigger_widget_base.cpp
-index 67f4f3e..3bfa39b 100644
---- a/kcm_hotkeys/triggers/trigger_widget_base.cpp
-+++ b/kcm_hotkeys/triggers/trigger_widget_base.cpp
-@@ -10,6 +10,14 @@ TriggerWidgetBase::TriggerWidgetBase(KHotKeys::Trigger *trigger, QWidget *parent
- : HotkeysWidgetIFace(parent)
- , _trigger(trigger)
- {
-+ // Safety net to catch use-after-free. The triggers are not held or managed by us nor our parent.
-+ // Makes them easier to spot, unlike https://bugs.kde.org/show_bug.cgi?id=443656
-+ auto qObject = dynamic_cast<QObject *>(trigger);
-+ if (qObject) {
-+ connect(qObject, &QObject::destroyed, this, [this] {
-+ _trigger = nullptr;
-+ });
-+ }
- }
-
- TriggerWidgetBase::~TriggerWidgetBase()
---
-GitLab
-
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild
index 78eca7dae074..09d090616a7d 100644
--- a/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/khotkeys/khotkeys-5.23.3-r1.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
index 19b406f848a4..5957d8997942 100644
--- a/kde-plasma/khotkeys/khotkeys-5.23.3-r1.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -48,5 +48,3 @@ RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/kded-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
-
-PATCHES=( "${FILESDIR}"/${P}-delete-widgets-w-entry.patch ) # KDE-bug 443656
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 7c659e5d9be2..841f836db9dd 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
-DIST kinfocenter-5.23.3.tar.xz 1152800 BLAKE2B cc97461526806ae65b4a85462e9539058e4d1a3b492ea7a026f37fce5388d38c9c7c3846434779203e7027f8a2fca066937534364723f40b510e3bfe391b8f53 SHA512 f549b440e5ec443af66a3cdea4980ba25a6e357878ee0a807b84b6c9a27bf1885c49f506cad8e5063a591497d13c709ee739e3868ba6b948db4649e41d85bb4c
+DIST kinfocenter-5.24.4.tar.xz 719404 BLAKE2B fb79a2c3ab6b6a7d7411a3c601b5e7e32b9c09e153baf15a76ff562570016b8d981f717f1866b5e23293537f85bc79ba335291751be7460dc0ed1700291739a3 SHA512 91fffdeb61e2dc67ab2abee6b1f0db9e7a9dcbd71005f27d644d654dbcd806e60fb1a4a54530477fb9a1eb91cea006a05575c4dc3e9461e8b8f18830d957f187
+DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
index 1f8716c3d94a..b08d48776b71 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
@@ -16,9 +16,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
-
-REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
+IUSE="gles2-only usb"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -31,25 +29,13 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
gles2-only? ( media-libs/mesa[gles2] )
- ieee1394? ( sys-libs/libraw1394 )
- opengl? (
- media-libs/libglvnd[X?]
- !gles2-only? ( media-libs/glu )
- )
- pci? ( sys-apps/pciutils )
usb? ( virtual/libusb:1 )
- wayland? (
- >=kde-frameworks/kwayland-${KFMIN}:5
- media-libs/mesa[egl(+)]
- )
- X? ( x11-libs/libX11 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -60,20 +46,9 @@ RDEPEND="${DEPEND}
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package ieee1394 RAW1394)
- $(cmake_use_find_package pci PCIUTILS)
$(cmake_use_find_package usb USB1)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
)
- if has_version "dev-qt/qtgui[gles2-only]"; then
- mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
- else
- mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
- fi
-
ecm_src_configure
}
@@ -92,6 +67,12 @@ pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
optfeature "NFS information module" net-fs/nfs-utils
optfeature "Samba status information module" net-fs/samba
+ optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
+ optfeature "advanced CPU information module" sys-apps/util-linux
fi
+ optfeature "Wayland information module" app-misc/wayland-utils
+ optfeature "OpenGL information module" x11-apps/mesa-progs
+ optfeature "PCI devices information module" sys-apps/pciutils
+ optfeature "X Server information module" x11-apps/xdpyinfo
ecm_pkg_postinst
}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
index 8c0e917a1080..ecad66875ea1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.3.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
@@ -16,9 +16,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
-
-REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
+IUSE="gles2-only usb"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -31,25 +29,13 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
gles2-only? ( media-libs/mesa[gles2] )
- ieee1394? ( sys-libs/libraw1394 )
- opengl? (
- media-libs/libglvnd[X?]
- !gles2-only? ( media-libs/glu )
- )
- pci? ( sys-apps/pciutils )
usb? ( virtual/libusb:1 )
- wayland? (
- >=kde-frameworks/kwayland-${KFMIN}:5
- media-libs/mesa[egl(+)]
- )
- X? ( x11-libs/libX11 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -60,20 +46,9 @@ RDEPEND="${DEPEND}
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package ieee1394 RAW1394)
- $(cmake_use_find_package pci PCIUTILS)
$(cmake_use_find_package usb USB1)
- $(cmake_use_find_package wayland EGL)
- $(cmake_use_find_package wayland KF5Wayland)
- $(cmake_use_find_package X X11)
)
- if has_version "dev-qt/qtgui[gles2-only]"; then
- mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
- else
- mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
- fi
-
ecm_src_configure
}
@@ -95,5 +70,9 @@ pkg_postinst() {
optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
optfeature "advanced CPU information module" sys-apps/util-linux
fi
+ optfeature "Wayland information module" app-misc/wayland-utils
+ optfeature "OpenGL information module" x11-apps/mesa-progs
+ optfeature "PCI devices information module" sys-apps/pciutils
+ optfeature "X Server information module" x11-apps/xdpyinfo
ecm_pkg_postinst
}
diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml
index 40dfec7815b2..d925f2439758 100644
--- a/kde-plasma/kinfocenter/metadata.xml
+++ b/kde-plasma/kinfocenter/metadata.xml
@@ -8,7 +8,4 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
- <use>
- <flag name="pci">Show advanced PCI information</flag>
- </use>
</pkgmetadata>
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 661b5b40d806..78d6f4edb50b 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
-DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
-DIST kmenuedit-5.23.3.tar.xz 900648 BLAKE2B faa9d1b607e22d43525e40ca192d9e1c9c2c7bacedd689944e42b7e53a87776da9d9924cf3b427a1a1b9424a6429447b9305bd3a8a9599c6416d51d263c13a11 SHA512 7f8d5fe511dafc50c1d5fe38d9b75db0fcbfe9159d215c01facb36ca28034f482086bc6fcd1cc9563662ac4a965ce5c5aa82d1544267399d5a3323465d5038e8
+DIST kmenuedit-5.24.4.tar.xz 901428 BLAKE2B 02dbb6b3c02dae6d9f51bc2c1e1a5ccd0a82e0e789e2497d250bc0cf3d14c69c8b52b5ec657cffdb48a89acd946a199e648a8d6601f2abe23555f55c374bd575 SHA512 cb6af1b86695895324b1011ae5dcfe33d57ed9df176f5a454ea2274a0ce26291cd23e5d9583250cbd1ab753b98da91cb089d270e17625d18ff7b6193b0dc0c66
+DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild
index 43c18fca35a6..ec4bfa6adfbb 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.23.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
index 87a9cfbbd331..96a6d5d9342b 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.23.3.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index e5a361e81e16..2c1e32054122 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
-DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
-DIST kscreen-5.23.3.tar.xz 132344 BLAKE2B c45821699bbc14d2eecbc9f9d01b4e2c2a03ed103feee50ecfe6d0d8ba2bb3c8cd0cc9a681a75ae608871aabe4263d46b3730eef6ee3e903f1e8fae7f0749a3a SHA512 f705a2c938c661944310cceb04d692a7e7fcb37ad369f9b88158492f13a637071196c4ee8aa6dd8f89c6ab58175448502c08a5abf6eb18f3466081b43cb75020
+DIST kscreen-5.24.4.tar.xz 137288 BLAKE2B 9cb6efcb1ac2d8fffbee75c5f486f0f19bcd793bd4b9ada2020fe3b835ba92f797eea59fbe94e891136e67de2f6d1bc9024dce68a326fe243eb3a81427018482 SHA512 d3a395a92a4569aed3dc69b8a5b90be5fca30d7348f148161a6eed71ab882c2ca3066cadf8edb41111e8ad4cea97ca39563e34acca760fe24012b2036e6ad63b
+DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97
diff --git a/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch b/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch
deleted file mode 100644
index 440834a2971f..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 29343eb7586509dc37ecf5adcb3b6086803fa0ed Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 12 Nov 2021 15:22:46 -0700
-Subject: [PATCH] kcm: make revert message wrap
-
-This was the intention, but the wrap mode enum was being called from the
-wrong namespace, so it didn't work.
-
-BUG: 445341
-FIXED-IN: 5.23.4
-(cherry picked from commit fc02fb29ba9ffac749762e1577edd4308150fb03)
----
- kcm/package/contents/ui/main.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcm/package/contents/ui/main.qml b/kcm/package/contents/ui/main.qml
-index 431999b..43b3ba4 100644
---- a/kcm/package/contents/ui/main.qml
-+++ b/kcm/package/contents/ui/main.qml
-@@ -110,7 +110,7 @@ KCM.SimpleKCM {
- text: i18np("Will revert to previous configuration in %1 second.",
- "Will revert to previous configuration in %1 seconds.",
- revertCountdown);
-- wrapMode: Qt.WordWrap
-+ wrapMode: Text.WordWrap
- }
- footer: RowLayout {
- Controls.Button {
---
-GitLab
-
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch
new file mode 100644
index 000000000000..d2efce69b9e5
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch
@@ -0,0 +1,31 @@
+From ff8dc215e8d2691fcf41d0bb305f820531d95150 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 14 May 2022 01:29:01 +0200
+Subject: [PATCH] Fix connecting external monitors when a monitor is rotated
+
+It would be placed right by the unrotated geometry and after rotating it
+the new output would end up floating in the logical space.
+This happened because the explicitLogicalSize is cached and needs
+updating after changing its settings.
+
+
+(cherry picked from commit cc832fd4296440fcd9298cb03b0cc736a99ed8bb)
+---
+ kded/generator.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kded/generator.cpp b/kded/generator.cpp
+index e5117a9..e311b04 100644
+--- a/kded/generator.cpp
++++ b/kded/generator.cpp
+@@ -85,6 +85,7 @@ KScreen::ConfigPtr Generator::idealConfig(const KScreen::ConfigPtr &currentConfi
+
+ for (const auto &output : connectedOutputs) {
+ initializeOutput(output, config->supportedFeatures());
++ output->setExplicitLogicalSize(config->logicalSizeForOutput(*output));
+ }
+
+ if (connectedOutputs.count() == 1) {
+--
+GitLab
+
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch
new file mode 100644
index 000000000000..2d0d3ba1e851
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch
@@ -0,0 +1,28 @@
+From 6ecb832923612820c721f58d1d12dd176e10528a Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 5 May 2022 18:27:38 +0200
+Subject: [PATCH] kcm: fix choosing the refresh rate
+
+It always chose the last one, and not the highest one
+
+
+(cherry picked from commit 5e1be88dbe6e5160dcc232631df81d9bdc9d179e)
+---
+ kcm/output_model.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp
+index 92e4ea3..3672b49 100644
+--- a/kcm/output_model.cpp
++++ b/kcm/output_model.cpp
+@@ -394,6 +394,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex)
+ auto it = modes.begin();
+ while (it != modes.end()) {
+ if ((*it)->size() == size && (*it)->refreshRate() > bestRefreshRate) {
++ bestRefreshRate = (*it)->refreshRate();
+ modeIt = it;
+ }
+ it++;
+--
+GitLab
+
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch
new file mode 100644
index 000000000000..e7d85fd87013
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch
@@ -0,0 +1,29 @@
+From 584ed8a067a7c0329e1572dd9970b6e3dae6a56f Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 5 May 2022 18:22:46 +0200
+Subject: [PATCH] kcm: fix refresh rate list not being updated
+
+BUG: 453392
+
+
+(cherry picked from commit 8c1e2cffda762fef83ea48658a08847382c71486)
+---
+ kcm/output_model.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp
+index fcdb738..92e4ea3 100644
+--- a/kcm/output_model.cpp
++++ b/kcm/output_model.cpp
+@@ -417,7 +417,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex)
+ QModelIndex index = createIndex(outputIndex, 0);
+ // Calling this directly ignores possible optimization when the
+ // refresh rate hasn't changed in fact. But that's ok.
+- Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRateIndexRole});
++ Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRatesRole, RefreshRateIndexRole});
+ Q_EMIT sizeChanged();
+ return true;
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-5.22.5.ebuild b/kde-plasma/kscreen/kscreen-5.24.4.ebuild
index c67cf6feae68..631a5b4e57a0 100644
--- a/kde-plasma/kscreen/kscreen-5.22.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..0fa224e22205
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsensors-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392
+ "${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch"
+ "${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch"
+)
diff --git a/kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild b/kde-plasma/kscreen/kscreen-5.24.5.ebuild
index 3fa3ba0ff984..c92a7debe6b5 100644
--- a/kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -44,5 +44,3 @@ RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
-
-PATCHES=( "${FILESDIR}"/${P}-make-revert-message-wrap.patch ) # KDE-bug 445341
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 471a0ee6f189..622043e47a3e 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,2 @@
-DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
-DIST kscreenlocker-5.23.3.tar.xz 117636 BLAKE2B 0d409eea12c5281a58e8c7ca70087f88c2faf6643a7f48837802cb9d296311bc1c53d1abd998650b277e58f341c13ca96a3d931c22dc1819ee1eb556c9857375 SHA512 ac9e29cd4f3f787487ef820cdfeceb56e3b3d6c67e4155a30f854fba81c821e5717d5d19dde4b5d8550473ffc7886ec80a366c63ab005325b714ce09cab8f217
+DIST kscreenlocker-5.24.4.tar.xz 119424 BLAKE2B ff054103476d908e9c66a3408587788bc0b871a12ddee418c4a67f801123c544f52f8f61ac1eeed5e4b593dd06a707bb1fb8c2fa85a08496c1bf76f4306adc7a SHA512 410402d131311867206cb015fbbc085960a2e6988d8a15675abfad663a3e667c697fe44f5625e4ae40ce3554104e0d11fd895e3b364820371faaa7e58e0b17dd
+DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild
index 1ae99c84f64e..5ebb504f19e5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="+pam"
-RESTRICT+=" test"
+RESTRICT="test"
COMMON_DEPEND="
dev-libs/wayland
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.23.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
index 0f53f43e33ae..55afaed895ad 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.3.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+pam"
-RESTRICT+=" test"
+RESTRICT="test"
COMMON_DEPEND="
dev-libs/wayland
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index b69fc4bc1660..ca99c803432d 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
-DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
-DIST ksshaskpass-5.23.3.tar.xz 24040 BLAKE2B 17db15c4e40cacfd65a1792c9d8992f865b3f0e2237fcfc08405a35f00ec12828c362172c3ec280c47fd3c614597b07f64d6b3e76a91c79f002e00e013a6d2e7 SHA512 0aabdf4e22a70e040bcd5b65fff2f85a43e9727cf53875977f691ae24c9d99a86e2e06df0d92550b9711e0f1623e69cd548c09179909ece232f6f3637cf3f41d
+DIST ksshaskpass-5.24.4.tar.xz 24720 BLAKE2B fc204675ed6590e263b97b10490b1d5e60e97cdabf76c3bd7effa8c9106182740f90e400232a865cd12dd9db2d246a5f59288d3e69e6cdcb48c04fe2e68a1138 SHA512 181788f8b8ce72f3d0e17d2d8cf46eb5ca31eef5533d275f86b8f573c3b1365eaea48a9fb940177c701b071caf241ab4ca7cbf1d0e2bda29e0d153b7574cf79d
+DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild
index f77c6f18f0bb..e198cd959e39 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.23.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
index 618cd3f1026f..6cc8bba6f520 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.23.3.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
new file mode 100644
index 000000000000..8eecf7d8e52f
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
@@ -0,0 +1,21 @@
+From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001
+From: Shriraj Hegde <shriraj.hegde@gmail.com>
+Date: Wed, 9 Jun 2021 08:21:46 +0000
+Subject: [PATCH] Add StartupWMClass to desktop file
+
+---
+ gui/org.kde.ksysguard.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop
+index 0c59d5b7..feb4f220 100755
+--- a/gui/org.kde.ksysguard.desktop
++++ b/gui/org.kde.ksysguard.desktop
+@@ -224,3 +224,4 @@ StartupNotify=true
+ X-DBUS-StartupType=Multi
+ Categories=Qt;KDE;System;
+ X-DBUS-ServiceName=org.kde.ksysguard
++StartupWMClass=ksysguard
+--
+GitLab
+
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
new file mode 100644
index 000000000000..d8e63cf7ca8c
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
@@ -0,0 +1,59 @@
+From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 5 Aug 2021 21:01:30 +0200
+Subject: [PATCH] Port to QtQuickDialogWrapper
+
+---
+ CMakeLists.txt | 2 +-
+ gui/Workspace.cpp | 13 +++++--------
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23069e76..dcb92975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(KSYSGUARD_VERSION 4.98.0)
+ set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}")
+
+ set(QT_MIN_VERSION "5.15.0")
+-set(KF5_MIN_VERSION "5.78")
++set(KF5_MIN_VERSION "5.80")
+
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+diff --git a/gui/Workspace.cpp b/gui/Workspace.cpp
+index 827d63e1..bdd03743 100644
+--- a/gui/Workspace.cpp
++++ b/gui/Workspace.cpp
+@@ -29,8 +29,8 @@
+ #include <KMessageBox>
+ #include <KAcceleratorManager>
+ #include <KActionCollection>
+-#include <KNewStuff3/KNS3/DownloadDialog>
+ #include <KNewStuff3/KNSCore/Engine>
++#include <KNS3/QtQuickDialogWrapper>
+ #include <KConfigGroup>
+
+ #include "WorkSheet.h"
+@@ -307,14 +307,11 @@ void Workspace::uploadHotNewWorksheet()
+ }
+ void Workspace::getHotNewWorksheet()
+ {
+- KNS3::DownloadDialog dialog(QStringLiteral("ksysguard.knsrc"));
+- if( dialog.exec() == QDialog::Rejected )
+- return;
+-
+- KNS3::Entry::List entries = dialog.installedEntries();
+- foreach(KNS3::Entry entry, entries) {
++ KNS3::QtQuickDialogWrapper dialog(QStringLiteral("ksysguard.knsrc") );
++ const QList<KNSCore::EntryInternal> entries = dialog.exec();
++ for (auto entry : entries) {
+ if(!entry.installedFiles().isEmpty()) {
+- QString filename = entry.installedFiles().first();
++ const QString filename = entry.installedFiles().constFirst();
+ restoreWorkSheet(filename, true);
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
index f5af6757b0ad..ec8ad40f2c55 100644
--- a/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Network-enabled resource usage monitor"
HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="lm-sensors"
DEPEND="
@@ -42,11 +38,16 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libksysguard-5.22.0:5
lm-sensors? ( sys-apps/lm-sensors:= )
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-add-StartupWMClass-to-desktop-file.patch
+ "${FILESDIR}"/${P}-port-to-QtQuickDialogWrapper.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package lm-sensors Sensors)
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 9090e4750064..d21fe3a673e1 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,2 +1,2 @@
-DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
-DIST ksystemstats-5.23.3.tar.xz 90492 BLAKE2B 11e4e1f736dca2b15a4294c6f769bf61c54774142486d6775c9f3aff2109bb49f6109636aa06f87775c98fb222a722ba56a80bd452d3bfadd7b28e73eaea3e50 SHA512 d557da0a2cf144568314c926daa0333ce6de7553da55620dbeb39d20658b0cbfa2d8972d4dd1d1c8ab8f2a7bdd3d35efa607205a314f356999b1c1a3aff85557
+DIST ksystemstats-5.24.4.tar.xz 94616 BLAKE2B 4daaff46dd7f3d18a680219fa2f60a8d8915fc98724dab5be67fbcb47d80c9b32c8ffe119d4f9650b6853edbd46790db7ce8c67fb58793bda4e8cc0c536cbb8b SHA512 0238815273ac1a939b25e31ec727df71d1fa1a060d5334068f87b1a75ae0016c2c508c853b49998e35a868d080849d372df74a8bfa395095065223614fa36be2
+DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild
index 0513b52f0937..84530f541465 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -16,7 +16,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="lm-sensors networkmanager"
+IUSE="networkmanager"
DEPEND="
dev-libs/libnl:3
@@ -29,9 +29,9 @@ DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
>=kde-plasma/libksysguard-${PVCUT}:5
net-libs/libpcap
+ sys-apps/lm-sensors:=
sys-libs/libcap
virtual/libudev:=
- lm-sensors? ( sys-apps/lm-sensors:= )
networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
"
RDEPEND="${DEPEND}
@@ -40,7 +40,6 @@ RDEPEND="${DEPEND}
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package lm-sensors Sensors)
$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
)
ecm_src_configure
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.23.3.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
index 5c363a1d417c..3d7f191dca31 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.23.3.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 7c9346065191..446957392455 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
-DIST kwallet-pam-5.23.3.tar.xz 20120 BLAKE2B 2c443d3b2ef5816e94d8e07ac9d27cc91c66e339746496f138e8baaeea35bef3471799eeecfa430ab70fa28be728a7ade86c54a5fab7fec8b575162b8c0de37b SHA512 866baf9565db33d25de7dcc0a9809a498a79f39e3ee908691d2740e44483744bfd4ffbcc6134fc38d3580c911e96bdf738c2c4459dc73468a8f4bf35e79b5440
+DIST kwallet-pam-5.24.4.tar.xz 20480 BLAKE2B e54dd5271f9bbca2167f3fed7a7c96f92164d8a6c833f2a69976344918d03537b0300c1ec5b23213a82f7a946bf77cf067a42485df29265a40f3e8fb2cacf997 SHA512 e9da7f2b5c390bfc9406d9e2511689fc42313643a519ebc146cf3a79e2701625aa841dc40c6ad457ee73520d55bc66dc7e7a617c0f90b9f8d3314eaacfd8a759
+DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild
index 5d767137ee6b..8ddb3f24688e 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
inherit ecm kde.org
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.23.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
index bc2a2dd88454..940910a2e750 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.23.3.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
inherit ecm kde.org
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 1f99eb38f402..a4364081aace 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
-DIST kwayland-integration-5.23.3.tar.xz 24184 BLAKE2B 27a0ac06dea4e59a461718971897267d29d5207753e9c6f97fd52c909420d1f442af53b8e7cf9442698a93fbfc0041b56d4bdba070a8fbe6472cafe1bd475f59 SHA512 8e139aedfcd06910a226e710b5f83e766e119256e29b9eef8be4ae7b2d1fcfe96e6ce369ed90726dd70d81677067aa05222439fbcc7b02c190e802bc258a6100
+DIST kwayland-integration-5.24.4.tar.xz 24828 BLAKE2B 54eccc48b640118adc558eca19a92473ade03b9481ebafdfa7c4597bd64f846ace567038b44c601b76712b883f8cc7c54fdcc827dfbd9fe92af07bc6155c41d7 SHA512 0a3a0404fd895a87d44bed4a3d12d7627207c5b28aac979327b85e1cb5de70292129df54b8d7ca259566afde79393ab21c72a77f5c818d5b26db66192956e536
+DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
index f9554eb12b38..7ea29d557359 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -25,8 +25,13 @@ RESTRICT="test" # bug 668872
# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
# kde-frameworks/kwindowsystem: Various private headers
DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-libs/wayland-1.15
+ || (
+ >=dev-qt/qtgui-${QTMIN}:5[libinput]
+ >=dev-qt/qtgui-${QTMIN}:5[X]
+ )
>=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5=
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5=
>=kde-frameworks/kwayland-${KFMIN}:5
@@ -34,3 +39,7 @@ DEPEND="
x11-libs/libxkbcommon
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ virtual/pkgconfig
+"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
index 9a1d55f7aa5c..84eca0211ad6 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.3.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -39,4 +39,7 @@ DEPEND="
x11-libs/libxkbcommon
"
RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ virtual/pkgconfig
+"
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 29de8015bd75..efd2337d9a36 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
-DIST kwayland-server-5.23.3.tar.xz 217568 BLAKE2B 98c4022dd7b93fb32ef1a5177c22dbc0345c3359980087cfba1f8a6abbf0b8fcd621270cb6045600717d10d6ba51a69af284cd8f82618f7d252ae0e68c0355c1 SHA512 552904b7073403f7896ccd349b4242f5afaf57150fc447d60867678173855bd278f8e13444fbc53a833a76effd4d6d37ed0ce8e078fef1c15d4afabc36065150
+DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640
+DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
new file mode 100644
index 000000000000..4ddd9737e759
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
@@ -0,0 +1,109 @@
+From 40364d2ee670a5a74318ef96c643762293ca95f0 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Fri, 8 Apr 2022 12:44:33 +0300
+Subject: [PATCH] Simplify code that announces available modes and current mode
+
+If no mode has the current flag set, the first mode object will be
+announced twice.
+
+There's also no benefit from sending the current mode as last. If the
+current mode changes, the compositor will send the current_mode event,
+not the mode event.
+
+BUG: 452318
+
+
+(cherry picked from commit b40c4e3f4108b9a0be9b4f5d437e72f7c2aa3fea)
+---
+ src/server/outputdevice_v2_interface.cpp | 35 ++++++++----------------
+ 1 file changed, 11 insertions(+), 24 deletions(-)
+
+diff --git a/src/server/outputdevice_v2_interface.cpp b/src/server/outputdevice_v2_interface.cpp
+index 31ab16ca..9093bd2f 100644
+--- a/src/server/outputdevice_v2_interface.cpp
++++ b/src/server/outputdevice_v2_interface.cpp
+@@ -31,7 +31,7 @@ public:
+
+ void sendGeometry(Resource *resource);
+ wl_resource *sendNewMode(Resource *resource, OutputDeviceModeV2Interface *mode);
+- void sendCurrentMode(Resource *resource, OutputDeviceModeV2Interface *mode);
++ void sendCurrentMode(Resource *resource);
+ void sendDone(Resource *resource);
+ void sendUuid(Resource *resource);
+ void sendEdid(Resource *resource);
+@@ -180,7 +180,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode)
+ const auto clientResources = d->resourceMap();
+ for (auto it = clientResources.begin(); it != clientResources.end(); ++it) {
+ auto resource = *it;
+- d->sendCurrentMode(resource, d->currentMode);
++ d->sendCurrentMode(resource);
+ d->sendDone(resource);
+ }
+ d->updateGeometry();
+@@ -257,22 +257,10 @@ void OutputDeviceV2InterfacePrivate::kde_output_device_v2_bind_resource(Resource
+ sendName(resource);
+ sendSerialNumber(resource);
+
+- auto currentModeIt = modes.end();
+- for (auto it = modes.begin(); it != modes.end(); ++it) {
+- auto &mode = *it;
+- if (mode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
+- // needs to be sent as last mode
+- currentModeIt = it;
+- continue;
+- }
++ for (OutputDeviceModeV2Interface *mode : std::as_const(modes)) {
+ sendNewMode(resource, mode);
+ }
+-
+- if (currentModeIt != modes.end()) {
+- auto modeResource = sendNewMode(resource, *currentModeIt);
+- send_current_mode(resource->handle, modeResource);
+- }
+-
++ sendCurrentMode(resource);
+ sendUuid(resource);
+ sendEdid(resource);
+ sendEnabled(resource);
+@@ -296,9 +284,9 @@ wl_resource *OutputDeviceV2InterfacePrivate::sendNewMode(Resource *resource, Out
+ return modeResource->handle;
+ }
+
+-void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource, OutputDeviceModeV2Interface *mode)
++void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource)
+ {
+- const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(mode)->findResource(outputResource);
++ const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(currentMode)->findResource(outputResource);
+ send_current_mode(outputResource->handle, modeResource->handle);
+ }
+
+@@ -506,12 +494,12 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
+ d->modes << outputDeviceMode;
+ outputDeviceMode->setParent(this);
+
++ for (auto resource : clientResources) {
++ d->sendNewMode(resource, outputDeviceMode);
++ }
++
+ if (outputDeviceMode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
+ d->currentMode = outputDeviceMode;
+- } else {
+- for (auto resource : clientResources) {
+- d->sendNewMode(resource, outputDeviceMode);
+- }
+ }
+ }
+
+@@ -520,8 +508,7 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
+ }
+
+ for (auto resource : clientResources) {
+- d->sendNewMode(resource, d->currentMode);
+- d->sendCurrentMode(resource, d->currentMode);
++ d->sendCurrentMode(resource);
+ }
+
+ qDeleteAll(oldModes.crbegin(), oldModes.crend());
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
new file mode 100644
index 000000000000..a3a0b2067f5d
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
@@ -0,0 +1,57 @@
+From 97df88c6c8af925382bb1f59b7c6ad75f28142a0 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Tue, 5 Apr 2022 13:26:26 +0100
+Subject: [PATCH] Fix layer shell reset
+
+In the current form any client committing multiple times without
+attaching a buffer would unset the cached state and trigger an error.
+
+It's legal (though weird) to commit multiple times before attaching a
+buffer.
+
+We should only reset the state if we commit an empty buffer after having
+committed an existing buffer. This brings us in line with XdgShell.
+
+
+(cherry picked from commit a5c55b68589a8771cde0bf4ce552702da6fca41c)
+---
+ src/server/layershell_v1_interface.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/server/layershell_v1_interface.cpp b/src/server/layershell_v1_interface.cpp
+index 17086334..19fcd68e 100644
+--- a/src/server/layershell_v1_interface.cpp
++++ b/src/server/layershell_v1_interface.cpp
+@@ -69,6 +69,7 @@ public:
+ bool isClosed = false;
+ bool isConfigured = false;
+ bool isCommitted = false;
++ bool firstBufferAttached = false;
+
+ protected:
+ void zwlr_layer_surface_v1_destroy_resource(Resource *resource) override;
+@@ -290,8 +291,10 @@ void LayerSurfaceV1InterfacePrivate::commit()
+ return;
+ }
+
+- if (!surface->isMapped() && isCommitted) {
++ // detect reset
++ if (!surface->isMapped() && firstBufferAttached) {
+ isCommitted = false;
++ firstBufferAttached = false;
+ isConfigured = false;
+
+ current = LayerSurfaceV1State();
+@@ -303,6 +306,9 @@ void LayerSurfaceV1InterfacePrivate::commit()
+ const LayerSurfaceV1State previous = std::exchange(current, pending);
+
+ isCommitted = true; // Must set the committed state before emitting any signals.
++ if (surface->isMapped()) {
++ firstBufferAttached = true;
++ }
+
+ if (previous.acceptsFocus != current.acceptsFocus) {
+ Q_EMIT q->acceptsFocusChanged();
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
new file mode 100644
index 000000000000..1799a711b472
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
@@ -0,0 +1,73 @@
+From dc09ce85f00b3a790e2817888067c3826280dd8e Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 16 Apr 2022 00:01:12 -0700
+Subject: [PATCH] Fix race in wp_drm_lease_v1.
+
+Basically this is a well known issue in wayland for globals. If bind
+comes after destroyed, it will raise a invalid global error. The common
+practice is to delay the destroy of global. Similar technique is also
+applied to wl_output.
+
+CCBUG: 452435
+(cherry picked from commit cdc9dcfb0a1f0445c46ee2cefa114329a2408555)
+---
+ src/server/drmleasedevice_v1_interface.cpp | 14 +++++---------
+ src/server/drmleasedevice_v1_interface_p.h | 2 +-
+ 2 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/src/server/drmleasedevice_v1_interface.cpp b/src/server/drmleasedevice_v1_interface.cpp
+index bffd22cd..7e338022 100644
+--- a/src/server/drmleasedevice_v1_interface.cpp
++++ b/src/server/drmleasedevice_v1_interface.cpp
+@@ -84,10 +84,6 @@ void DrmLeaseDeviceV1InterfacePrivate::remove()
+ request->connectors.clear();
+ }
+ globalRemove();
+- removed = true;
+- if (resourceMap().isEmpty()) {
+- delete this;
+- }
+ }
+
+ void DrmLeaseDeviceV1InterfacePrivate::registerConnector(DrmLeaseConnectorV1Interface *connector)
+@@ -144,6 +140,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_release(Resource *
+
+ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Resource *resource)
+ {
++ if (isGlobalRemoved()) {
++ return;
++ }
+ if (!hasDrmMaster) {
+ pendingFds << resource->handle;
+ return;
+@@ -161,12 +160,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Reso
+ }
+ }
+
+-void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_resource(Resource *resource)
++void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_global()
+ {
+- Q_UNUSED(resource)
+- if (removed && resourceMap().isEmpty()) {
+- delete this;
+- }
++ delete this;
+ }
+
+
+diff --git a/src/server/drmleasedevice_v1_interface_p.h b/src/server/drmleasedevice_v1_interface_p.h
+index 4bef36e4..085aac85 100644
+--- a/src/server/drmleasedevice_v1_interface_p.h
++++ b/src/server/drmleasedevice_v1_interface_p.h
+@@ -44,7 +44,7 @@ protected:
+ void wp_drm_lease_device_v1_create_lease_request(Resource *resource, uint32_t id) override;
+ void wp_drm_lease_device_v1_release(Resource *resource) override;
+ void wp_drm_lease_device_v1_bind_resource(Resource *resource) override;
+- void wp_drm_lease_device_v1_destroy_resource(Resource *resource) override;
++ void wp_drm_lease_device_v1_destroy_global() override;
+ };
+
+ class DrmLeaseConnectorV1InterfacePrivate : public QObject, public QtWaylandServer::wp_drm_lease_connector_v1
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
new file mode 100644
index 000000000000..e40189ab2744
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
@@ -0,0 +1,44 @@
+From 6dcf73adaafeaa40c05e22df5f1c10af88df362b Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 30 Mar 2022 14:57:12 +0100
+Subject: [PATCH] Guard subsurface parent access.
+
+Whilst a subsurface must have a parent at the time of creation, the
+lifespan is not guaranteed afterwards.
+
+It's a weird thing for a client to do, but we need to not crash
+afterwards.
+
+If the parent surface is destroyed we should consider the surface
+unmapped.
+
+BUG: 452044
+
+
+(cherry picked from commit 1d2424a56a13dc55aeab699a38234a7cafa091d8)
+---
+ src/server/surface_interface.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp
+index ef2584f4..8bfac95f 100644
+--- a/src/server/surface_interface.cpp
++++ b/src/server/surface_interface.cpp
+@@ -678,7 +678,13 @@ void SurfaceInterfacePrivate::commitFromCache()
+
+ bool SurfaceInterfacePrivate::computeEffectiveMapped() const
+ {
+- return bufferRef && (!subSurface || subSurface->parentSurface()->isMapped());
++ if (!bufferRef) {
++ return false;
++ }
++ if (subSurface) {
++ return subSurface->parentSurface() && subSurface->parentSurface()->isMapped();
++ }
++ return true;
+ }
+
+ void SurfaceInterfacePrivate::updateEffectiveMapped()
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch
new file mode 100644
index 000000000000..6e03d215ed43
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch
@@ -0,0 +1,44 @@
+From f669d7002b3966f53f8e17275123b24ec41e8e21 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 16 May 2022 16:28:53 +0300
+Subject: [PATCH] wayland: Fix supported action initialization in data offer
+ interface
+
+Currently we guess the supported and preferred dnd actions in data offer
+for version >= 3. This can create problems because kwin may not send the
+right action events when the supported dnd actions actually change.
+---
+ src/server/dataoffer_interface.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/dataoffer_interface.cpp b/src/server/dataoffer_interface.cpp
+index ed682172..d78abeca 100644
+--- a/src/server/dataoffer_interface.cpp
++++ b/src/server/dataoffer_interface.cpp
+@@ -25,9 +25,8 @@ public:
+ DataOfferInterface *q;
+ QPointer<AbstractDataSource> source;
+
+- // defaults are set to sensible values for < version 3 interfaces
+- DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move;
+- DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy;
++ DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::None;
++ DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::None;
+
+ protected:
+ void data_offer_destroy_resource(Resource *resource) override;
+@@ -43,6 +42,11 @@ DataOfferInterfacePrivate::DataOfferInterfacePrivate(AbstractDataSource *_source
+ , q(_q)
+ , source(_source)
+ {
++ // defaults are set to sensible values for < version 3 interfaces
++ if (wl_resource_get_version(resource) < WL_DATA_OFFER_ACTION_SINCE_VERSION) {
++ supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move;
++ preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy;
++ }
+ }
+
+ void DataOfferInterfacePrivate::data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type)
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
new file mode 100644
index 000000000000..466f2ec10616
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Wayland Server Components built on KDE Frameworks"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/wayland-1.19.0
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[egl]
+ >=dev-qt/qtwayland-${QTMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-layer-shell-reset.patch
+ "${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # KDE-bug 452044
+ "${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # KDE-bug 452318
+ "${FILESDIR}"/${P}-fix-race-in-wp_drm_lease_v1.patch # KDE-bug 452435
+)
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
index a8fe8319c53d..bba4549022b8 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_QTHELP="true"
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# All failing, I guess we need a virtual wayland server
@@ -30,7 +30,14 @@ RDEPEND="
media-libs/libglvnd
"
DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.3.0
- >=dev-libs/wayland-protocols-1.18
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-libs/wayland-protocols-1.24
"
-BDEPEND="dev-util/wayland-scanner"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-supported-action-init.patch
+)
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.23.3.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild
index 6badc119f3d9..4a4b298c08ae 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.3.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_QTHELP="true"
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
inherit ecm kde.org
@@ -30,7 +30,10 @@ RDEPEND="
media-libs/libglvnd
"
DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.3.0
- >=dev-libs/wayland-protocols-1.21
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index f4dc916486db..0eb8c11148ea 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
-DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
-DIST kwin-5.23.3.tar.xz 6333892 BLAKE2B fd84fefafb51e3979a270688ad5b33ed1bb3067a1d2406382b18c1f08cc31c5b5f74725a741b3a569082ff8c9964f254915401e7c7034fae1b550c50659b6235 SHA512 d440b1510e22cefb8ae60d337efec4aa04deb186319b9c655a7a217c73fb18e486baced8268f99d7f88c9cfdc4a67ab7018c4f2c13a307841cfa01be12282b1c
+DIST kwin-5.24.4.tar.xz 6448844 BLAKE2B 3e58ae22d2ff254f4c08a8c6662702e5dae97dd207ca8d1d51cc203826d4b68a5eecffea69cd6eb4de5894e09e73340cda540e41db3753873cab72a76936e6d4 SHA512 2e1389a68e373791bd397294c834fb1cdbab24f32253eeaf505bb1878b8a8a5cd02d1250cae181c00dc73d6a524ff44cd1fbf2e101f13adf915f30f15c738df3
+DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089
diff --git a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch
deleted file mode 100644
index d185d5e41fe6..000000000000
--- a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 839710201c389b7f4ed248cb3818e755a37ce977 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 10 Sep 2021 13:36:04 +0300
-Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES
-
-eglCreateWindowSurface() wants a Window (unsigned long), but with
-EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an
-opaque pointer, i.e. void*.
-
-BUG: 440372
-
-* asturm 2021-09-21: Merged with upstream commits:
-38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit"
-e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms"
-
-* asturm 2021-10-04: Merged with upstream commit:
-From df11acd46778e1e43183c2660bc9dcb1a8ad3282 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 21 Sep 2021 17:34:59 +0300
-Subject: [PATCH] x11: Cast Window to EGLNativeWindowType using a C cast
-
-reinterpret_cast<>() will fail if the types we cast from and to have
-mismatching sizes.
-
-Unfortunately, there are platforms that have Window and
-EGLNativeWindowType of different size. This results in compilation
-errors.
-
-In order to work around those problematic platforms, this change
-replaces reinterpret_cast cast with a c style cast.
----
- src/plugins/platforms/x11/common/eglonxbackend.cpp | 16 +++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff -u a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
-+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -213,15 +213,19 @@
- return EGL_NO_SURFACE;
- }
-
-+ // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits.
-+ Window nativeWindow = window;
-+
- EGLSurface surface = EGL_NO_SURFACE;
- if (havePlatformBase()) {
-- // Note: Window is 64 bits on a 64-bit architecture whereas xcb_window_t is
-- // always 32 bits. eglCreatePlatformWindowSurfaceEXT() expects the
-- // native_window parameter to be pointer to a Window, so this variable
-- // cannot be an xcb_window_t.
-- surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr);
-+ // eglCreatePlatformWindowSurfaceEXT() expects a pointer to the Window.
-+ surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr);
- } else {
-- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
-+ // eglCreateWindowSurface() expects a Window, not a pointer to the Window. Use
-+ // a c style cast as there are (buggy) platforms where the size of the Window
-+ // type is not the same as the size of EGLNativeWindowType, reinterpret_cast<>()
-+ // may not compile.
-+ surface = eglCreateWindowSurface(eglDisplay(), config(), (EGLNativeWindowType) nativeWindow, nullptr);
- }
-
- return surface;
diff --git a/kde-plasma/kwin/files/kwin-5.23.3-enable-window-rules-for-all-xdg-toplevel.patch b/kde-plasma/kwin/files/kwin-5.23.3-enable-window-rules-for-all-xdg-toplevel.patch
deleted file mode 100644
index fa52bd7a3481..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.3-enable-window-rules-for-all-xdg-toplevel.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 1ba7b5ec63b61fa00b7eac59a1beca12323fefb3 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Wed, 17 Nov 2021 18:36:00 +0200
-Subject: [PATCH] wayland: Enable window rules for all xdg-toplevel
-
-If a window wants to be initially shown in fullscreen mode, it will
-issue an xdg_toplevel.set_fullscreen request before the first surface
-commit.
-
-If a window wants to be shown in fullscreen mode and there hasn't been
-any first surface commit, kwin will cache the request and apply
-fullscreen mode when checking window rules in the initialize() function.
-
-On the other hand, window rules are disabled for plasma surfaces. The
-motivation behind that was to forbid user from messing with plasma's
-surfaces (this change was suggested during redesign of xdg-shell
-implementation).
-
-As it turns out, there are cases where plasma may ask to show a window
-in fullscreen mode, which also has a plasma surface installed, e.g.
-fullscreen application dashboard.
-
-In order to fix the dashboard, this change allows window rules to be
-applied to xdg-toplevel windows that also have plasma surfaces installed.
-
-As is, xdg-toplevel surfaces and plasma surfaces are very different in
-nature. Adding more quirks to handle plasma surfaces in
-XdgToplevelClient is not worth the effort and there are better
-alternatives, e.g. layer-shell.
-
-
-(cherry picked from commit 039b1d031e3e30c238c8d67ade376c6d52297d81)
----
- src/xdgshellclient.cpp | 65 +++++++++++++++++++++---------------------
- 1 file changed, 32 insertions(+), 33 deletions(-)
-
-diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
-index 9e8216a3a0..b4427b8cf7 100644
---- a/src/xdgshellclient.cpp
-+++ b/src/xdgshellclient.cpp
-@@ -647,7 +647,7 @@ void XdgToplevelClient::updateDecoration(bool check_workspace_pos, bool force)
-
- bool XdgToplevelClient::supportsWindowRules() const
- {
-- return !m_plasmaShellSurface;
-+ return true;
- }
-
- StrutRect XdgToplevelClient::strutRect(StrutArea area) const
-@@ -946,7 +946,7 @@ void XdgToplevelClient::handleWindowClassChanged()
- {
- const QByteArray applicationId = m_shellSurface->windowClass().toUtf8();
- setResourceClass(resourceName(), applicationId);
-- if (shellSurface()->isConfigured() && supportsWindowRules()) {
-+ if (shellSurface()->isConfigured()) {
- evaluateWindowRules();
- }
- setDesktopFileName(applicationId);
-@@ -1196,40 +1196,39 @@ void XdgToplevelClient::initialize()
- // is sent if the client has called the set_mode() request with csd mode.
- updateDecoration(false, true);
-
-- if (supportsWindowRules()) {
-- setupWindowRules(false);
--
-- moveResize(rules()->checkGeometry(frameGeometry(), true));
-- maximize(rules()->checkMaximize(initialMaximizeMode(), true));
-- setFullScreen(rules()->checkFullScreen(initialFullScreenMode(), true), false);
-- setOnActivities(rules()->checkActivity(activities(), true));
-- setDesktops(rules()->checkDesktops(desktops(), true));
-- setDesktopFileName(rules()->checkDesktopFile(desktopFileName(), true).toUtf8());
-- if (rules()->checkMinimize(isMinimized(), true)) {
-- minimize(true); // No animation.
-- }
-- setSkipTaskbar(rules()->checkSkipTaskbar(skipTaskbar(), true));
-- setSkipPager(rules()->checkSkipPager(skipPager(), true));
-- setSkipSwitcher(rules()->checkSkipSwitcher(skipSwitcher(), true));
-- setKeepAbove(rules()->checkKeepAbove(keepAbove(), true));
-- setKeepBelow(rules()->checkKeepBelow(keepBelow(), true));
-- setShortcut(rules()->checkShortcut(shortcut().toString(), true));
-- setNoBorder(rules()->checkNoBorder(noBorder(), true));
-+ setupWindowRules(false);
-+
-+ moveResize(rules()->checkGeometry(frameGeometry(), true));
-+ maximize(rules()->checkMaximize(initialMaximizeMode(), true));
-+ setFullScreen(rules()->checkFullScreen(initialFullScreenMode(), true), false);
-+ setOnActivities(rules()->checkActivity(activities(), true));
-+ setDesktops(rules()->checkDesktops(desktops(), true));
-+ setDesktopFileName(rules()->checkDesktopFile(desktopFileName(), true).toUtf8());
-+ if (rules()->checkMinimize(isMinimized(), true)) {
-+ minimize(true); // No animation.
-+ }
-+ setSkipTaskbar(rules()->checkSkipTaskbar(skipTaskbar(), true));
-+ setSkipPager(rules()->checkSkipPager(skipPager(), true));
-+ setSkipSwitcher(rules()->checkSkipSwitcher(skipSwitcher(), true));
-+ setKeepAbove(rules()->checkKeepAbove(keepAbove(), true));
-+ setKeepBelow(rules()->checkKeepBelow(keepBelow(), true));
-+ setShortcut(rules()->checkShortcut(shortcut().toString(), true));
-+ setNoBorder(rules()->checkNoBorder(noBorder(), true));
-+
-+ // Don't place the client if its position is set by a rule.
-+ if (rules()->checkPosition(invalidPoint, true) != invalidPoint) {
-+ needsPlacement = false;
-+ }
-
-- // Don't place the client if its position is set by a rule.
-- if (rules()->checkPosition(invalidPoint, true) != invalidPoint) {
-- needsPlacement = false;
-- }
-+ // Don't place the client if the maximize state is set by a rule.
-+ if (requestedMaximizeMode() != MaximizeRestore) {
-+ needsPlacement = false;
-+ }
-
-- // Don't place the client if the maximize state is set by a rule.
-- if (requestedMaximizeMode() != MaximizeRestore) {
-- needsPlacement = false;
-- }
-+ discardTemporaryRules();
-+ RuleBook::self()->discardUsed(this, false); // Remove Apply Now rules.
-+ updateWindowRules(Rules::All);
-
-- discardTemporaryRules();
-- RuleBook::self()->discardUsed(this, false); // Remove Apply Now rules.
-- updateWindowRules(Rules::All);
-- }
- if (isRequestedFullScreen()) {
- needsPlacement = false;
- }
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch b/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch
deleted file mode 100644
index 7cd8d135ab28..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.3-fix-xwayland-abstract-socket-addr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5a9a3e96898bd29ccbf31d9ff92dfb80274ce265 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Thu, 11 Nov 2021 12:25:13 -0800
-Subject: [PATCH] Fix XWayland abstract socket address.
-
-NUL-termination byte is not needed for abstract socket. This leads to
-XWayland listening to a wrong address.
-
-Confirmed with lsof.
-
-BUG: 442362
-
-
-(cherry picked from commit 83a036e9d40475d5c07177bf2e8bba9bc0fd4aa5)
----
- src/xwl/lib/xwaylandsocket.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/xwl/lib/xwaylandsocket.cpp b/src/xwl/lib/xwaylandsocket.cpp
-index 786ab5cbbf..7cf9310584 100644
---- a/src/xwl/lib/xwaylandsocket.cpp
-+++ b/src/xwl/lib/xwaylandsocket.cpp
-@@ -42,19 +42,18 @@ UnixSocketAddress::UnixSocketAddress(const QString &socketPath, Type type)
- const QByteArray encodedSocketPath = QFile::encodeName(socketPath);
-
- int byteCount = offsetof(sockaddr_un, sun_path) + encodedSocketPath.size() + 1;
-- if (type == Type::Abstract) {
-- byteCount++; // For the first '\0'.
-- }
- m_buffer.resize(byteCount);
-
- sockaddr_un *address = reinterpret_cast<sockaddr_un *>(m_buffer.data());
- address->sun_family = AF_UNIX;
-
- if (type == Type::Unix) {
-- qstrcpy(address->sun_path, encodedSocketPath);
-+ memcpy(address->sun_path, encodedSocketPath.data(), encodedSocketPath.size());
-+ address->sun_path[encodedSocketPath.size()] = '\0';
- } else {
-+ // Abstract domain socket does not need the NUL-termination byte.
- *address->sun_path = '\0';
-- qstrcpy(address->sun_path + 1, encodedSocketPath);
-+ memcpy(address->sun_path + 1, encodedSocketPath.data(), encodedSocketPath.size());
- }
- }
-
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.3-revert-2560288e.patch b/kde-plasma/kwin/files/kwin-5.23.3-revert-2560288e.patch
deleted file mode 100644
index db91c918ec3d..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.3-revert-2560288e.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 325208347c40d7311aea83572b5150ba3750cba9 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 16 Nov 2021 22:37:26 +0200
-Subject: [PATCH] Revert "wayland: Check workspace position when preferred deco
- mode changes"
-
-This reverts commit 2560288e4b66acfdbb8a8f4daafd2d600aeb525a.
-
-It broke alacricitty. The fix is not obvious, so revert the commit for
-the time being.
-
-BUG: 445444
-
-
-(cherry picked from commit 068d60e36a112c6b901010331ef3a995019c97cb)
----
- src/xdgshellclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
-index af1bd57ac7..9e8216a3a0 100644
---- a/src/xdgshellclient.cpp
-+++ b/src/xdgshellclient.cpp
-@@ -1317,7 +1317,7 @@ void XdgToplevelClient::installXdgDecoration(XdgToplevelDecorationV1Interface *d
- connect(m_xdgDecoration, &XdgToplevelDecorationV1Interface::preferredModeChanged, this, [this] {
- if (m_isInitialized) {
- // force is true as we must send a new configure response.
-- updateDecoration(/* check_workspace_pos */ true, /* force */ true);
-+ updateDecoration(/* check_workspace_pos */ false, /* force */ true);
- }
- });
- }
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch
new file mode 100644
index 000000000000..38d4771c2345
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch
@@ -0,0 +1,32 @@
+From a5404234dbd26e170acb97789599fbcd705cf6cb Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Fri, 8 Apr 2022 17:47:09 +0200
+Subject: [PATCH] backends/drm: don't permanently disable VRR when the test
+ commit fails
+
+In 5.24, the same code path is used for testing direct scanout, so that
+causes false negatives. Generally though, the user setting shouldn't be
+touched, it's not really proper feedback for the driver or KWin having
+problems.
+
+
+(cherry picked from commit 2ef6215a517e4220f147f5327e7ecdad02762b64)
+---
+ src/backends/drm/drm_output.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
+index bd08631cf7..048803883b 100644
+--- a/src/backends/drm/drm_output.cpp
++++ b/src/backends/drm/drm_output.cpp
+@@ -337,7 +337,6 @@ bool DrmOutput::present(const QSharedPointer<DrmBuffer> &buffer, QRegion damaged
+ m_pipeline->applyPendingChanges();
+ } else {
+ m_pipeline->revertPendingChanges();
+- setVrrPolicy(RenderLoop::VrrPolicy::Never);
+ }
+ }
+ if (m_pipeline->present(buffer)) {
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch
new file mode 100644
index 000000000000..16c7756d33e2
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch
@@ -0,0 +1,214 @@
+From 82c2324b5675ea2d5e3b962f270bda1d186e7326 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Mon, 4 Apr 2022 20:19:05 +0200
+Subject: [PATCH] backends/drm: fetch immutable blobs in DrmProperty
+
+If the blob is fetched while there is no kernel-visible reference to it,
+the driver may re-use the blob ID. When DrmProperty is created or updated,
+KWin holds a reference on the blob via drmModeObjectProperties, so this
+should prevent any possible issues.
+
+CCBUG: 449285
+---
+ src/backends/drm/drm_object_connector.cpp | 13 +++-----
+ src/backends/drm/drm_object_plane.cpp | 39 +++++++++++------------
+ src/backends/drm/drm_property.cpp | 27 +++++++++++++++-
+ src/backends/drm/drm_property.h | 7 +++-
+ 4 files changed, 54 insertions(+), 32 deletions(-)
+
+diff --git a/src/backends/drm/drm_object_connector.cpp b/src/backends/drm/drm_object_connector.cpp
+index a0045290df..0cdbd70b4f 100644
+--- a/src/backends/drm/drm_object_connector.cpp
++++ b/src/backends/drm/drm_object_connector.cpp
+@@ -337,16 +337,11 @@ bool DrmConnector::updateProperties()
+ }
+
+ // parse edid
+- auto edidProp = getProp(PropertyIndex::Edid);
+- if (edidProp) {
+- DrmScopedPointer<drmModePropertyBlobRes> blob(drmModeGetPropertyBlob(gpu()->fd(), edidProp->current()));
+- if (blob && blob->data) {
+- m_edid = Edid(blob->data, blob->length);
+- if (!m_edid.isValid()) {
+- qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this;
+- }
++ if (const auto edidProp = getProp(PropertyIndex::Edid); edidProp && edidProp->immutableBlob()) {
++ m_edid = Edid(edidProp->immutableBlob()->data, edidProp->immutableBlob()->length);
++ if (!m_edid.isValid()) {
++ qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this;
+ }
+- deleteProp(PropertyIndex::Edid);
+ } else {
+ qCDebug(KWIN_DRM) << "Could not find edid for connector" << this;
+ }
+diff --git a/src/backends/drm/drm_object_plane.cpp b/src/backends/drm/drm_object_plane.cpp
+index 6967fdd50d..c4dcca96d4 100644
+--- a/src/backends/drm/drm_object_plane.cpp
++++ b/src/backends/drm/drm_object_plane.cpp
+@@ -73,29 +73,26 @@ bool DrmPlane::init()
+ checkSupport(5, Transformation::ReflectY);
+
+ // read formats from blob if available and if modifiers are supported, and from the plane object if not
+- if (auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && gpu()->addFB2ModifiersSupported()) {
+- DrmScopedPointer<drmModePropertyBlobRes> propertyBlob(drmModeGetPropertyBlob(gpu()->fd(), formatProp->current()));
+- if (propertyBlob && propertyBlob->data) {
+- auto blob = static_cast<drm_format_modifier_blob*>(propertyBlob->data);
+- auto modifiers = reinterpret_cast<drm_format_modifier*>(reinterpret_cast<uint8_t*>(blob) + blob->modifiers_offset);
+- uint32_t *formatarr = reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(blob) + blob->formats_offset);
+-
+- for (uint32_t f = 0; f < blob->count_formats; f++) {
+- auto format = formatarr[f];
+- QVector<uint64_t> mods;
+- for (uint32_t m = 0; m < blob->count_modifiers; m++) {
+- auto modifier = &modifiers[m];
+- // The modifier advertisement blob is partitioned into groups of 64 formats
+- if (m < modifier->offset || m > modifier->offset + 63) {
+- continue;
+- }
+- if (!(modifier->formats & (1 << (f - modifier->offset)))) {
+- continue;
+- }
+- mods << modifier->modifier;
++ if (const auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && formatProp->immutableBlob() && gpu()->addFB2ModifiersSupported()) {
++ auto blob = static_cast<drm_format_modifier_blob *>(formatProp->immutableBlob()->data);
++ auto modifiers = reinterpret_cast<drm_format_modifier *>(reinterpret_cast<uint8_t *>(blob) + blob->modifiers_offset);
++ uint32_t *formatarr = reinterpret_cast<uint32_t *>(reinterpret_cast<uint8_t *>(blob) + blob->formats_offset);
++
++ for (uint32_t f = 0; f < blob->count_formats; f++) {
++ auto format = formatarr[f];
++ QVector<uint64_t> mods;
++ for (uint32_t m = 0; m < blob->count_modifiers; m++) {
++ auto modifier = &modifiers[m];
++ // The modifier advertisement blob is partitioned into groups of 64 formats
++ if (m < modifier->offset || m > modifier->offset + 63) {
++ continue;
+ }
+- m_supportedFormats.insert(format, mods);
++ if (!(modifier->formats & (1 << (f - modifier->offset)))) {
++ continue;
++ }
++ mods << modifier->modifier;
+ }
++ m_supportedFormats.insert(format, mods);
+ }
+ } else {
+ for (uint32_t i = 0; i < p->count_formats; i++) {
+diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
+index 28af8ec07f..8ab0dc0e5a 100644
+--- a/src/backends/drm/drm_property.cpp
++++ b/src/backends/drm/drm_property.cpp
+@@ -24,6 +24,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val,
+ , m_next(val)
+ , m_current(val)
+ , m_immutable(prop->flags & DRM_MODE_PROP_IMMUTABLE)
++ , m_isBlob(prop->flags & DRM_MODE_PROP_BLOB)
+ , m_obj(obj)
+ {
+ if (!enumNames.isEmpty()) {
+@@ -35,6 +36,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val,
+ m_minValue = prop->values[0];
+ m_maxValue = prop->values[1];
+ }
++ updateBlob();
+ }
+
+ DrmProperty::~DrmProperty() = default;
+@@ -110,7 +112,10 @@ bool DrmProperty::needsCommit() const
+
+ void DrmProperty::setCurrent(uint64_t value)
+ {
+- m_current = value;
++ if (m_current != value) {
++ updateBlob();
++ m_current = value;
++ }
+ }
+
+ uint64_t DrmProperty::current() const
+@@ -122,10 +127,12 @@ QVector<QByteArray> DrmProperty::enumNames() const
+ {
+ return m_enumNames;
+ }
++
+ bool DrmProperty::hasEnum(uint64_t value) const
+ {
+ return m_enumMap.contains(value);
+ }
++
+ bool DrmProperty::hasAllEnums() const
+ {
+ return m_enumMap.count() == m_enumNames.count();
+@@ -166,4 +173,22 @@ uint64_t DrmProperty::maxValue() const
+ return m_maxValue;
+ }
+
++void DrmProperty::updateBlob()
++{
++ if (m_immutable && m_isBlob) {
++ if (m_current != 0) {
++ m_immutableBlob.reset(drmModeGetPropertyBlob(m_obj->gpu()->fd(), m_current));
++ if (m_immutableBlob && (!m_immutableBlob->data || !m_immutableBlob->length)) {
++ m_immutableBlob.reset();
++ }
++ } else {
++ m_immutableBlob.reset();
++ }
++ }
++}
++
++drmModePropertyBlobRes *DrmProperty::immutableBlob() const
++{
++ return m_immutableBlob.get();
++}
+ }
+diff --git a/src/backends/drm/drm_property.h b/src/backends/drm/drm_property.h
+index 48bdeafdc2..1ae547f41e 100644
+--- a/src/backends/drm/drm_property.h
++++ b/src/backends/drm/drm_property.h
+@@ -9,9 +9,9 @@
+ */
+
+ #pragma once
++#include "drm_pointer.h"
+
+ #include <xf86drmMode.h>
+-
+ #include <QVector>
+ #include <QMap>
+ #include <QByteArray>
+@@ -59,6 +59,7 @@ public:
+
+ void setCurrent(uint64_t value);
+ uint64_t current() const;
++ drmModePropertyBlobRes *immutableBlob() const;
+
+ uint64_t minValue() const;
+ uint64_t maxValue() const;
+@@ -78,6 +79,8 @@ public:
+ }
+
+ private:
++ void updateBlob();
++
+ uint32_t m_propId = 0;
+ QByteArray m_propName;
+
+@@ -89,6 +92,7 @@ private:
+ uint64_t m_next = 0;
+ // the value currently set for or by the kernel
+ uint64_t m_current = 0;
++ DrmScopedPointer<drmModePropertyBlobRes> m_immutableBlob;
+
+ uint64_t m_minValue = -1;
+ uint64_t m_maxValue = -1;
+@@ -96,6 +100,7 @@ private:
+ QMap<uint32_t, uint64_t> m_enumMap;
+ QVector<QByteArray> m_enumNames;
+ const bool m_immutable;
++ const bool m_isBlob;
+ bool m_legacy = false;
+ const DrmObject *m_obj;
+ };
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch
new file mode 100644
index 000000000000..acd7bf4149ab
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch
@@ -0,0 +1,26 @@
+From a35e3075a7aa4616c8930ccd3869dc4cca5d287e Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 9 Apr 2022 07:25:44 -0700
+Subject: [PATCH] Do not send overlay geometry to text input.
+
+(cherry picked from commit 374e94918238f3ddb9d00c542f281d3d8a309efb)
+---
+ src/inputmethod.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp
+index e7951d9580..5b8e54efbc 100644
+--- a/src/inputmethod.cpp
++++ b/src/inputmethod.cpp
+@@ -615,7 +615,7 @@ void InputMethod::updateInputPanelState()
+ const bool bottomKeyboard = m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay && m_inputClient->isShown();
+ m_trackedClient->setVirtualKeyboardGeometry(bottomKeyboard ? m_inputClient->inputGeometry() : QRect());
+
+- if (m_inputClient) {
++ if (m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay) {
+ overlap = m_trackedClient->frameGeometry() & m_inputClient->inputGeometry();
+ overlap.moveTo(m_trackedClient->mapToLocal(overlap.topLeft()));
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch
new file mode 100644
index 000000000000..667b91b8dc5c
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch
@@ -0,0 +1,41 @@
+From 7a26f93cb579cf6b1cbc1e32790f93be70013157 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Tue, 12 Apr 2022 15:45:52 +0200
+Subject: [PATCH] effects/kscreen: don't use xcb on Wayland
+
+BUG: 450564
+FIXED-IN: 5.24.5
+(cherry picked from commit db3f27336f2172fd70be3411874d9bbeb3db6a24)
+---
+ src/effects/kscreen/kscreen.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/effects/kscreen/kscreen.cpp b/src/effects/kscreen/kscreen.cpp
+index 9484399756..0673915aad 100644
+--- a/src/effects/kscreen/kscreen.cpp
++++ b/src/effects/kscreen/kscreen.cpp
+@@ -44,15 +44,15 @@ namespace KWin
+
+ KscreenEffect::KscreenEffect()
+ : Effect()
+- , m_atom(effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this))
++ , m_atom(effects->waylandDisplay() ? XCB_ATOM_NONE : effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this))
+ {
+ initConfig<KscreenConfig>();
+- connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify);
+- connect(effects, &EffectsHandler::xcbConnectionChanged, this,
+- [this] {
++ if (!effects->waylandDisplay()) {
++ connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify);
++ connect(effects, &EffectsHandler::xcbConnectionChanged, this, [this]() {
+ m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_KWIN_KSCREEN_SUPPORT"), this);
+- }
+- );
++ });
++ }
+ reconfigure(ReconfigureAll);
+
+ const QList<EffectScreen *> screens = effects->screens();
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch
new file mode 100644
index 000000000000..195d33b1f3a2
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch
@@ -0,0 +1,50 @@
+From c1d7919ad7cc8a7e55f5b93ec84de63547bc53b9 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Fri, 8 Apr 2022 22:53:08 +0200
+Subject: [PATCH] AbstractClient: Fix the current VD being always added to the
+ plasma interface
+
+When setting-up the plasma window interface we need to call
+`setOnAllDesktops()` after the actual virtual desktops have
+been set.
+
+Otherwise, the current desktop would be always added to the
+interface (as if the user were unsetting the "onAllDesktops"
+flag) and the plasma interface and KWin can get un-synced,
+specially if there are specific window rules.
+
+BUG: 452171
+FIXED-IN: 5.24.5
+
+
+(cherry picked from commit 4c8711f121430caa658f9848070e4e25c4a12208)
+---
+ src/abstract_client.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
+index 7e8a7eec04..0714b9ac3f 100644
+--- a/src/abstract_client.cpp
++++ b/src/abstract_client.cpp
+@@ -1488,7 +1488,6 @@ void AbstractClient::setupWindowManagementInterface()
+ w->setKeepBelow(keepBelow());
+ w->setMaximized(maximizeMode() == KWin::MaximizeFull);
+ w->setMinimized(isMinimized());
+- w->setOnAllDesktops(isOnAllDesktops());
+ w->setDemandsAttention(isDemandingAttention());
+ w->setCloseable(isCloseable());
+ w->setMaximizeable(isMaximizable());
+@@ -1620,6 +1619,10 @@ void AbstractClient::setupWindowManagementInterface()
+ for (const auto vd : qAsConst(m_desktops)) {
+ w->addPlasmaVirtualDesktop(vd->id());
+ }
++ // We need to set `OnAllDesktops` after the actual VD list has been added.
++ // Otherwise it will unconditionally add the current desktop to the interface
++ // which may not be the case, for example, when using rules
++ w->setOnAllDesktops(isOnAllDesktops());
+
+ //Plasma Virtual desktop management
+ //show/hide when the window enters/exits from desktop
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch
new file mode 100644
index 000000000000..9e9a4dabc998
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch
@@ -0,0 +1,44 @@
+From ee625b2d8acad2ba81693107740a12d8a03863c0 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 28 Mar 2022 03:40:12 +0200
+Subject: [PATCH] Fix unlocking wayland sessions
+
+We were never issuing a repaint which confused thoroughly the
+compositor.
+
+BUG: 447705
+---
+ src/wayland_server.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
+index eb3600f824..9e60787465 100644
+--- a/src/wayland_server.cpp
++++ b/src/wayland_server.cpp
+@@ -15,6 +15,7 @@
+ #include "inputpanelv1integration.h"
+ #include "keyboard_input.h"
+ #include "screens.h"
++#include "scene.h"
+ #include "layershellv1integration.h"
+ #include "main.h"
+ #include "xdgshellintegration.h"
+@@ -610,6 +611,7 @@ void WaylandServer::initScreenLocker()
+ connect(seat, &KWaylandServer::SeatInterface::timestampChanged,
+ screenLockerApp, &ScreenLocker::KSldApp::userActivity);
+ }
++ Compositor::self()->scene()->addRepaintFull();
+ }
+ );
+
+@@ -627,6 +629,7 @@ void WaylandServer::initScreenLocker()
+ screenLockerApp, &ScreenLocker::KSldApp::userActivity);
+ }
+ ScreenLocker::KSldApp::self()->setWaylandFd(-1);
++ Compositor::self()->scene()->addRepaintFull();
+ }
+ );
+
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch
new file mode 100644
index 000000000000..4defd5ae5945
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch
@@ -0,0 +1,93 @@
+From 9d38f57d84fb9a6f2c4e60f7051f685842f34e0f Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Mon, 28 Mar 2022 18:08:59 +0200
+Subject: [PATCH] waylandserver: only signal lockScreenShown once it has
+ actually been shown
+
+When the system goes to suspend and screen locking for suspend is enabled,
+suspend is inhibited until ScreenLocker::KSldApp::self()->lockScreenShown()
+gets called, in order to make sure that the lockscreen is shown before the
+system goes to standby, and thus also when the system wakes (instead of
+potentially sensitive user information).
+However, signalling that when the lockscreen gets mapped can't work reliably,
+as it's then a matter of timing whether or not KWin actually presents an
+image with the lockscreen before suspending. To fix that, this commit replaces
+that logic with only calling lockScreenShown once every output actually got a
+lockscreen presented.
+---
+ src/wayland_server.cpp | 25 +++++++++++++++++++++----
+ src/wayland_server.h | 10 ++++++++++
+ 2 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
+index c850a1b697..6d5e1206a5 100644
+--- a/src/wayland_server.cpp
++++ b/src/wayland_server.cpp
+@@ -213,10 +213,6 @@ KWaylandServer::ClientConnection *WaylandServer::inputMethodConnection() const
+
+ void WaylandServer::registerShellClient(AbstractClient *client)
+ {
+- if (client->isLockScreen()) {
+- ScreenLocker::KSldApp::self()->lockScreenShown();
+- }
+-
+ if (client->readyForPainting()) {
+ Q_EMIT shellClientAdded(client);
+ } else {
+@@ -623,6 +619,8 @@ void WaylandServer::initScreenLocker()
+ m_screenLockerClientConnection = nullptr;
+ }
+
++ new LockScreenPresentationWatcher(this);
++
+ const QVector<SeatInterface *> seatIfaces = m_display->seats();
+ for (auto *seat : seatIfaces) {
+ disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged,
+@@ -797,4 +795,23 @@ QString WaylandServer::socketName() const
+ return QString();
+ }
+
++WaylandServer::LockScreenPresentationWatcher::LockScreenPresentationWatcher(WaylandServer *server)
++{
++ connect(server, &WaylandServer::shellClientAdded, this, [this](AbstractClient *client) {
++ if (client->isLockScreen()) {
++ connect(client->output()->renderLoop(), &RenderLoop::framePresented, this, [this, client]() {
++ // only signal lockScreenShown once all outputs have been presented at least once
++ m_signaledOutputs << client->output();
++ if (m_signaledOutputs.size() == kwinApp()->platform()->enabledOutputs().size()) {
++ ScreenLocker::KSldApp::self()->lockScreenShown();
++ delete this;
++ }
++ });
++ }
++ });
++ QTimer::singleShot(1000, this, [this]() {
++ ScreenLocker::KSldApp::self()->lockScreenShown();
++ delete this;
++ });
++}
+ }
+diff --git a/src/wayland_server.h b/src/wayland_server.h
+index bf1ba6eee5..58dda9a7a2 100644
+--- a/src/wayland_server.h
++++ b/src/wayland_server.h
+@@ -243,6 +243,16 @@ private:
+ void handleOutputRemoved(AbstractOutput *output);
+ void handleOutputEnabled(AbstractOutput *output);
+ void handleOutputDisabled(AbstractOutput *output);
++
++ class LockScreenPresentationWatcher : public QObject
++ {
++ public:
++ LockScreenPresentationWatcher(WaylandServer *server);
++
++ private:
++ QSet<AbstractOutput *> m_signaledOutputs;
++ };
++
+ KWaylandServer::Display *m_display = nullptr;
+ KWaylandServer::CompositorInterface *m_compositor = nullptr;
+ KWaylandServer::SeatInterface *m_seat = nullptr;
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch
new file mode 100644
index 000000000000..0607e2ff3030
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch
@@ -0,0 +1,36 @@
+From 388402c3b1b37d9f72597aae8d6670e8c0edeb14 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 6 Apr 2022 21:08:25 +0200
+Subject: [PATCH] waylandserver: move LockScreenPresentationWatcher to the
+ correct place
+
+CCBUG: 452334
+---
+ src/wayland_server.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
+index 6d5e1206a5..eb3600f824 100644
+--- a/src/wayland_server.cpp
++++ b/src/wayland_server.cpp
+@@ -603,6 +603,8 @@ void WaylandServer::initScreenLocker()
+ }
+ ScreenLocker::KSldApp::self()->setWaylandFd(clientFd);
+
++ new LockScreenPresentationWatcher(this);
++
+ const QVector<SeatInterface *> seatIfaces = m_display->seats();
+ for (auto *seat : seatIfaces) {
+ connect(seat, &KWaylandServer::SeatInterface::timestampChanged,
+@@ -619,8 +621,6 @@ void WaylandServer::initScreenLocker()
+ m_screenLockerClientConnection = nullptr;
+ }
+
+- new LockScreenPresentationWatcher(this);
+-
+ const QVector<SeatInterface *> seatIfaces = m_display->seats();
+ for (auto *seat : seatIfaces) {
+ disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged,
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch b/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch
new file mode 100644
index 000000000000..8efa6b637222
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch
@@ -0,0 +1,32 @@
+From 5390a4978f3a3903ede15ecd94a750b37931fbd2 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 6 Apr 2022 00:33:21 +0200
+Subject: [PATCH] xdgactivation: Demand attention when a process fails to
+ resolve its token
+
+In xdg_activation_v1, if a process fails to negotiate activation, at
+least decorate it as demanding attention.
+This will give apps ways to indicate attention is required. It can can also
+help detect clients doing weird things.
+
+
+(cherry picked from commit 52035f43b90738e2efb4fd7b482719c1ea458578)
+---
+ src/xdgactivationv1.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp
+index e2270a3393..97f8575c29 100644
+--- a/src/xdgactivationv1.cpp
++++ b/src/xdgactivationv1.cpp
+@@ -76,6 +76,7 @@ void XdgActivationV1Integration::activateSurface(SurfaceInterface *surface, cons
+
+ if (!m_currentActivationToken || m_currentActivationToken->token != token) {
+ qCDebug(KWIN_CORE) << "Refusing to activate " << client << " (provided token: " << token << ", current token:" << (m_currentActivationToken ? m_currentActivationToken->token : QStringLiteral("null")) << ")";
++ client->demandAttention();
+ return;
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch b/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch
new file mode 100644
index 000000000000..d5b1f8c3864e
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch
@@ -0,0 +1,65 @@
+From 7fcf36d636f62f101397d88ad6c448f54da79e46 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Fri, 13 May 2022 15:37:13 +0000
+Subject: [PATCH] effects/overview: hide panels
+
+This makes it consistent with WindowView (and the panel window doesn't respond
+to input anyways even if shown, which is misleading).
+
+BUG: 444274
+FIXED-IN: 5.24.6
+
+
+(cherry picked from commit db2af5500f964f3eefde60183b69f21125aeb194)
+---
+ src/effects/overview/qml/ScreenView.qml | 20 ++++++++------------
+ 1 file changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/src/effects/overview/qml/ScreenView.qml b/src/effects/overview/qml/ScreenView.qml
+index 40cc29f4c7..39119e40b9 100644
+--- a/src/effects/overview/qml/ScreenView.qml
++++ b/src/effects/overview/qml/ScreenView.qml
+@@ -70,16 +70,8 @@ FocusScope {
+ }
+ }
+
+- ExpoArea {
+- id: heapArea
+- screen: targetScreen
+- }
+-
+ Column {
+- x: heapArea.x
+- y: heapArea.y
+- width: heapArea.width
+- height: heapArea.height
++ anchors.fill: parent
+
+ Item {
+ id: topBar
+@@ -176,15 +168,19 @@ FocusScope {
+
+ KWinComponents.WindowThumbnailItem {
+ id: windowThumbnail
+- visible: !model.client.hidden
++ visible: !model.client.hidden && opacity > 0
+ wId: model.client.internalId
+ x: model.client.x - targetScreen.geometry.x
+ y: model.client.y - targetScreen.geometry.y
+ width: model.client.width
+ height: model.client.height
++ opacity: container.effect.gestureInProgress
++ ? 1 - container.effect.partialActivationFactor
++ : (model.client.hidden || container.organized) ? 0 : 1
+
+- TapHandler {
+- onTapped: effect.deactivate();
++ Behavior on opacity {
++ enabled: !container.effect.gestureInProgress
++ NumberAnimation { duration: animationDuration; easing.type: Easing.OutCubic }
+ }
+ }
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch
new file mode 100644
index 000000000000..53c05da522ec
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch
@@ -0,0 +1,59 @@
+From 3b58fe4bde0722b352e4114adb992a2ed2c96423 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Sat, 7 May 2022 21:23:17 +0200
+Subject: [PATCH] backends/drm: consider escaped separators KWIN_DRM_DEVICES
+
+':' conflicts with the file names in /dev/dri/by-path, so allow it to be
+escaped with '\'
+
+CCBUG: 453386
+
+
+(cherry picked from commit a110aabbccf56019bdc324b3c751112f35ec3f6c)
+---
+ src/backends/drm/drm_backend.cpp | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp
+index 272dba702c..567ea3f696 100644
+--- a/src/backends/drm/drm_backend.cpp
++++ b/src/backends/drm/drm_backend.cpp
+@@ -57,12 +57,34 @@
+ namespace KWin
+ {
+
++static QStringList splitPathList(const QString &input, const QChar delimiter)
++{
++ QStringList ret;
++ QString tmp;
++ for (int i = 0; i < input.size(); i++) {
++ if (input[i] == delimiter) {
++ if (i > 0 && input[i - 1] == '\\') {
++ tmp[tmp.size() - 1] = delimiter;
++ } else if (!tmp.isEmpty()) {
++ ret.append(tmp);
++ tmp = QString();
++ }
++ } else {
++ tmp.append(input[i]);
++ }
++ }
++ if (!tmp.isEmpty()) {
++ ret.append(tmp);
++ }
++ return ret;
++}
++
+ DrmBackend::DrmBackend(QObject *parent)
+ : Platform(parent)
+ , m_udev(new Udev)
+ , m_udevMonitor(m_udev->monitor())
+ , m_session(Session::create(this))
+- , m_explicitGpus(qEnvironmentVariable("KWIN_DRM_DEVICES").split(':', Qt::SkipEmptyParts))
++ , m_explicitGpus(splitPathList(qEnvironmentVariable("KWIN_DRM_DEVICES"), ':'))
+ , m_dpmsFilter()
+ {
+ setSupportsPointerWarping(true);
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch
new file mode 100644
index 000000000000..d38e11375bbe
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch
@@ -0,0 +1,42 @@
+From e2d271b6365188a86755af82745ad37535ceb4d7 Mon Sep 17 00:00:00 2001
+From: Erik Kurzinger <ekurzinger@nvidia.com>
+Date: Sun, 8 May 2022 12:16:20 -0700
+Subject: [PATCH] platforms/drm: set read buffer in
+ GbmSurface::makeContextCurrent
+
+The first time the GBM backend's EGL context is made current after
+creation, both the read and draw surfaces are set to EGL_NO_SURFACE.
+This will set the GL read and draw buffers to GL_NONE in accordance with
+the EGL spec.
+
+When a real surface is later made current, however, the spec is arguably
+unclear on whether the read and draw buffers should remain set to
+GL_NONE or whether they should be restored to the default GL_BACK. The
+Mesa driver does the latter, the NVIDIA driver does the former.
+
+To work around this difference, Kwin has an explicit call to
+glDrawBuffer in GbmSurface::makeContextCurrent. It does not have a
+corresponding call to glReadBuffer, though, which can cause some desktop
+effects such as background contrast to render incorrectly with the
+NVIDIA driver. This change adds that missing call.
+
+(cherry picked from commit e6d2bc153f499d1ec3510c02badca38d4c42c340)
+---
+ src/backends/drm/egl_gbm_backend.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backends/drm/egl_gbm_backend.cpp b/src/backends/drm/egl_gbm_backend.cpp
+index 5a0be7ccaf..b34fa1320b 100644
+--- a/src/backends/drm/egl_gbm_backend.cpp
++++ b/src/backends/drm/egl_gbm_backend.cpp
+@@ -377,6 +377,7 @@ bool EglGbmBackend::makeContextCurrent(const Output::RenderData &render) const
+ }
+ if (!GLPlatform::instance()->isGLES()) {
+ glDrawBuffer(GL_BACK);
++ glReadBuffer(GL_BACK);
+ }
+ return true;
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch b/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch
new file mode 100644
index 000000000000..f79d4bba71ce
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch
@@ -0,0 +1,32 @@
+From f7b1edc79e9526fe6bad69a8ad475a5d77e5aead Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Tue, 10 May 2022 13:07:03 +0200
+Subject: [PATCH] tabbox: don't dismiss popups
+
+The glitches that dismissing popups was supposed to prevent are apparently
+no longer present.
+
+BUG: 446318
+(cherry picked from commit 94b0ca814688bf3622aa53f4d4d26f97d8de7306)
+---
+ src/tabbox/tabbox.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp
+index a1c50b27fc..76a50795ad 100644
+--- a/src/tabbox/tabbox.cpp
++++ b/src/tabbox/tabbox.cpp
+@@ -1020,10 +1020,6 @@ void TabBox::navigatingThroughWindows(bool forward, const QKeySequence &shortcut
+ // CDE style raise / lower
+ CDEWalkThroughWindows(forward);
+ } else {
+- workspace()->forEachAbstractClient([](Toplevel *toplevel) {
+- if (toplevel->isPopupWindow())
+- toplevel->popupDone();
+- });
+ if (areModKeysDepressed(shortcut)) {
+ if (startKDEWalkThroughWindows(mode))
+ KDEWalkThroughWindows(forward);
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.24.4-r1.ebuild b/kde-plasma/kwin/kwin-5.24.4-r1.ebuild
new file mode 100644
index 000000000000..354b862b91c3
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.24.4-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-libs/libinput-1.19
+ >=dev-libs/wayland-1.2
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5=
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5=
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kdecoration-${PVCUT}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwayland-server-${PVCUT}:5
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/lcms:2
+ media-libs/libepoxy
+ >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+ virtual/libudev:=
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libdrm
+ >=x11-libs/libxcb-1.10
+ >=x11-libs/libxkbcommon-0.7.0
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ accessibility? ( media-libs/libqaccessibilityclient:5 )
+ caps? ( sys-libs/libcap )
+ gles2-only? ( media-libs/mesa[gles2] )
+ plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+ screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+ sys-apps/hwdata
+ x11-base/xwayland
+ multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ x11-base/xorg-proto
+ test? (
+ dev-libs/plasma-wayland-protocols
+ >=dev-libs/wayland-protocols-1.19
+ )
+"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-waylandserver-lockScreenShown.patch
+ "${FILESDIR}"/${P}-xdgactivation-demand-attention.patch
+ "${FILESDIR}"/${P}-waylandserver-move-LockScreenPresentationWatcher.patch
+ "${FILESDIR}"/${P}-backends-drm-dont-perm-disable-vrr.patch
+ "${FILESDIR}"/${P}-backends-drm-fetch-immutable-blobs.patch # KDE-bug 449285
+ "${FILESDIR}"/${P}-dont-send-geom-to-text-input.patch
+ "${FILESDIR}"/${P}-fix-current-VD-always-added.patch # KDE-bug 452171
+ "${FILESDIR}"/${P}-dont-use-xcb-in-wayland.patch # KDE-bug 450564
+ "${FILESDIR}"/${P}-fix-unlocking-wayland-sessions.patch # KDE-bug 447705
+)
+
+src_prepare() {
+ ecm_src_prepare
+ use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package accessibility QAccessibilityClient)
+ $(cmake_use_find_package caps Libcap)
+ $(cmake_use_find_package plasma KF5Runner)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ optfeature "color management support" x11-misc/colord
+ elog
+ elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+ elog "windows to the end of the list was changed so that it remains in the"
+ elog "original order. To revert to the well established behavior:"
+ elog
+ elog " - Edit ~/.config/kwinrc"
+ elog " - Find [TabBox] section"
+ elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.24.5-r1.ebuild
index 43b14d49330f..12d15b83a199 100644
--- a/kde-plasma/kwin/kwin-5.22.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="optional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -15,13 +15,13 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="accessibility caps gles2-only multimedia plasma screencast"
RESTRICT="test"
COMMON_DEPEND="
- >=dev-libs/libinput-1.14
+ >=dev-libs/libinput-1.19
>=dev-libs/wayland-1.2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -36,12 +36,12 @@ COMMON_DEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5=
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5=
- >=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/breeze-${PVCUT}:5
@@ -60,7 +60,7 @@ COMMON_DEPEND="
media-libs/freetype
media-libs/lcms:2
media-libs/libepoxy
- media-libs/mesa[egl(+),gbm(+),wayland,X(+)]
+ >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
virtual/libudev:=
x11-libs/libX11
x11-libs/libXi
@@ -77,17 +77,14 @@ COMMON_DEPEND="
plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
screencast? ( >=media-video/pipewire-0.3:= )
"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- || (
- x11-base/xwayland
- x11-base/xorg-server[wayland(-)]
- )
+ sys-apps/hwdata
+ x11-base/xwayland
multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
"
DEPEND="${COMMON_DEPEND}
@@ -95,16 +92,18 @@ DEPEND="${COMMON_DEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
x11-base/xorg-proto
test? (
+ dev-libs/plasma-wayland-protocols
>=dev-libs/wayland-protocols-1.19
- >=dev-qt/qtwayland-${QTMIN}:5
)
"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
- "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bugs 810511, 813228
+ "${FILESDIR}"/${P}-fix-multi-gpu-double-copy.patch # KDE-bug 453386
+ "${FILESDIR}"/${P}-tabbox-dont-dismiss-popups.patch # KDE-bug 446318
+ "${FILESDIR}"/${P}-effects-overview-hide-panels.patch # KDE-bug 444274
+ "${FILESDIR}"/${P}-fix-nvidia-render-glitches.patch
)
src_prepare() {
@@ -113,8 +112,7 @@ src_prepare() {
# TODO: try to get a build switch upstreamed
if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
- -i CMakeLists.txt || die
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
}
diff --git a/kde-plasma/kwin/kwin-5.23.3-r1.ebuild b/kde-plasma/kwin/kwin-5.24.5.ebuild
index 24a401f083d2..a47f4289b4c9 100644
--- a/kde-plasma/kwin/kwin-5.23.3-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -21,7 +21,7 @@ IUSE="accessibility caps gles2-only multimedia plasma screencast"
RESTRICT="test"
COMMON_DEPEND="
- >=dev-libs/libinput-1.14
+ >=dev-libs/libinput-1.19
>=dev-libs/wayland-1.2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -36,6 +36,7 @@ COMMON_DEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5=
>=kde-frameworks/ki18n-${KFMIN}:5
@@ -76,17 +77,14 @@ COMMON_DEPEND="
plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
screencast? ( >=media-video/pipewire-0.3:= )
"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- || (
- x11-base/xwayland
- x11-base/xorg-server[wayland(-)]
- )
+ sys-apps/hwdata
+ x11-base/xwayland
multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
"
DEPEND="${COMMON_DEPEND}
@@ -94,18 +92,13 @@ DEPEND="${COMMON_DEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
x11-base/xorg-proto
test? (
+ dev-libs/plasma-wayland-protocols
>=dev-libs/wayland-protocols-1.19
- >=dev-qt/qtwayland-${QTMIN}:5
)
"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-PATCHES=(
- "${FILESDIR}/${P}-fix-xwayland-abstract-socket-addr.patch" # KDE-bug 442362, bug 813888
- "${FILESDIR}/${P}-revert-2560288e.patch" # KDE-bug 445444
- "${FILESDIR}/${P}-enable-window-rules-for-all-xdg-toplevel.patch"
-)
-
src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 55467b8cc75a..430dc5e6db2b 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
-DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
-DIST kwrited-5.23.3.tar.xz 20512 BLAKE2B a350cc45ecee4bf744d787e1cce7ed30b4c6f1f5fdb443ac2a5e015c4f8a03cfc0871b8b70848f64e67baee9cad4769b21076616e8f0ebcc6eb397235b6a478a SHA512 3637d06a2286b3df90523833de68fadf846d61ae95fc01174b8237b1a41bf878986128b13d32c323ac1001f215fce0fa2b99b263533fa465a6b4c12f27d9e23c
+DIST kwrited-5.24.4.tar.xz 20920 BLAKE2B 82d55a6d16cb4ac81180eee7a9b4a52f85421008f4a71c816b6258cbde446e9ef3e56ab1a1c67b3dcbdb95ee5e1648530df713ac68510e172306e4c7625f4cb8 SHA512 ea2903fa66404beed68c7485edd88e85fcb6edc357ec1044a781895bf338fdd376edcf2d9662f5170615f5c2d729f1e642b70086a568501ca714c86842dac152
+DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4
diff --git a/kde-plasma/kwrited/kwrited-5.22.5.ebuild b/kde-plasma/kwrited/kwrited-5.24.4.ebuild
index 96a819be2e28..7292d7ecfbba 100644
--- a/kde-plasma/kwrited/kwrited-5.22.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/kwrited/kwrited-5.23.3.ebuild b/kde-plasma/kwrited/kwrited-5.24.5.ebuild
index aa1c51796c7d..638d75a36625 100644
--- a/kde-plasma/kwrited/kwrited-5.23.3.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index e3ce102202a8..1bf5bd7f0490 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,2 +1,2 @@
-DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
-DIST layer-shell-qt-5.23.3.tar.xz 17768 BLAKE2B 2d089abb74bb0c6b3b3e3dd2b6766ffd085257fdfc74f612c525fd09778ddb601a4d76a0cc1e9ad5236e14c937a9b54c2a8aebce62cbfefbb9771d090232687e SHA512 d5fce3f05279accbf116619382edd077204c01a42a4d8eb2690879020d2a31a536368949049a0c03e0df425c225c46c15971f61dc01bc15d278ff5d18450ba95
+DIST layer-shell-qt-5.24.4.tar.xz 17876 BLAKE2B 42132f550ed135dd7d8c9d7b9fca1265c288ceb1f4dffb72e7db95697d475c6175e033cbda11b3557b19771d95f549b62f5cc22a5e7d24df1726e34b5ce0185a SHA512 6ed294219947d27cbf71777f4f1df7a2a2b0f67369b1e7bb018d2a0c3d464aecf6f62cba3fe8dc45c090a441a503648950198ae6eb681b200ab416274578ff9d
+DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
index a83e73a29d85..3b6ca14f2ea1 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
dev-libs/wayland-protocols
"
BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
dev-util/wayland-scanner
virtual/pkgconfig
"
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.3.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
index 582e24874ff2..853077c48cf6 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.3.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
dev-libs/wayland-protocols
"
BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
dev-util/wayland-scanner
virtual/pkgconfig
"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index ea0a7520fc8d..c94bac22876d 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
-DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
-DIST libkscreen-5.23.3.tar.xz 97936 BLAKE2B d3aabb35e400d0ee522fa47e4088a8e8d8f935870358aaa0f5ce562f8cddba83f4c84e571842e6c6a4cbb0bbaf85b7e3d4ddbd875daab7fe7271ab6e3ffef438 SHA512 4c167f849dd123abc7bfc386a119cb7d48d2665d80a83be889e8f049e64b8409fc130ec5cba7ccc442cd2e09d03c99f91010cdd09af9be8365a708a37fcc63a0
+DIST libkscreen-5.24.4.tar.xz 99476 BLAKE2B db545a542a77832d5ac877c953cd7a36dcc3b4df4495768543570deb2973e1aee6572942a9fecd17746e6f8708b4c1016cca57bb65151cd7246f8802d2b23706 SHA512 72be6b77f5fe4d77ef29c07d8bab2d1c5a94cd9aa31a324cf6d883a2e6132ee923c0fa02a4bc2432df7da4171dfbdd3a608117eeccfafe9155002cc8d50b3020
+DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
index b545bcd9bc4a..e1bbeb4e5445 100644
--- a/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_QTHELP="true"
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -21,7 +21,8 @@ IUSE=""
# requires running session
RESTRICT="test"
-DEPEND="
+RDEPEND="
+ dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -29,4 +30,10 @@ DEPEND="
>=kde-frameworks/kwayland-${KFMIN}:5
x11-libs/libxcb
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
+"
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
index b240516c9862..8aed7bcf7d06 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.3.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_QTHELP="true"
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -21,7 +21,8 @@ IUSE=""
# requires running session
RESTRICT="test"
-DEPEND="
+RDEPEND="
+ dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -29,4 +30,10 @@ DEPEND="
>=kde-frameworks/kwayland-${KFMIN}:5
x11-libs/libxcb
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index d198924c765e..f9461f019009 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
-DIST libksysguard-5.23.3.tar.xz 769224 BLAKE2B a5e00f873e93f4427fe4437edd6ab6ce7d39cf4ecb7c99a61a3f1fe2577aaa532881c25d165b7af63a6392a7ee18044a1f3da96471ba16c4d840226611e15b67 SHA512 a5aab649312f8188e0d592170dfde05b0d3693869dfb00392429968bbaa124c9c215643f9a67f319beaa79ad5ac50d02425ad5c43dc974083a2bd233b45cc042
+DIST libksysguard-5.24.4.tar.xz 767300 BLAKE2B cfb42c1da82bb90c33ab14d87351e009759afd294b3cd44ab98f2310f0dba520f421c26d3db4f1031d8d8c6086e63b14eebcc3ceaa4db2d9479d6571c409450b SHA512 a43c10109ee36d4840fae30ef73209e0a0bf43c076e94d57642aa6f89aadb95928751281342e52f01357b2b1dde788c5d034c595e22f5fc6ce1c2da3979dc5c2
+DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
deleted file mode 100644
index 352cad76b765..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a81b823c8e169ee5a4212070a9cc77dad27aa7b6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Sep 2021 16:08:30 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 2e95624..c69a123 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -243,7 +243,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
- mScriptingHtmlDialog->webView()->load(fileName);
- #else
- QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
-- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
-+ QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
- #endif
- }
- #if WEBENGINE_SCRIPTING_ENABLED
---
-2.33.0
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild
index 75b9c0ee7c19..8a5ba3fd7afa 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_DESIGNERPLUGIN="true"
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -37,6 +37,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
net-libs/libpcap
+ sys-apps/lm-sensors:=
sys-libs/libcap
sys-libs/zlib
webengine? (
@@ -58,7 +59,7 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.18.80:5
"
-PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
src_configure() {
local mycmakeargs=(
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.5.ebuild
index 1a8b55594efa..5b960e03fd26 100644
--- a/kde-plasma/libksysguard/libksysguard-5.23.3.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_DESIGNERPLUGIN="true"
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 7d5cecf5655f..be5c47e6ef60 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
+DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
deleted file mode 100644
index 430b98aadcb9..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 Feb 2020 18:29:57 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 66 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 015c5181f..0aa635e11 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+ set(PROJECT_VERSION "GENTOO_PV")
-+ set(PROJECT_VERSION_MAJOR 5)
-+
-+ cmake_minimum_required(VERSION 3.16)
-+
-+ set(QT_MIN_VERSION "5.15.0")
-+ set(KF5_MIN_VERSION "5.82.0")
-+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+ include(KDEInstallDirs)
-+ include(KDECMakeSettings)
-+ include(KDECompilerSettings NO_POLICY_SCOPE)
-+ include(ECMMarkNonGuiExecutable)
-+ include(CMakePackageConfigHelpers)
-+ include(WriteBasicConfigVersionFile)
-+ include(CheckIncludeFiles)
-+ include(FeatureSummary)
-+ include(ECMQtDeclareLoggingCategory)
-+ include(KDEPackageAppTemplates)
-+ include(ECMMarkAsTest)
-+ include(GenerateExportHeader)
-+
-+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem)
-+
-+ find_package(KWinDBusInterface CONFIG REQUIRED)
-+ find_package(KScreenLocker 5.13.80 REQUIRED)
-+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-+
-+ find_package(X11)
-+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+ URL "http://www.x.org"
-+ TYPE OPTIONAL
-+ PURPOSE "Required for X11 support")
-+
-+ if(X11_FOUND)
-+ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+ set(HAVE_X11 1)
-+ endif()
-+
-+ if(BUILD_TESTING)
-+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+ endif()
-+
-+ check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+endif()
-
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
- kworkspace.cpp
-@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+endif()
-
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
-
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
-
- add_library(kworkspace ${kworkspace_LIB_SRCS})
-@@ -98,3 +158,8 @@ if(BUILD_TESTING)
- add_subdirectory(autotests)
- add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
---
-2.31.1
-
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
deleted file mode 100644
index 411bebf70412..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
-From: Joe Breuer <kde@jmbreuer.net>
-Date: Mon, 1 Nov 2021 07:19:51 +0000
-Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
- ksmserver-logout-greeter, by making the DBus calls synchronous.
-
----
- libkworkspace/sessionmanagementbackend.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
-index 83cd39395..a77a8a475 100644
---- a/sessionmanagementbackend.cpp
-+++ b/sessionmanagementbackend.cpp
-@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
- {
- // logind will confirm credentials with the caller, if the app quits after sending this
- // this may fail
-- // its not really needed for suspend tasks where the calling app won't be closing
- m_login1->PowerOff(true).waitForFinished();
- }
-
-@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
-
- void LogindSessionBackend::suspend()
- {
-- m_login1->Suspend(true);
-+ // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these
-+ // and will quit immediately after
-+ m_login1->Suspend(true).waitForFinished();
- }
-
- void LogindSessionBackend::hybridSuspend()
- {
-- m_login1->HybridSleep(true);
-+ m_login1->HybridSleep(true).waitForFinished();
- }
-
- void LogindSessionBackend::hibernate()
- {
-- m_login1->Hibernate(true);
-+ m_login1->Hibernate(true).waitForFinished();;
- }
-
- bool LogindSessionBackend::canShutdown() const
---
-GitLab
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
index fcf6591d2def..14acef8df3b4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -45,7 +45,7 @@ src_prepare() {
cp -a ../po ./ || die
fi
- eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
+ eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
cat >> CMakeLists.txt <<- _EOF_ || die
ki18n_install(po)
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
index 12ee0890aa83..7b3149edc1d7 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -37,11 +37,6 @@ DEPEND="${RDEPEND}
S="${S}/${PN}"
-PATCHES=(
- # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
- "${FILESDIR}"/${P}-synchronous-dbus-calls.patch # bug 818124
-)
-
src_prepare() {
# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 259302dfc535..dd0172b231c7 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
-DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
-DIST milou-5.23.3.tar.xz 47924 BLAKE2B 8adf422da570808212e68318f1811c3cbb071846e0ec66f48676989a5690d384301ba0612e7cf7813502ec710b6e00e70ff4b60ffca22c2496e917d340deba48 SHA512 889819d6501a31062fb48dc1774a89baffc96897583bfb02ca78ccea34980ad3fbbd252ebca6c24abbcfbe86868397f0e3a5c10885a3f01631047ef05fb2970d
+DIST milou-5.24.4.tar.xz 48236 BLAKE2B 286f746a3fe632098531f03557b763f636390eb73e94c31bbb8e5aa70b7ec67066121544d327fdc5e2f669ffba9930bc6d1d3a546fb216e9bb7bf2493eb4bcb9 SHA512 ef41d274970e38f45e26bc986948e3ba49d0ef54a907e64fc36f15ed9369d3c4cd5e2566b25a2d3499b123cb0ec20eca9c777ab3a66248e6a5a824d7b7c4ae96
+DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c
diff --git a/kde-plasma/milou/milou-5.22.5.ebuild b/kde-plasma/milou/milou-5.24.4.ebuild
index ea3ec038c10b..f74c41e92e5c 100644
--- a/kde-plasma/milou/milou-5.22.5.ebuild
+++ b/kde-plasma/milou/milou-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/milou/milou-5.23.3.ebuild b/kde-plasma/milou/milou-5.24.5.ebuild
index bfa5e8e64e63..5aa3ceefc899 100644
--- a/kde-plasma/milou/milou-5.23.3.ebuild
+++ b/kde-plasma/milou/milou-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index b47a28e5bbb9..895d0849e124 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
-DIST oxygen-5.23.3.tar.xz 4609612 BLAKE2B cbe0c1987b5e3ef6ec75fba39af177b9e5481611ee287ec0af77d049bc78c280d4bc98912f7075718af1a7c7c2bc61d5fdc9663e007ec0067a482ce967197063 SHA512 9dd4d01b00ba975aea943501a4936fcd9f5495227c7b2eed482508ddda82ef336d7f0ab74de70de08dbb1810dde6300c600f3b111729223f52dc307aface2b2d
+DIST oxygen-5.24.4.tar.xz 4615036 BLAKE2B e6a6aea36d9de13ebf5bbbcb02be1631a86d415d7e838fd5d389bca8c6bc8ad34257f30d1bb040015bb1f0cf20611b54012072fb6ffe99aa0a3f4149d3028906 SHA512 dad2ef40a6daacf36e37bc6f5285229917b68e66c986cd4e73998a1caadfec0b078a2751ad59aa20d41f5a9ac3ebc1b94e5f5a89eba02523fdec3f28b21728cc
+DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2
diff --git a/kde-plasma/oxygen/oxygen-5.22.5.ebuild b/kde-plasma/oxygen/oxygen-5.24.4.ebuild
index a43338ba6540..1f0f9efb675b 100644
--- a/kde-plasma/oxygen/oxygen-5.22.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -16,7 +16,7 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="wayland"
-COMMON_DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -36,12 +36,9 @@ COMMON_DEPEND="
x11-libs/libxcb
wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=kde-frameworks/kservice-${KFMIN}:5
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/plasma-desktop-5.16.80
-"
PDEPEND="
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
diff --git a/kde-plasma/oxygen/oxygen-5.23.3.ebuild b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
index 3123e9e382a9..f5157fff7655 100644
--- a/kde-plasma/oxygen/oxygen-5.23.3.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -16,7 +16,7 @@ SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="wayland"
-COMMON_DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -36,12 +36,9 @@ COMMON_DEPEND="
x11-libs/libxcb
wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=kde-frameworks/kservice-${KFMIN}:5
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/plasma-desktop-5.16.80
-"
PDEPEND="
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index b00bb5d0b701..55e7fed28f43 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
-DIST plasma-browser-integration-5.23.3.tar.xz 219596 BLAKE2B 0786ff33de8a19916f4b18d5863755e8340acaca4ec29161c8685ef83d20fc06f0ad5a0f168aa13065b1e54841f489f501d8916f6bde39eca9ffe1e153a3105a SHA512 9d3c3ea3fedd5ddde290206229f367268fa0628fc5031496cd4633548e781917be11a0cc44183365500712bd8898380255ff1202a8201b3010d2ac88a867dec6
+DIST plasma-browser-integration-5.24.4.tar.xz 222496 BLAKE2B 098422fd62b8fc80c722a43d8c6854f35e651797d949a38741daa19512171988146db7fb5b9ef2a26001cec3ed3aef99d9109ecc2f09100c942e8d362239dd05 SHA512 999991a300676bd90a85bc4cc1f8364c351a62146876a8bef499ebd481cbf204ef712443960cf4aa8cfa1246285106a3a4eeb4d320c959afae109da79dc83871
+DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild
index 0ab817c24808..15e44d6aa3de 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -23,6 +23,7 @@ DEPEND="
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kfilemetadata-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
index 83cbeb103590..fe7f9aef2a63 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.3.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -23,6 +23,7 @@ DEPEND="
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/kfilemetadata-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8a6d8c15fa12..07428c4cd1aa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
-DIST plasma-desktop-5.23.3-restore-touchpad-applet.tar.xz 7160 BLAKE2B 75ad147a16f44619e1a0399124a0a00e8a7eabb3fa189dba9920feac435c932bc325361dbc082242785c65a411dfd693096ed52efc987e28778780224245186a SHA512 285f6b69a4fae7e73cde535b7b69dc10439d612c5ca7a025371261a3ab79caf205a192fc260dd3f503a868732a2f2ee8d9489b4a31e66710debc66e98266816a
-DIST plasma-desktop-5.23.3.tar.xz 15787952 BLAKE2B 39182407a32d185cd6694c24185318b9d90b3495e3402590e3039c3f1732abee4ff4bff5eaa5d627f555c19994db4c8e14cba67e2c8a11b9b8f849fdee48c0b0 SHA512 3ece7b471d0003c93b37ecbeb379a62bc96cb6076dec658e8c5db63e68a731c2b0d1bf48d71fcf2f2067345fc4c88ce8d446ca80ac1128a355721abe4cc9705e
+DIST plasma-desktop-5.24.4.tar.xz 6239980 BLAKE2B 0b8af5d596e277d202a9c088aa561ce3f0c3602ca781c807b4082f37da4269176429946edf0665ebd9bc6046cd6b0a97baf5a67ec3c0194c23d6fe237a56c18d SHA512 9d6a8c50a85d7f59b89a13753d9a7072df5e8bd1e726bf1037c4cf8d4d43046c2076c8993dffc1f5cec7f7a113832dd14f836e9b47b879f6352f3c30f4b5c408
+DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
new file mode 100644
index 000000000000..fce29f49536a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
@@ -0,0 +1,132 @@
+From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001
+From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
+Date: Tue, 12 Apr 2022 15:01:15 +0000
+Subject: [PATCH] Folder View: save desktop containment icon positions on a
+ per-resolution basis
+
+BUG: 360478
+BUG: 354802
+FIXED-IN: 5.24.5
+(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772)
+---
+ .../package/contents/ui/FolderView.qml | 15 +--------
+ .../package/contents/ui/FolderViewLayer.qml | 32 +++++++++++++++++--
+ .../desktop/plugins/folder/positioner.cpp | 1 +
+ 3 files changed, 31 insertions(+), 17 deletions(-)
+
+diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
+index 218a3da77..72ae4903a 100644
+--- a/containments/desktop/package/contents/ui/FolderView.qml
++++ b/containments/desktop/package/contents/ui/FolderView.qml
+@@ -30,6 +30,7 @@ FocusScope {
+ property alias currentIndex: gridView.currentIndex
+ property alias url: dir.url
+ property alias status: dir.status
++ property alias perStripe: positioner.perStripe
+ property alias positions: positioner.positions
+ property alias errorString: dir.errorString
+ property alias dragging: dir.dragging
+@@ -828,20 +829,6 @@ FocusScope {
+ }
+ }
+
+- onFlowChanged: {
+- // FIXME TODO: Preserve positions.
+- if (positioner.enabled) {
+- positioner.reset();
+- }
+- }
+-
+- onLayoutDirectionChanged: {
+- // FIXME TODO: Preserve positions.
+- if (positioner.enabled) {
+- positioner.reset();
+- }
+- }
+-
+ onCurrentIndexChanged: {
+ positionViewAtIndex(currentIndex, GridView.Contain);
+ }
+diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
+index 3f9b29937..f2044e1b0 100644
+--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
++++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
+@@ -29,6 +29,8 @@ FocusScope {
+ property alias overflowing: folderView.overflowing
+ property alias flow: folderView.flow
+
++ property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
++
+ readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons")
+
+ focus: true
+@@ -178,6 +180,26 @@ FocusScope {
+ }
+ }
+
++ function getPositions() {
++ try {
++ var allPositions = JSON.parse(plasmoid.configuration.positions);
++ } catch (err) {
++ var allPositions = {};
++ allPositions[resolution] = plasmoid.configuration.positions;
++ }
++ return allPositions[resolution] || "";
++ }
++
++ function savePositions(positions) {
++ try {
++ var allPositions = JSON.parse(plasmoid.configuration.positions);
++ } catch (err) {
++ var allPositions = {};
++ }
++ allPositions[resolution] = positions;
++ plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort());
++ }
++
+ Connections {
+ target: plasmoid.configuration
+
+@@ -211,7 +233,7 @@ FocusScope {
+ }
+
+ function onPositionsChanged() {
+- folderView.positions = plasmoid.configuration.positions;
++ folderView.positions = getPositions();
+ }
+ }
+
+@@ -241,12 +263,16 @@ FocusScope {
+ }
+
+ onPositionsChanged: {
+- plasmoid.configuration.positions = folderView.positions;
++ savePositions(folderView.positions);
++ }
++
++ onPerStripeChanged: {
++ folderView.positions = getPositions();
+ }
+
+ Component.onCompleted: {
+ folderView.sortMode = plasmoid.configuration.sortMode;
+- folderView.positions = plasmoid.configuration.positions;
++ folderView.positions = getPositions();
+ }
+ }
+
+diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
+index 859c16754..3b2df8c5a 100644
+--- a/containments/desktop/plugins/folder/positioner.cpp
++++ b/containments/desktop/plugins/folder/positioner.cpp
+@@ -854,6 +854,7 @@ void Positioner::applyPositions()
+ }
+
+ if (pos > m_perStripe) {
++ qDebug() << "Some items did not fit, rearranging";
+ name = positions.at(offset);
+
+ if (!sourceIndices.contains(name)) {
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 98dd3653422b..3ea9270f30ec 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -12,7 +12,6 @@
<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
- <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
index 7987075be248..5fedd708f1d5 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -74,7 +74,6 @@ COMMON_DEPEND="
>=kde-plasma/libkworkspace-${PVCUT}:5
>=kde-plasma/plasma-workspace-${PVCUT}:5
>=media-libs/phonon-4.11.0
- virtual/libcrypt:=
x11-libs/libX11
x11-libs/libXfixes
x11-libs/libXi
@@ -96,7 +95,6 @@ COMMON_DEPEND="
kde-apps/kaccounts-integration:5
net-libs/accounts-qt
)
- policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
@@ -117,22 +115,17 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/setxkbmap
x11-misc/xdg-user-dirs
kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478
)
src_prepare() {
ecm_src_prepare
- if ! use policykit; then
- ecm_punt_bogus_dep KF5 Wallet
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
if ! use ibus; then
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index a7456185bba1..302d9b8d656b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.3-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -13,13 +13,12 @@ inherit ecm kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${P}-restore-touchpad-applet.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -75,7 +74,6 @@ COMMON_DEPEND="
>=kde-plasma/libkworkspace-${PVCUT}:5
>=kde-plasma/plasma-workspace-${PVCUT}:5
>=media-libs/phonon-4.11.0
- virtual/libcrypt:=
x11-libs/libX11
x11-libs/libXfixes
x11-libs/libXi
@@ -97,7 +95,6 @@ COMMON_DEPEND="
kde-apps/kaccounts-integration:5
net-libs/accounts-qt
)
- policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
@@ -118,23 +115,16 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/setxkbmap
x11-misc/xdg-user-dirs
kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
- "${WORKDIR}/${P}-restore-touchpad-applet" # KDE-bug 445095
)
src_prepare() {
ecm_src_prepare
- if ! use policykit; then
- ecm_punt_bogus_dep KF5 Wallet
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
if ! use ibus; then
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index a4eb95c71a9a..997aa524492c 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
-DIST plasma-disks-5.23.3.tar.xz 87028 BLAKE2B 20851a82178e4e10322be2adf2e71ad5eb37949678633dffaf43017e907c92320159fb5906366fbd883b2e4f21e75c10f7704b6cc67f127729e1d15a754353c5 SHA512 cc77f59b4233cebbb9a162625e275a730c2299534e5cf6680984a9ad6d6d55408deef08f4fd98482814ec1bfc3e0a7468b5903f1d28c0602bc89a550a09d3b75
+DIST plasma-disks-5.24.4.tar.xz 88244 BLAKE2B 71035d47373eb97cff2355a6fc22faac149874d922d6f857ab6f669af2f36ceb750194d9d4679c8218e85b2e5f7b3e293b48c0fb2838d3ca15029ca66f3ec789 SHA512 735d28c6c50515ae7af7a3df4f2ba586d7273d11e8ba96e6546685f6dbf29917001854ba9fa8f298b15f50ec8b26d51d04771874074eeb808f29f5112d07758f
+DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild
index 005f627e33eb..857b4e21996c 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.23.3.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
index 3311c0ee7beb..e6d4c37ca87b 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.23.3.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 47e8da9474ed..cacaf8a16971 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
-DIST plasma-firewall-5.23.3.tar.xz 343956 BLAKE2B 1af8078508d778c2cf58f39578cc5ed68f2aaf5622e4a8c93f437f08c4161a9816495043dda6044b76cd3f7816f708b0327ab10f58f4f9daa412976208988cd2 SHA512 6f4341c8603df00df955a9ff6732f5874881a3c68b147211f7c420a0702bd5ea4a8126dbab3732d406b6e311fb500b099f2b56c034c280a93f8a4252d71330d7
+DIST plasma-firewall-5.24.4.tar.xz 346676 BLAKE2B bbd7e460910b6437c29871814c11c08bb2cb36976a92c70cb7afafbf865d99db73d6ef2c0f0502d990df6c4c72c789f5153ceecd732b2dcb994db330035448d5 SHA512 320066a2339eae7113a3a8b50a01d8ef11c4ba2e9bed48a4f919cae0d1964246ad0beef02f3bc26c8e7ea63214037683552c1004d8b98cfcece52e2ee131b3cc
+DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild
index 9fa4bdd860fa..5093bf4f5120 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org python-single-r1
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.23.3.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
index dfd7cff04540..5ac26b7e39d1 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.23.3.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org python-single-r1
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index e7da95282ab3..f2cdbe17c054 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
-DIST plasma-integration-5.23.3.tar.xz 83052 BLAKE2B 41b533fb803a022b3878aaf438c14b9090a6152527de2dec69694b8e69e3eb477d07b6917b3356e557c3b27c0923e4eca464ca367d4c9ee31495c9fc1c1173fc SHA512 f709c36c3416fd5e273d7de0836a533c0469ed880b19daecaf48e06e15091f1c2506e5e900b550aab1fc3f90e7815fd167f3e2e982298be0852733e47588e433
+DIST plasma-integration-5.24.4.tar.xz 83744 BLAKE2B 4784ccde0eb5f9075cc47c1b9c718971a36b025f9e7a2c404af96dad07d71300ca1b7a0bfdf9a2c30391526f8fb2a2156d4a96e9cf098d09a649f94e665366d7 SHA512 a4262cca85bac798c5afd29543cae7a670b346347f00f29a693d3263cde669931fdf981fa64c8632bb0ab447b758a24795c343b99b5b7acc166da14db66543a1
+DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild
index 982f5b7d1b4b..d598ad5a2941 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.23.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
index 2873e4f7febe..3e4edfe68b7a 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.23.3.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index de1664738aac..929b376cb8ad 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -23,7 +23,6 @@
<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
- <flag name="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></flag>
<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag>
<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
<flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild
index cfccabc1777e..28ee1d06a038 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,8 +11,8 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
-+smart systemd thunderbolt +wallpapers"
++kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
+systemd thunderbolt +wallpapers"
REQUIRED_USE="^^ ( elogind systemd )"
@@ -76,7 +76,6 @@ RDEPEND="
networkmanager? (
>=kde-plasma/plasma-nm-${PV}:${SLOT}
net-misc/networkmanager[elogind?,systemd?]
- qrcode? ( kde-frameworks/prison[qml] )
)
plymouth? (
>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.23.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
index 0add9022a742..9a3d27c702c5 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.23.3.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,8 +11,8 @@ SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
-+smart systemd thunderbolt +wallpapers"
++kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
+systemd thunderbolt +wallpapers"
REQUIRED_USE="^^ ( elogind systemd )"
@@ -76,7 +76,6 @@ RDEPEND="
networkmanager? (
>=kde-plasma/plasma-nm-${PV}:${SLOT}
net-misc/networkmanager[elogind?,systemd?]
- qrcode? ( kde-frameworks/prison[qml] )
)
plymouth? (
>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index c4b9f6473aa4..7d492c21ed58 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
-DIST plasma-nm-5.23.3.tar.xz 921612 BLAKE2B 5b5d5573e1cd692185744217b329938a3140f1a496c933fed02359ea2d5a65123ba829aff9f6b54a23a3462ce6f66206d11609f2e074c894d235bbcab4b87900 SHA512 e36caf87183293baaa03448174d5a5bdd1de404cadc748db25aca49855f3748af3500be55959d3d1892fe62ea7ccad9ce142f1a8dfa2600b54dbc979076ba2be
+DIST plasma-nm-5.24.4.tar.xz 926080 BLAKE2B 4ae2ae273572b60e6c4d88658f2247843921cb59060d1489c00388d4b224e66f6278f47009ba2a866ca7d725bba6c567839a4610c8a8123191511c048998ee42 SHA512 2a28f7879a3e90111ab43d6c30d7f191dfbd58dbcac1e2415387f054674cebc28e2aaeb5beffe448c1bc4f698bb1212b757746dc1e4f5d78a1c2e094895eae85
+DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild
index 794a92fb3ec3..65f17f90aad8 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -59,12 +59,21 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use openconnect; then
+ sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
+ fi
+}
src_configure() {
local mycmakeargs=(
-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
$(cmake_use_find_package modemmanager KF5ModemManagerQt)
- $(cmake_use_find_package openconnect OpenConnect)
)
ecm_src_configure
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.23.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
index 0ac6235da156..2069ad424702 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.23.3.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 26e22781f1c6..b72d48e53e1a 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
-DIST plasma-pa-5.23.3.tar.xz 130804 BLAKE2B 7afa4273cadb1a5023c879fb4391d2a3a33b60eafe0e19bff0c9e5ea0e0a9aee924ccd7ac8877fb34f500ce2d3262e54c80b430b42e9365392240bd07884fd8e SHA512 1c31a18082086367eb65957449bb0ca18131a5ae40191fe5959e67af954c8736043fcb26f430f839ca8957083e1d29a76adbcbec3c6a4cc1a91c7eaf45616537
+DIST plasma-pa-5.24.4.tar.xz 132860 BLAKE2B 034716472ac2b2d0c35005b95457b75f6517d5a51cb94df57bec5b34a5f9785f1784f819b74f1ca330af4be58f3b665d3b26942976b9cd18ba4621873be86931 SHA512 37662d46928e5e086ea6e9d681903d70a2c673207c0c5b692dac01d583d38e14a79f185088a8f7db88e655ef16d62432771acc1cec9c923d22299f7b1da0749d
+DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.23.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild
index a3f477bf21b3..f61ca444d701 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.23.3.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
index db7d0bd02fda..3a401af81cad 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
@@ -31,5 +31,10 @@ DEPEND="
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
+ || (
+ media-video/pipewire
+ media-sound/pulseaudio-daemon
+ media-sound/pulseaudio[daemon(+)]
+ )
x11-themes/sound-theme-freedesktop
"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 2ff734ed45de..305320851330 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
-DIST plasma-sdk-5.23.3.tar.xz 275876 BLAKE2B 168613c51150bce50835cadfb2b778c426bfa23d51f538e71f0acf78298c05a1f4bd49d2136da40765498916aec055ad31eccb862bc2daadd86b68ef9041e6f5 SHA512 9ff8e4d1511b4488093ec65bc62fcd0c23533a7e98bae1937034a2d55720d52963108707d5ee2d2e25bfc993210cfd5de712e4168d011de286d077acc4c891ea
+DIST plasma-sdk-5.24.4.tar.xz 261172 BLAKE2B c195814d62cfa8d22df67e726a11004e7a3530b0eec358a7b90270b09d525ef8817602a0dfac974e097c8b62f417af688a0b0173ca95868443585d267fefce2b SHA512 c531f4df314b25f7e34495a4c26189a5c83065523935a20ff482ddd22df7b922dd06784a218d41817bd49edef3bb1b41c09bfdd26aa806914a40781210d25690
+DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild
index 5ecc2fc17e22..305df908068b 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="optional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.23.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
index 9c5a5e9fa9b6..7aeb98067ec4 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.23.3.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 064ca932e63c..91042abfec56 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
-DIST plasma-systemmonitor-5.23.3.tar.xz 144756 BLAKE2B d55ef4800bcac3abd0ba34992466a366a97c2602e068ba8eb867d53926e365ec0529873bd1128857577c7a2666f5f216abf9e6ba8a39d48475837389ba9d7a83 SHA512 93d92ac663c007ae049e192260880370aefa799866113af68bd435160c96bd18908c5e3e8e742435a93dbc898f4541da25194779be99c687ee9c83cbcc41800f
+DIST plasma-systemmonitor-5.24.4.tar.xz 151840 BLAKE2B d0c8f3ab7881650b9bf38218cfeff78fbba0194a6fee80d79649f8ec12136082d86ec6153aa91815d2916416a9d641fa1ab7533d0f75c372336bbe3ef5b62df1 SHA512 13d489865df36bbe9a1465d7efd5603442144492781d0a5102e395f80f50b31d0519953962a0c3b2b9ff199c05daf20e9d7828ae42ce2335714c31bb6ff9f2c1
+DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild
index daf638b076a2..ed93a083cd93 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PVCUT=$(ver_cut 1-3)
-KFMIN=5.82.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.3.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
index 6960f0e9446b..d39879f4df9c 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.3.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index ab5d5418576c..499a16783202 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
-DIST plasma-thunderbolt-5.23.3.tar.xz 65064 BLAKE2B 17aadecd6fac95061270d50f935c599e755175b61e80b71cb5461c53a20eb98c8d7f8995c573cce3047630b51c10f115ff87c847cefce269d2447e51a6426706 SHA512 3091950ed8e7e2e02993d95877f70d368d34f6c53e827c9b32f61ab0ad39372245c47a02d8a13f7669dd49b8e5aa60672dfbc8307c310fac76a9cc6331afdb94
+DIST plasma-thunderbolt-5.24.4.tar.xz 66724 BLAKE2B 339a4fd20ddd8032736d84e2247b0ed52f9a9231bd36c2f4c91defd09b8f3997d5c13642319fdfaa3e96921fbadbff94da6450d417f6e31f6fe675f72e63686d SHA512 eb5af8c87852fdd0089cc48675c572887ff1d0d63b2a68d7e2d28e22890f93a4697575f56b76fc3a135a81cd721ffef0fab6d274d862d431fd6daafc79d621be
+DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild
index 9e532624beab..346585e6911a 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.3.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
index 98520e14669d..f68c386c4db9 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.3.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index a2830800d401..48a76a4f10a0 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
-DIST plasma-vault-5.23.3.tar.xz 176320 BLAKE2B 4edec34315137c691f4f7cabfd9854b4ddc41d95048077180a5d1c919d98f8089d2787508a0c2b52fd26c3ed4d05f93ff382cca3dafe17bb19d064df9f4a2d2b SHA512 26d6365423affd5b95ade480490eca5273e40970967a2d30b8daf38c54474b99b22337d2ebf7ae15b1bff729bd2ac946e6897c8a9252278f1f6dec75a2343ec0
+DIST plasma-vault-5.24.4.tar.xz 178000 BLAKE2B 736fbad8567c21fcd259c2334674e88a1ce041c9e3136712444fcf4b69785f5bd86eff6edfcbf73cca54e6c6ff75f742c97064b6b63cb46ff13850bce5fd01fb SHA512 21bf4f215583bf055f15d3c05e0a8b8d637662619eced04008051e25c1bac7ca6fb9b83d0c8661daf91c4790405d422d272176042f3420f9d27497fc2fc84a4c
+DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild
index cf869f9ad551..9cce0daf50a1 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.23.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
index 820c8cb2ccae..e1ff81661e57 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.23.3.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 51ea9a8852b3..7cf57f020e86 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
-DIST plasma-workspace-wallpapers-5.23.3.tar.xz 57048988 BLAKE2B a9833543390cb8173505223092af9787cd48c2e137379dd36863536050180093250d880c2807213e355b4f55c91892d57bc6048e08d912d1e3d18f3a96d268f6 SHA512 30462541915b5f242e1afa0619f3cfc2d8e56ebf23ff8e61643f1ea191847d2e8e3ab3a26bf08b57bfffe8c72db1404decdc2e727478559dbda06768cedca936
+DIST plasma-workspace-wallpapers-5.24.4.tar.xz 72711976 BLAKE2B f8b06a88543e2ad6a225fc2d463045047df66b9582307cbc10a068aad0af6ee9ea2500c773edfa042498af8726d4ef3593893b70356189f21cf164a8ffc137f1 SHA512 8bfdd82e3e88d9723fcbd530660ef0fa8060a0b1504157057ea7a057aa1dd2a7309ca5b86830c4ed6c8e80fc8a31a01ce7b78e0675babafc95c41ba41607ae55
+DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild
index d776660bca12..862f306fb000 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
index 505df2c2d303..bceff041c2fa 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.3.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7d5cecf5655f..be5c47e6ef60 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
+DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
deleted file mode 100644
index e7cd0627a269..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001
-From: Fabio Bas <fabio.bas@officineinformatiche.net>
-Date: Fri, 3 Sep 2021 19:23:12 +0200
-Subject: [PATCH] Update solid connectedSources when a new source gets added by
- hotplug BUG: 438874
-
----
- applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-index a1dc20b83..404ae95e6 100644
---- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-@@ -75,6 +75,7 @@ Item {
- onSourceAdded: {
- disconnectSource(source);
- connectSource(source);
-+ sdSource.connectedSources = sources
- }
- onSourceRemoved: {
- disconnectSource(source);
-@@ -98,7 +99,6 @@ Item {
- PlasmaCore.DataSource {
- id: sdSource
- engine: "soliddevice"
-- connectedSources: hpSource.sources
- interval: 0
- property string last
- onSourceAdded: {
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
deleted file mode 100644
index 13e4bf256d3e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6379d1ec8d4a1fce141280eead930a6cdd9282d1 Mon Sep 17 00:00:00 2001
-From: Peifeng Yu <7437103@gmail.com>
-Date: Mon, 6 Sep 2021 05:24:15 +0000
-Subject: [PATCH] Call UnInhibit with correct signature in powermanagement
- dataengine
-
----
- dataengines/powermanagement/powermanagementjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp
-index 90051cf33..dc7883d10 100644
---- a/dataengines/powermanagement/powermanagementjob.cpp
-+++ b/dataengines/powermanagement/powermanagementjob.cpp
-@@ -104,7 +104,7 @@ void PowerManagementJob::start()
- QStringLiteral("/org/freedesktop/PowerManagement/Inhibit"),
- QStringLiteral("org.freedesktop.PowerManagement.Inhibit"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<void> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
-@@ -122,7 +122,7 @@ void PowerManagementJob::start()
- QStringLiteral("/ScreenSaver"),
- QStringLiteral("org.freedesktop.ScreenSaver"),
- QStringLiteral("UnInhibit"));
-- msg << parameters().value(QStringLiteral("cookie")).toInt();
-+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
- QDBusReply<uint> reply = QDBusConnection::sessionBus().call(msg);
- setResult(reply.isValid());
- return;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
deleted file mode 100644
index cb35751d446f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Thu, 23 Sep 2021 19:29:05 +0300
-Subject: [PATCH] Fix build with gpsd 3.23.1
-
-STATUS_NO_FIX was renamed to STATUS_UNK.
-
-https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
----
- dataengines/geolocation/location_gps.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 858059ada..ec9ec14ae 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -52,7 +52,9 @@ void Gpsd::run()
- #else
- if (m_gpsdata->online) {
- #endif
--#if GPSD_API_MAJOR_VERSION >= 10
-+#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
-+ if (m_gpsdata->fix.status != STATUS_UNK) {
-+#elif GPSD_API_MAJOR_VERSION >= 10
- if (m_gpsdata->fix.status != STATUS_NO_FIX) {
- #else
- if (m_gpsdata->status != STATUS_NO_FIX) {
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
deleted file mode 100644
index be4b6e51b3e2..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-baloosearchrunner-emit-DBus-error-when-disabled.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From afff43effadd78ab682ecf4c6c9919bdcbbedbcd Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Fri, 12 Nov 2021 11:10:15 +0100
-Subject: [PATCH] baloosearchruner: Emit DBus error when baloo is disabled
-
-Otherwise we exit and KRunner runner into a long timeout.
-
-By making this a dedicated DBus error KRunner can also know, that this
-runner can not be started. Consequently making new attempts to query
-this runner can be prevented.
-
-Because the runner is DBus-Activated, we can not exit the process, otherwise other
-processes (like the search in the app launcher) will have the same issue with the timeout.
-BUG: 445342
-
-
-(cherry picked from commit fa5ac3fe3421a0077d9d80f52b89536daa732afa)
----
- runners/baloo/baloosearchrunner.cpp | 14 ++++++++++----
- runners/baloo/baloosearchrunner.h | 2 +-
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
-index 08f24b362..768709cee 100644
---- a/runners/baloo/baloosearchrunner.cpp
-+++ b/runners/baloo/baloosearchrunner.cpp
-@@ -31,10 +31,6 @@ static const QString s_openParentDirId = QStringLiteral("openParentDir");
-
- int main(int argc, char **argv)
- {
-- Baloo::IndexerConfig config;
-- if (!config.fileIndexingEnabled()) {
-- return -1;
-- }
- QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
- QApplication::setQuitOnLastWindowClosed(false);
- QApplication app(argc, argv); // KRun needs widgets for error message boxes
-@@ -60,11 +56,21 @@ SearchRunner::~SearchRunner()
-
- RemoteActions SearchRunner::Actions()
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ }
- return RemoteActions({RemoteAction{s_openParentDirId, i18n("Open Containing Folder"), QStringLiteral("document-open-folder")}});
- }
-
- RemoteMatches SearchRunner::Match(const QString &searchTerm)
- {
-+ Baloo::IndexerConfig config;
-+ if (!config.fileIndexingEnabled()) {
-+ sendErrorReply(QDBusError::ErrorType::NotSupported);
-+ return {};
-+ }
-+
- // Do not try to show results for queries starting with =
- // this should trigger the calculator, but the AdvancedQueryParser::parse method
- // in baloo interpreted it as an operator, BUG 345134
-diff --git a/runners/baloo/baloosearchrunner.h b/runners/baloo/baloosearchrunner.h
-index 5006c9ae3..4836769c9 100644
---- a/runners/baloo/baloosearchrunner.h
-+++ b/runners/baloo/baloosearchrunner.h
-@@ -14,7 +14,7 @@
- #include "dbusutils_p.h"
- #include <KRunner/QueryMatch>
-
--class SearchRunner : public QObject
-+class SearchRunner : public QObject, protected QDBusContext
- {
- Q_OBJECT
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
deleted file mode 100644
index 6258b66f6e70..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-check-if-service-already-added.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 931a5441746daf10d9476409f347263719ef6c63 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Mon, 1 Nov 2021 22:17:53 +0800
-Subject: [PATCH] systemtray: Check if a service is already added before
- processing QDBusReply
-
-Due to async nature of QDBusPendingReply, services could be already
-registered by QDBusServiceWatcher when the pending reply takes a long
-time to finish, so it's possible that QDBusServiceWatcher::serviceRegistered
-signal is emitted before the pending reply emits QDBusPendingCallWatcher::finished,
-which will make the same service added twice and crash plasmashell.
-
-We need to check if a service is already added in m_sniServices before
-processing registered items in QDBusReply.
-
-BUG: 443961
-
-
-(cherry picked from commit c0b8f6871e75bbc268165844ad5780f13a5f88ac)
----
- applets/systemtray/statusnotifieritemhost.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
-index c17eedd6c..4108b2b82 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -101,7 +101,9 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- QDBusReply<QDBusVariant> reply = *watcher;
- QStringList registeredItems = reply.value().variant().toStringList();
- foreach (const QString &service, registeredItems) {
-- addSNIService(service);
-+ if (!m_sniServices.contains(service)) { // due to async nature of this call, service may be already there
-+ addSNIService(service);
-+ }
- }
- });
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
deleted file mode 100644
index bbe9a152c608..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.3-systemtray-fix-race-condition.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a9fba8b5416dd3b130045ccac40e5412714563ea Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 20 Nov 2021 21:04:06 +0800
-Subject: [PATCH] systemtray: Connect to StatusNotifierWatcher before
- initializing QDBusPendingReply
-
-This fixes a race condition.
-
-
-(cherry picked from commit 644588739e617cfde8ee097dff4a72cc08c421aa)
----
- applets/systemtray/statusnotifieritemhost.cpp | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/applets/systemtray/statusnotifieritemhost.cpp b/applets/systemtray/statusnotifieritemhost.cpp
-index 4108b2b82..117c29f17 100644
---- a/applets/systemtray/statusnotifieritemhost.cpp
-+++ b/applets/systemtray/statusnotifieritemhost.cpp
-@@ -93,6 +93,15 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- m_statusNotifierWatcher->path(),
- m_statusNotifierWatcher->connection());
-
-+ connect(m_statusNotifierWatcher,
-+ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-+ this,
-+ &StatusNotifierItemHost::serviceRegistered);
-+ connect(m_statusNotifierWatcher,
-+ &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-+ this,
-+ &StatusNotifierItemHost::serviceUnregistered);
-+
- QDBusPendingReply<QDBusVariant> pendingItems = propetriesIface.Get(m_statusNotifierWatcher->interface(), "RegisteredStatusNotifierItems");
-
- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingItems, this);
-@@ -106,16 +115,6 @@ void StatusNotifierItemHost::registerWatcher(const QString &service)
- }
- }
- });
--
-- connect(m_statusNotifierWatcher,
-- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemRegistered,
-- this,
-- &StatusNotifierItemHost::serviceRegistered);
-- connect(m_statusNotifierWatcher,
-- &OrgKdeStatusNotifierWatcherInterface::StatusNotifierItemUnregistered,
-- this,
-- &StatusNotifierItemHost::serviceUnregistered);
--
- } else {
- delete m_statusNotifierWatcher;
- m_statusNotifierWatcher = nullptr;
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
new file mode 100644
index 000000000000..d61877300d27
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch
@@ -0,0 +1,40 @@
+From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 4 May 2022 10:45:52 -0600
+Subject: [PATCH 2/8] applets/appmenu: fix top-level menu text coloration
+
+28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but
+neglected to respect the Plasma color scheme, if any. This causes
+problems with Plasma themes that have their own colors and don't
+respect the systemwide color scheme, such as Breeze Twilight.
+
+Fix it by using the appropriate colors from the PlasmaCore color scheme
+object, not the systemwide object provided by Qt.
+
+BUG: 453348
+FIXED-IN: 5.24.6
+
+
+(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e)
+---
+ applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml
+index 441e99016..afb37589a 100644
+--- a/applets/appmenu/package/contents/ui/MenuDelegate.qml
++++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml
+@@ -66,9 +66,6 @@ AbstractButton {
+
+ contentItem: PC3.Label {
+ text: controlRoot.Kirigami.MnemonicData.richTextLabel
+- // Kirigami.Theme.highlightedTextColor returns different colors
+- // depending on window focus, which does not apply to this applet
+- // instead, we use palette.highlightedText here, which returns consistent result
+- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText
++ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor
+ }
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
new file mode 100644
index 000000000000..8cffd8d372ed
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch
@@ -0,0 +1,92 @@
+From d0340868619c26de5892f8bd095456dc5a32d0ce Mon Sep 17 00:00:00 2001
+From: Amy Rose <amy@fluff.tech>
+Date: Tue, 17 May 2022 07:38:03 +0000
+Subject: [PATCH 8/8] applets/kicker: refresh RootModel on session backend
+ state change
+
+BUG: 427530
+
+Hunting this one down since mid-March...
+
+In "native" Plasma containments like the panel, desktop, and plasmawindowed, the `LogindSessionBackend` in `libkworkspace` enters the "Ready" state nearly instantly, before any signals can even be attached. In other containments like Latte Dock and plasmoidviewer, however, the initialization takes some time to complete (unsure why). RootModel was not watching or waiting to check what the session backend's state was, resulting in validity checks being done too soon and never checked again.
+
+
+(cherry picked from commit 2cc819f39bcce9ca83ab3767c42beb1e500e55b1)
+---
+ applets/kicker/plugin/rootmodel.cpp | 1 +
+ applets/kicker/plugin/systementry.cpp | 1 +
+ applets/kicker/plugin/systementry.h | 1 +
+ applets/kicker/plugin/systemmodel.cpp | 2 ++
+ applets/kicker/plugin/systemmodel.h | 3 +++
+ 5 files changed, 8 insertions(+)
+
+diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp
+index 4ec323683..837108744 100644
+--- a/applets/kicker/plugin/rootmodel.cpp
++++ b/applets/kicker/plugin/rootmodel.cpp
+@@ -449,6 +449,7 @@ void RootModel::refresh()
+ }
+
+ m_systemModel = new SystemModel(this);
++ QObject::connect(m_systemModel, &SystemModel::sessionManagementStateChanged, this, &RootModel::refresh);
+
+ if (m_showPowerSession) {
+ m_entryList << new GroupEntry(this, i18n("Power / Session"), QStringLiteral("system-log-out"), m_systemModel);
+diff --git a/applets/kicker/plugin/systementry.cpp b/applets/kicker/plugin/systementry.cpp
+index fdd86ece3..939e2119e 100644
+--- a/applets/kicker/plugin/systementry.cpp
++++ b/applets/kicker/plugin/systementry.cpp
+@@ -79,6 +79,7 @@ void SystemEntry::refresh()
+ {
+ if (!s_sessionManagement) {
+ s_sessionManagement = new SessionManagement();
++ QObject::connect(s_sessionManagement, &SessionManagement::stateChanged, this, &SystemEntry::sessionManagementStateChanged);
+ }
+
+ bool valid = false;
+diff --git a/applets/kicker/plugin/systementry.h b/applets/kicker/plugin/systementry.h
+index a0a258024..981a3a5f5 100644
+--- a/applets/kicker/plugin/systementry.h
++++ b/applets/kicker/plugin/systementry.h
+@@ -54,6 +54,7 @@ public:
+
+ Q_SIGNALS:
+ void isValidChanged() const;
++ void sessionManagementStateChanged();
+
+ private Q_SLOTS:
+ void refresh();
+diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp
+index 656bbdc4e..844f80d09 100644
+--- a/applets/kicker/plugin/systemmodel.cpp
++++ b/applets/kicker/plugin/systemmodel.cpp
+@@ -92,10 +92,12 @@ void SystemModel::populate()
+
+ auto addIfValid = [=](const SystemEntry::Action action) {
+ SystemEntry *entry = new SystemEntry(this, action);
++ QObject::connect(entry, &SystemEntry::sessionManagementStateChanged, this, &SystemModel::sessionManagementStateChanged);
+
+ if (entry->isValid()) {
+ m_entries << entry;
+ }
++
+ QObject::connect(entry, &SystemEntry::isValidChanged, this, &AbstractModel::refresh, Qt::UniqueConnection);
+ };
+
+diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/systemmodel.h
+index cd9048de1..29ae9e428 100644
+--- a/applets/kicker/plugin/systemmodel.h
++++ b/applets/kicker/plugin/systemmodel.h
+@@ -25,6 +25,9 @@ public:
+
+ Q_INVOKABLE bool trigger(int row, const QString &actionId, const QVariant &argument) override;
+
++Q_SIGNALS:
++ void sessionManagementStateChanged();
++
+ protected Q_SLOTS:
+ void refresh() override;
+
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
new file mode 100644
index 000000000000..0ac8ed788ade
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch
@@ -0,0 +1,137 @@
+From ea2833e4dd7114f8bf22a322a26c6c05ebf767f2 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 25 Apr 2022 21:58:58 +0300
+Subject: [PATCH 3/8] applets/systemtray: Prefer IconName over IconPixmap
+
+In case both IconName and IconPixmap are provided, the system tray
+applet is going to prefer the pixmap.
+
+That can create a dark icon on dark background bug because plasma can't
+recolor pixmaps.
+
+The SNI spec recommends visualizations to prefer icons over pixmaps:
+
+> An icon can either be identified by its Freedesktop-compliant icon
+> name, carried by this property of by the icon data itself, carried by
+> the property IconPixmap. Visualizations are encouraged to prefer icon
+> names over icon pixmaps if both are available (FIXME: still not very
+> defined: could e the pixmap used as fallback if an icon name is not found?)
+
+BUG: 418996
+
+- Unset iconName when icon can't be loaded
+- no code duplication
+(cherry picked from commit 7363d0e0f3c1a447e6264e92762735bd33da2682)
+---
+ .../systemtray/statusnotifieritemsource.cpp | 82 ++++++++-----------
+ 1 file changed, 33 insertions(+), 49 deletions(-)
+
+diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp
+index f67845e42..731aecadc 100644
+--- a/applets/systemtray/statusnotifieritemsource.cpp
++++ b/applets/systemtray/statusnotifieritemsource.cpp
+@@ -286,68 +286,52 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
+ QIcon overlay;
+ QStringList overlayNames;
+
+- // Icon
++ // Overlay icon
+ {
+- KDbusImageVector image;
+- QIcon icon;
+- QString iconName;
+-
+- properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
+- m_overlayIconName = iconName;
+- if (!iconName.isEmpty()) {
++ m_overlayIconName = QString();
++
++ const QString iconName = properties[QStringLiteral("OverlayIconName")].toString();
++ if (!iconName.isEmpty()) {
++ overlay = QIcon(new KIconEngine(iconName, iconLoader()));
++ if (!overlay.isNull()) {
++ m_overlayIconName = iconName;
+ overlayNames << iconName;
+- overlay = QIcon(new KIconEngine(iconName, iconLoader()));
+ }
+- } else {
+- overlay = imageVectorToPixmap(image);
+ }
++ if (overlay.isNull()) {
++ KDbusImageVector image;
++ properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image;
++ if (!image.isEmpty()) {
++ overlay = imageVectorToPixmap(image);
++ }
++ }
++ }
+
+- properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- iconName = properties[QStringLiteral("IconName")].toString();
+- if (!iconName.isEmpty()) {
+- icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
+-
+- if (overlayNames.isEmpty() && !overlay.isNull()) {
++ auto loadIcon = [this, &properties, &overlay, &overlayNames](const QString &iconKey, const QString &pixmapKey) -> std::tuple<QIcon, QString> {
++ const QString iconName = properties[iconKey].toString();
++ if (!iconName.isEmpty()) {
++ QIcon icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
++ if (!icon.isNull()) {
++ if (!overlay.isNull() && overlayNames.isEmpty()) {
+ overlayIcon(&icon, &overlay);
+ }
++ return {icon, iconName};
+ }
+- } else {
+- icon = imageVectorToPixmap(image);
++ }
++ KDbusImageVector image;
++ properties[pixmapKey].value<QDBusArgument>() >> image;
++ if (!image.isEmpty()) {
++ QIcon icon = imageVectorToPixmap(image);
+ if (!icon.isNull() && !overlay.isNull()) {
+ overlayIcon(&icon, &overlay);
+ }
++ return {icon, QString()};
+ }
+- m_icon = icon;
+- m_iconName = iconName;
+- }
++ return {};
++ };
+
+- // Attention icon
+- {
+- KDbusImageVector image;
+- QIcon attentionIcon;
+-
+- properties[QStringLiteral("AttentionIconPixmap")].value<QDBusArgument>() >> image;
+- if (image.isEmpty()) {
+- QString iconName = properties[QStringLiteral("AttentionIconName")].toString();
+- m_attentionIconName = iconName;
+- if (!iconName.isEmpty()) {
+- attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames));
+-
+- if (overlayNames.isEmpty() && !overlay.isNull()) {
+- overlayIcon(&attentionIcon, &overlay);
+- }
+- }
+- } else {
+- attentionIcon = imageVectorToPixmap(image);
+- if (!attentionIcon.isNull() && !overlay.isNull()) {
+- overlayIcon(&attentionIcon, &overlay);
+- }
+- }
+- m_attentionIcon = attentionIcon;
+- }
++ std::tie(m_icon, m_iconName) = loadIcon(QStringLiteral("IconName"), QStringLiteral("IconPixmap"));
++ std::tie(m_attentionIcon, m_attentionIconName) = loadIcon(QStringLiteral("AttentionIconName"), QStringLiteral("AttentionIconPixmap"));
+
+ // ToolTip
+ {
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
new file mode 100644
index 000000000000..609ab0f011cd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch
@@ -0,0 +1,34 @@
+From 7795e5fb4f7e2a79e15a9e5711149f71144e73c9 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 13 May 2022 14:43:44 +0800
+Subject: [PATCH 5/8] applets/systemtray: disconnect KConfigLoader signal when
+ instance is about to be deleted
+
+When an applet is about to be deleted, it will save its config
+automatically, but in this case the system tray doesn't need to load the
+config again.
+
+BUG: 453726
+
+
+(cherry picked from commit 6da91d053b4f142277d60db4a1a17eded9249d11)
+---
+ applets/systemtray/systemtray.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
+index 3b7f688a6..0d889b3f0 100644
+--- a/applets/systemtray/systemtray.cpp
++++ b/applets/systemtray/systemtray.cpp
+@@ -40,6 +40,8 @@ SystemTray::SystemTray(QObject *parent, const KPluginMetaData &data, const QVari
+
+ SystemTray::~SystemTray()
+ {
++ // When the applet is about to be deleted, delete now to avoid calling loadConfig()
++ delete m_settings;
+ }
+
+ void SystemTray::init()
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
new file mode 100644
index 000000000000..57477173acbb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch
@@ -0,0 +1,41 @@
+From 1a966d3fb979cf0f0080c805aed248ee77978800 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Mon, 16 May 2022 16:18:00 +0800
+Subject: [PATCH 6/8] kcms/desktoptheme: find metadata.json when loading
+ ThemesModel
+
+Before this commit ThemesModel only finds metadata.desktop, but after
+KF5.94, the default theme metadata files have been ported to json format.
+
+BUG: 453830
+
+
+(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
+---
+ kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
+index 6f0ecf4e3..296951742 100644
+--- a/kcms/desktoptheme/themesmodel.cpp
++++ b/kcms/desktoptheme/themesmodel.cpp
+@@ -155,7 +155,15 @@ void ThemesModel::load()
+ const QDir cd(ppath);
+ const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
+ for (const QString &pack : entries) {
+- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
++ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
++
++ QString _metadata = QStringLiteral("%1json").arg(prefix);
++ if (QFile::exists(_metadata)) {
++ themes << _metadata;
++ continue;
++ }
++
++ _metadata = QStringLiteral("%1desktop").arg(prefix);
+ if (QFile::exists(_metadata)) {
+ themes << _metadata;
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
new file mode 100644
index 000000000000..2a379c707efe
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch
@@ -0,0 +1,72 @@
+From c602c52578da1331d2466ff9803c7e0b9287c24c Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 16 May 2022 14:49:46 +0200
+Subject: [PATCH 7/8] kcms/desktoptheme: Fix reading of metadata in ThemesModel
+
+We can not use KConfig to read the desktop file.
+
+CCBUG: 453830
+
+
+(cherry picked from commit 43ae993da35bb408b4fabb5c4514feff97628e0d)
+---
+ kcms/desktoptheme/themesmodel.cpp | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
+index 296951742..ce3cac14b 100644
+--- a/kcms/desktoptheme/themesmodel.cpp
++++ b/kcms/desktoptheme/themesmodel.cpp
+@@ -16,6 +16,7 @@
+
+ #include <KColorScheme>
+ #include <KDesktopFile>
++#include <KPluginMetaData>
+
+ #include <KConfigGroup>
+ #include <KSharedConfig>
+@@ -176,15 +177,25 @@ void ThemesModel::load()
+ int themeNameSepIndex = themeRoot.lastIndexOf(QLatin1Char('/'), -1);
+ const QString packageName = themeRoot.right(themeRoot.length() - themeNameSepIndex - 1);
+
+- KDesktopFile df(theme);
++ QString name;
++ QString comment;
+
+- if (df.noDisplay()) {
+- continue;
+- }
++ if (theme.endsWith(QLatin1String(".json"))) {
++ KPluginMetaData data = KPluginMetaData::fromJsonFile(theme);
++ name = data.name();
++ comment = data.description();
++ } else {
++ KDesktopFile df(theme);
+
+- QString name = df.readName();
+- if (name.isEmpty()) {
+- name = packageName;
++ if (df.noDisplay()) {
++ continue;
++ }
++
++ name = df.readName();
++ if (name.isEmpty()) {
++ name = packageName;
++ }
++ comment = df.readComment();
+ }
+ const bool isLocal = QFileInfo(theme).isWritable();
+ bool hasPluginName = std::any_of(m_data.begin(), m_data.end(), [&](const ThemesModelData &item) {
+@@ -205,7 +216,7 @@ void ThemesModel::load()
+ type = LightTheme;
+ }
+ }
+- ThemesModelData item{name, packageName, df.readComment(), type, isLocal, false};
++ ThemesModelData item{name, packageName, comment, type, isLocal, false};
+ m_data.append(item);
+ }
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
new file mode 100644
index 000000000000..594efe7df172
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch
@@ -0,0 +1,39 @@
+From e2b631d43528c3e41d53c8a359b6129c616bc271 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 30 Apr 2022 03:20:11 +0300
+Subject: [PATCH 1/8] [sddm-theme] KeyboardButton: Fix layout name not being
+ shown
+
+It used to cause an error like this:
+
+ [03:21:31.246] (WW) GREETER: file:///usr/share/sddm/themes/breeze/KeyboardButton.qml:19: TypeError: Cannot read property 'shortName' of null
+
+(cherry picked from commit 2e9020ca6c1d55842a4b014623f0d88697972000)
+---
+ sddm-theme/KeyboardButton.qml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml
+index d5d5a446c..712096d87 100644
+--- a/sddm-theme/KeyboardButton.qml
++++ b/sddm-theme/KeyboardButton.qml
+@@ -10,7 +10,7 @@ PlasmaComponents.ToolButton {
+
+ property int currentIndex: -1
+
+- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
++ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].shortName)
+ implicitWidth: minimumWidth
+
+ visible: menu.items.length > 1
+@@ -27,7 +27,6 @@ PlasmaComponents.ToolButton {
+ onObjectRemoved: keyboardMenu.removeItem( object )
+ delegate: QQC.MenuItem {
+ text: modelData.longName
+- property string shortName: modelData.shortName
+ onTriggered: {
+ keyboard.currentLayout = model.index
+ }
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
new file mode 100644
index 000000000000..d09b60ce6ce4
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch
@@ -0,0 +1,30 @@
+From dd8f1b5e302717c84f6a05af36c621122ead6d99 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 6 May 2022 21:36:09 +0800
+Subject: [PATCH 4/8] wallpapers/image: Fix missing folder action buttons
+
+The width of the action area needs to be substracted in contentItem's
+width.
+
+Also use `Kirigami.Units.gridUnit * 4` because `overlayWidth` was
+introduced in Frameworks 5.94, and people using Plasma 5.24 may have an
+older Frameworks version.
+---
+ wallpapers/image/imagepackage/contents/ui/config.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml
+index 97f9f81a5..7bb675f23 100644
+--- a/wallpapers/image/imagepackage/contents/ui/config.qml
++++ b/wallpapers/image/imagepackage/contents/ui/config.qml
+@@ -331,6 +331,7 @@ ColumnLayout {
+ // Don't need a highlight or hover effects
+ hoverEnabled: false
+ contentItem: Kirigami.BasicListItem {
++ width: slidePathsView.width - (parent.hasOwnProperty("overlayWidth") ? overlayWidth : Kirigami.Units.gridUnit * 4)
+ // Don't need a highlight or hover effects
+ hoverEnabled: false
+ separatorVisible: false
+--
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 835e52229949..79fb12a10ab1 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,8 +10,8 @@
</upstream>
<use>
<flag name="appstream">Enable AppStream software metadata support</flag>
- <flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag>
<flag name="geolocation">Enables dataengine providing location information</flag>
+ <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
index 0848eaec5896..8c06edc3b7e3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -16,12 +16,13 @@ DESCRIPTION="KDE Plasma workspace"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
REQUIRED_USE="gps? ( geolocation )"
RESTRICT="test"
+# slot op: various private QtWaylandClient headers
COMMON_DEPEND="
>=dev-libs/wayland-1.15
>=dev-qt/qtdbus-${QTMIN}:5
@@ -30,7 +31,7 @@ COMMON_DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5=
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
@@ -83,6 +84,7 @@ COMMON_DEPEND="
>=kde-plasma/libksysguard-${PVCUT}:5
>=kde-plasma/libkworkspace-${PVCUT}:5
>=media-libs/phonon-4.11.0
+ sci-libs/libqalculate:=
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
@@ -96,7 +98,6 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
- calculator? ( sci-libs/libqalculate:= )
calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
fontconfig? (
>=dev-qt/qtprintsupport-${QTMIN}:5
@@ -106,6 +107,7 @@ COMMON_DEPEND="
)
geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
gps? ( sci-geosciences/gpsd )
+ policykit? ( virtual/libcrypt:= )
screencast? (
>=dev-qt/qtgui-${QTMIN}:5=[egl]
media-libs/libglvnd
@@ -116,7 +118,7 @@ COMMON_DEPEND="
telemetry? ( dev-libs/kuserfeedback:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.1.1
+ >=dev-libs/plasma-wayland-protocols-1.6.0
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-util/wayland-scanner-1.19.0
x11-base/xorg-proto
@@ -124,33 +126,34 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
+ >=dev-qt/qdbus-${QTMIN}:*
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=dev-qt/qtpaths-${QTMIN}:5
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
>=dev-qt/qtquickcontrols2-${QTMIN}:5
kde-apps/kio-extras:5
- >=kde-frameworks/kdesu-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/milou-${PVCUT}:5
>=kde-plasma/plasma-integration-${PVCUT}:5
+ sys-apps/dbus
x11-apps/xmessage
x11-apps/xprop
x11-apps/xrdb
x11-apps/xsetroot
- sys-apps/dbus
- !<kde-plasma/plasma-desktop-5.21.90:5
+ !<kde-plasma/breeze-5.22.90:5
+ !<kde-plasma/plasma-desktop-5.23.90:5
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ virtual/pkgconfig
"
-BDEPEND="virtual/pkgconfig"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
- "${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
- "${FILESDIR}/${P}-gpsd-3.23.1.patch"
+ "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
)
src_prepare() {
@@ -167,9 +170,17 @@ src_prepare() {
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ ecm_punt_kf_module Su
}
src_configure() {
@@ -184,8 +195,6 @@ src_configure() {
$(cmake_use_find_package telemetry KUserFeedback)
)
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
ecm_src_configure
}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..9fa47cdd5c54
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kpeople-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kunitconversion-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5[qml]
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kscreenlocker-${PVCUT}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/layer-shell-qt-${PVCUT}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ >=media-libs/phonon-4.11.0
+ sci-libs/libqalculate:=
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ appstream? ( dev-libs/appstream[qt5] )
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ fontconfig? (
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ policykit? ( virtual/libcrypt:= )
+ screencast? (
+ >=dev-qt/qtgui-${QTMIN}:5=[egl]
+ media-libs/libglvnd
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-util/wayland-scanner-1.19.0
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/iso-codes
+ >=dev-qt/qdbus-${QTMIN}:*
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpaths-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ kde-apps/kio-extras:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
+ >=kde-plasma/milou-${PVCUT}:5
+ >=kde-plasma/plasma-integration-${PVCUT}:5
+ sys-apps/dbus
+ x11-apps/xmessage
+ x11-apps/xprop
+ x11-apps/xrdb
+ x11-apps/xsetroot
+ !<kde-plasma/breeze-5.22.90:5
+ !<kde-plasma/plasma-desktop-5.23.90:5
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.21.5-split-libkworkspace.patch # downstream
+ "${FILESDIR}"/${PN}-5.22.5-krunner-cwd-at-home.patch # TODO upstream: KDE-bug 432975, bug 767478
+ "${FILESDIR}"/${P}-sddm-theme-KeyboardButton-fix-layout-name.patch
+ "${FILESDIR}"/${P}-applets-appmenu-fix-top-level-menu-text-coloration.patch # KDE-bug 453348
+ "${FILESDIR}"/${P}-applets-systemtray-prefer-IconName-over-IconPixmap.patch # KDE-bug 418996
+ "${FILESDIR}"/${P}-wallpapers-image-fix-missing-folder-action-buttons.patch
+ "${FILESDIR}"/${P}-fix-plasmashell-crash-on-panel-w-systray-remove.patch # KDE-bug 453726
+ "${FILESDIR}"/${P}-kcms-desktoptheme-detect-installed-styles-{1,2}.patch # KDE-bug 453830
+ "${FILESDIR}"/${P}-applets-kicker-refresh-RootModel-on-session-backend.patch # KDE-bug 427530
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ cmake_comment_add_subdirectory libkworkspace
+ # delete colliding libkworkspace translations
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ ecm_punt_kf_module Su
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_xembed-sni-proxy=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # default startup and shutdown scripts
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${FILESDIR}"/10-agent-startup.sh
+
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${FILESDIR}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5.ebuild
index 9d9161b72295..4a64d1146f77 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.3-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -16,8 +16,8 @@ DESCRIPTION="KDE Plasma workspace"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
REQUIRED_USE="gps? ( geolocation )"
RESTRICT="test"
@@ -84,6 +84,7 @@ COMMON_DEPEND="
>=kde-plasma/libksysguard-${PVCUT}:5
>=kde-plasma/libkworkspace-${PVCUT}:5
>=media-libs/phonon-4.11.0
+ sci-libs/libqalculate:=
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
@@ -97,7 +98,6 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
- calculator? ( sci-libs/libqalculate:= )
calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
fontconfig? (
>=dev-qt/qtprintsupport-${QTMIN}:5
@@ -107,6 +107,7 @@ COMMON_DEPEND="
)
geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
gps? ( sci-geosciences/gpsd )
+ policykit? ( virtual/libcrypt:= )
screencast? (
>=dev-qt/qtgui-${QTMIN}:5=[egl]
media-libs/libglvnd
@@ -117,7 +118,7 @@ COMMON_DEPEND="
telemetry? ( dev-libs/kuserfeedback:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.1.1
+ >=dev-libs/plasma-wayland-protocols-1.6.0
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-util/wayland-scanner-1.19.0
x11-base/xorg-proto
@@ -125,34 +126,34 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
+ >=dev-qt/qdbus-${QTMIN}:*
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=dev-qt/qtpaths-${QTMIN}:5
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
>=dev-qt/qtquickcontrols2-${QTMIN}:5
kde-apps/kio-extras:5
- >=kde-frameworks/kdesu-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/milou-${PVCUT}:5
>=kde-plasma/plasma-integration-${PVCUT}:5
+ sys-apps/dbus
x11-apps/xmessage
x11-apps/xprop
x11-apps/xrdb
x11-apps/xsetroot
- sys-apps/dbus
!<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.21.90:5
+ !<kde-plasma/plasma-desktop-5.23.90:5
+ policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ virtual/pkgconfig
"
-BDEPEND="virtual/pkgconfig"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
PATCHES=(
"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${P}-baloosearchrunner-emit-DBus-error-when-disabled.patch" # KDE-bug 445342
- "${FILESDIR}/${P}-systemtray-check-if-service-already-added.patch" # KDE-bug 443961
- "${FILESDIR}/${P}-systemtray-fix-race-condition.patch"
)
src_prepare() {
@@ -169,9 +170,17 @@ src_prepare() {
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
+ if ! use policykit; then
+ cmake_run_in kcms cmake_comment_add_subdirectory users
+ fi
+
+ ecm_punt_kf_module Su
}
src_configure() {
@@ -186,8 +195,6 @@ src_configure() {
$(cmake_use_find_package telemetry KUserFeedback)
)
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
ecm_src_configure
}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 37937d6af597..ea366b3531e1 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
-DIST plymouth-kcm-5.23.3.tar.xz 39276 BLAKE2B 10aba6e14744c1cf2ba5cb56ccbdeec840e626cadd22671ef006912e26cc852dea9a6b52275bf8fb536fb27984853b2c0ae8fb9aa38567471c58c893ff5b4914 SHA512 9794f6187315d755ba0724c92a3eb1c4647c4c1050c53d9c852dc4d0b932adc8e34aca723cb13dc4986770dabed87ab9ed3abe3ca5a782b358cf0c24759e5961
+DIST plymouth-kcm-5.24.4.tar.xz 39920 BLAKE2B e1edda971f8d055defe35da2710c1da7de336bde9dedc378b7217b1884da2bbdf066be58e17159b029487772f0ff3e2072986c6b7da1cf005e4dbab5ab3dd5ca SHA512 532f83b73fdbdfb1457a86d8d06d0f947eb64729d75b33646c7ca276845407c5ad924f2d3bfa34a926a26f0c580696ed076bb927b99d13edc1049f0109c8b4af
+DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild
index 181a0738422b..d6268b4f5766 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
index 57d4b2f388e2..8800e665bf19 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.3.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 32a7392578e3..bc252a236a22 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,2 @@
-DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
-DIST polkit-kde-agent-1-5.23.3.tar.xz 48108 BLAKE2B fe16232fed31505b9e83b5f3c969bb1ed31ab2566fc6cde604af84c9d236131b7d85a35187241a180141c1fab81fa4868b7f21c66818a1bd1d7ca38a79fccda4 SHA512 4cb3712555e8e1b30382e1d1117a6909794c2fab105768e68cfe43565322f2dcc68150de0d883e6e61441f064dda51a21b493734eb2cf0f96ef298cd2fdbdcae
+DIST polkit-kde-agent-1-5.24.4.tar.xz 48424 BLAKE2B f7981148478e674961aaac29359748e1703a5ae41d1cadde0b94da5c37c4bc9afd1a508e3ea6e6e083dae21174fa1e2377e3679ad6ae8709d50918579b9df069 SHA512 49e18d1c3e858eba2157064fef94b8023f7ac56cbc3bd43f1b454f19381a3d9567a68ec0f846097e992f4cec78f51ed011cc36afd9e3b335ffe6bf05001c6664
+DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild
index 205823f616da..6d8dd7374950 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KDE_ORG_NAME="${PN}-1"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
index 5dc5f3c9aa38..1a4ad3aed2e5 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.3.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KDE_ORG_NAME="${PN}-1"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index d0a29c574204..8f9ae48efa00 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
-DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
-DIST powerdevil-5.23.3.tar.xz 629172 BLAKE2B 062b1eb703d9c609ce8c8477b2869c5a0c22278191d71ca1c94fdea579976e2f783db691bce1b245b086f09a08df53652159f74ea1040435cbfe7b608c7fcc3b SHA512 6ad425a4748fde502749b6d6b5e9d925c733322ca9c39c098d946c0607b8d865ac0ccc98d5dd35909cded439b181a25994681e40477c00878b2497e298dcffd2
+DIST powerdevil-5.24.4.tar.xz 632736 BLAKE2B ab348f7f193627bd7833890cc64ff07b614ff899f2fc2c148d38f6a42f627ae7f2ed7978aecd08795ab4ebdaa4a36b68c483f8fabe7714954e4527c6b743e1cf SHA512 195724a72593248bcf7001a59fbc3b1b1aa3672c3b040eff935993fff26e16c2d85ec37ccc3d2d25e9e3758dd5ed135f203d22855982141fca2e3600566589ee
+DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch b/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
deleted file mode 100644
index 997807a2214a..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d8c5490c99bae9f979f6483dc7b0381121a4f997 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Mon, 8 Nov 2021 20:02:33 +0100
-Subject: [PATCH] Always dismiss critical battery notification
-
-The timer isn't running when user chose "Do nothing" on critical battery
-
-BUG: 445171
-FIXED-IN: 5.23.4
-
-
-(cherry picked from commit 5668ded34f928ffce43ebe1defb775e70bbbb3b7)
----
- daemon/powerdevilcore.cpp | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
-index 040dd6b6..c5ba3e54 100644
---- a/daemon/powerdevilcore.cpp
-+++ b/daemon/powerdevilcore.cpp
-@@ -259,7 +259,7 @@ void Core::reparseConfiguration()
- Q_EMIT configurationReloaded();
-
- // Check if critical threshold might have changed and cancel the timer if necessary.
-- if (m_criticalBatteryTimer->isActive() && currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
-+ if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
- m_criticalBatteryTimer->stop();
- if (m_criticalBatteryNotification) {
- m_criticalBatteryNotification->close();
-@@ -494,14 +494,17 @@ void Core::onDeviceAdded(const QString &udi)
- m_lowBatteryNotification->close();
- }
-
-- if (m_criticalBatteryTimer->isActive() && currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
-- m_criticalBatteryTimer->stop();
-+ if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
- if (m_criticalBatteryNotification) {
- m_criticalBatteryNotification->close();
- }
-- emitRichNotification(QStringLiteral("pluggedin"),
-- i18n("Extra Battery Added"),
-- i18n("The computer will no longer go to sleep."));
-+
-+ if (m_criticalBatteryTimer->isActive()) {
-+ m_criticalBatteryTimer->stop();
-+ emitRichNotification(QStringLiteral("pluggedin"),
-+ i18n("Extra Battery Added"),
-+ i18n("The computer will no longer go to sleep."));
-+ }
- }
- }
-
-@@ -692,11 +695,12 @@ void Core::onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState
- m_lowBatteryNotification->close();
- }
-
-+ if (m_criticalBatteryNotification) {
-+ m_criticalBatteryNotification->close();
-+ }
-+
- if (m_criticalBatteryTimer->isActive()) {
- m_criticalBatteryTimer->stop();
-- if (m_criticalBatteryNotification) {
-- m_criticalBatteryNotification->close();
-- }
- emitRichNotification(QStringLiteral("pluggedin"),
- i18n("AC Adapter Plugged In"),
- i18n("The computer will no longer go to sleep."));
---
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild
index 5003cb8e547c..f06590672c3f 100644
--- a/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -34,6 +34,7 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
@@ -45,7 +46,7 @@ DEPEND="
>=kde-plasma/libkworkspace-${PVCUT}:5
virtual/libudev:=
x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil )
+ brightness-control? ( app-misc/ddcutil:= )
caps? ( sys-libs/libcap )
wireless? (
>=kde-frameworks/bluez-qt-${KFMIN}:5
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
index a6c9f5612a36..94703d516236 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -34,6 +34,7 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
@@ -45,7 +46,7 @@ DEPEND="
>=kde-plasma/libkworkspace-${PVCUT}:5
virtual/libudev:=
x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil )
+ brightness-control? ( app-misc/ddcutil:= )
caps? ( sys-libs/libcap )
wireless? (
>=kde-frameworks/bluez-qt-${KFMIN}:5
@@ -57,8 +58,6 @@ RDEPEND="${DEPEND}
>=sys-power/upower-0.9.23
"
-PATCHES=( "${FILESDIR}"/${P}-dismiss-battery-notifications.patch )
-
src_configure() {
local mycmakeargs=(
-DHAVE_DDCUTIL=$(usex brightness-control)
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index fe04f9f24dd2..a1ad758667dc 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
-DIST sddm-kcm-5.23.3.tar.xz 77568 BLAKE2B e555a408f97aa27d6e69528a0f086a5dde5aaec4a1784592ad9d28461f50f6d715f8146300fe208ee1ebc23d15b77c88161e546327c1429745e61f153cb26dd8 SHA512 3c6c03031ac6e04681eebcadc0a9e978ab41f96e2fe541121b7dd0d13ea91df855263cc38bc9c47d2dda508f6c6905591aff6236c0d3332fb7f57e4aca382a8d
+DIST sddm-kcm-5.24.4.tar.xz 81212 BLAKE2B 4e1b4a7762c330a89af10fe729373548bd2167c27dd5dbda53d08fa63c4ab0f399969b92a0fc67cd72bdb66bbccf360c057d09c81e4041ec6fed4f9ca1f7301f SHA512 ecff5e710148dc42daffdbebb5ea63c36afe01cf1c3219e615efc8c34d1191748e69ff79017beb3ccd1e48c0e967d258066b004c25b9aa2252972645e95a1192
+DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild
index 8389991bf709..362db6a8c3c2 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -26,6 +26,7 @@ DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.23.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
index c0a6d49efe85..7da8175afc35 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.23.3.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index cc944807bdae..10653b9ec2fd 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
-DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
-DIST systemsettings-5.23.3.tar.xz 203552 BLAKE2B 7e7b44bd02d2c93c5f2e689535d260860b47db3f7c4f8a318c1e5494ac8b5117a07406b3d85fdc5a474397b9ca5600ec4760c37d2a97dcdcad05ee33f8f25a6a SHA512 d99343fcadc2d5b010785ff263a51189f03f2b97c46b2c64f8e4cd39a9990edfa8cf44557dc0876c487c5b4841c4a12e0db6d9b0e89267e0a278dced45504a31
+DIST systemsettings-5.24.4.tar.xz 205488 BLAKE2B 0bef1c8f3c1c63820b273e8182db3a506b71f379bbe952b485c73485b9fecfea418dea19c1fdfa53fb0fc5436ece192f1b30e60ebb9e3e65151a21f62b9a50bb SHA512 4de5b7c8224f0fb376dfa5481c4185d44632485569e3dd1a7f36582751ca15de2382cd8293d684bdb1d771983ad09b53fa36fe7ae776f447ca09f609a6ec13c0
+DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
new file mode 100644
index 000000000000..c52f043133b7
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
@@ -0,0 +1,27 @@
+From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 16:49:55 +0200
+Subject: [PATCH] Fix activating running instance on Wayland
+
+(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3)
+---
+ app/main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 13a803cd..e3f7b004 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -172,7 +172,8 @@ int main(int argc, char *argv[])
+ mainWindow->reloadStartupModule();
+ }
+
+- KWindowSystem::forceActiveWindow(mainWindow->winId());
++ KWindowSystem::updateStartupId(mainWindow->windowHandle());
++ KWindowSystem::activateWindow(mainWindow->windowHandle());
+ });
+
+ if (!startupModule.isEmpty()) {
+--
+GitLab
+
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
new file mode 100644
index 000000000000..9f8d494ded69
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
@@ -0,0 +1,32 @@
+From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 01:22:14 +0200
+Subject: [PATCH] Fix current index in subcategory list
+
+We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken
+
+Manually set the current index when the backend index changes
+
+BUG: 453543
+
+Fixed-In: 5.24.6
+(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a)
+---
+ sidebar/package/contents/ui/SubCategoryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml
+index 756b2763..19b33142 100644
+--- a/sidebar/package/contents/ui/SubCategoryPage.qml
++++ b/sidebar/package/contents/ui/SubCategoryPage.qml
+@@ -140,6 +140,7 @@ Kirigami.ScrollablePage {
+ Connections {
+ target: systemsettings
+ function onActiveSubCategoryRowChanged() {
++ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow
+ if (systemsettings.activeSubCategoryRow >= 0) {
+ if (subCategoryView.count > 1) {
+ root.pageStack.push(subCategoryColumn);
+--
+GitLab
+
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
index bb83024afd9a..3b2ece11ba78 100644
--- a/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
+ECM_HANDBOOK="optional"
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
@@ -39,7 +39,9 @@ DEPEND="
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..ab73d76a6c65
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543
+ "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch"
+)
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-plasma/systemsettings/systemsettings-5.23.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5.ebuild
index 452b6efd42ca..1fd3657ca980 100644
--- a/kde-plasma/systemsettings/systemsettings-5.23.3.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index bec83d3f47c2..a3f73b00da72 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1,2 @@
-DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
-DIST xdg-desktop-portal-kde-5.23.3.tar.xz 89400 BLAKE2B b2c67ef57b5a71b17f2fadf913cc1e4aad532e5eeb13a2c265f59b95272ff66fbdf086e9e1d41dfd3a1809037dfa951c71fc9cae28e9c0cacb67ed643070362b SHA512 79d1e40ef5f4e318873aff3993e9c8924d74d878c6e29d9ef7b34f87373468ff385c6200c71a2a4c26a850612c5955192b6a88d23f063cefe7934f67cda6a3e0
+DIST xdg-desktop-portal-kde-5.24.4.tar.xz 88540 BLAKE2B 6a6522bbfe99919a98ee697fc6331fe6b833f376307dbfec303dddb2020c97d355dcd0b251d0feb1e270f2b9a7633f8e770f5e58d9a0ade618dd376fc3890eed SHA512 6efd6452aff8e139921d884e272d26421ed3b1b83c36ca1bdee8bb54633cf85866be87e5f169ececd5364d901d78d9f4b0dd520450b890540a5bd514b0e2e54c
+DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch
new file mode 100644
index 000000000000..6b771bfede1e
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch
@@ -0,0 +1,32 @@
+From bbff465e6a005c737ee2e53eb5e072da006d9b4b Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Fri, 13 May 2022 16:47:36 +0200
+Subject: [PATCH] screenshare: Show the screen sharing notifier more
+ prominently
+
+Sets it as active, otherwise it got buried in the extended view of the
+system tray.
+
+BUG: 452980
+
+
+(cherry picked from commit 3d61dae1fa334a9f3dadc505a038f75aa5846588)
+---
+ src/waylandintegration.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index e125578..b1b2d4d 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -292,6 +292,7 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+ }
+ item->setOverlayIconByName("media-record");
+ item->setToolTip(item->iconName(), item->title(), i18n("Press to cancel"));
++ item->setStatus(KStatusNotifierItem::Active);
+ connect(item, &KStatusNotifierItem::activateRequested, stream, [=] {
+ stopStreaming(nodeid);
+ stream->deleteLater();
+--
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild
index c13ae9aa9405..dce949206335 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -21,22 +21,24 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
- >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.1.1
>=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
"
RDEPEND="${COMMON_DEPEND}
sys-apps/xdg-desktop-portal
"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..302a1ac2c35e
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/xdg-desktop-portal
+"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-show-screenshare-notifier-more-prominently.patch # KDE-bug 452980
+)
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.3.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5.ebuild
index 741a7d0cb11f..af1dd643a98d 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.3.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -21,22 +21,24 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
- >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.1.1
>=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
"
RDEPEND="${COMMON_DEPEND}
sys-apps/xdg-desktop-portal
"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 7d5cecf5655f..be5c47e6ef60 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
+DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
index b517e964f3dd..4930f2576348 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit cmake kde.org
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.3.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
index 7ebe3cfa45e1..b73f5cac8f27 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.3.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit cmake kde.org