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.5.ebuild (renamed from kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild)8
-rw-r--r--kde-plasma/bluedevil/bluedevil-5.25.2.ebuild (renamed from kde-plasma/bluedevil/bluedevil-5.23.5.ebuild)4
-rw-r--r--kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch89
-rw-r--r--kde-plasma/breeze-grub/Manifest4
-rw-r--r--kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild (renamed from kde-plasma/breeze-grub/breeze-grub-5.23.5.ebuild)2
-rw-r--r--kde-plasma/breeze-grub/breeze-grub-5.25.2.ebuild (renamed from kde-plasma/breeze-grub/breeze-grub-5.23.4.ebuild)4
-rw-r--r--kde-plasma/breeze-gtk/Manifest4
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild (renamed from kde-plasma/breeze-gtk/breeze-gtk-5.23.5.ebuild)2
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.25.2.ebuild (renamed from kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild)5
-rw-r--r--kde-plasma/breeze-plymouth/Manifest4
-rw-r--r--kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild (renamed from kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.ebuild)4
-rw-r--r--kde-plasma/breeze-plymouth/breeze-plymouth-5.25.2.ebuild (renamed from kde-plasma/breeze-plymouth/breeze-plymouth-5.23.5.ebuild)2
-rw-r--r--kde-plasma/breeze/Manifest4
-rw-r--r--kde-plasma/breeze/breeze-5.24.5.ebuild (renamed from kde-plasma/breeze/breeze-5.23.5.ebuild)8
-rw-r--r--kde-plasma/breeze/breeze-5.25.2.ebuild (renamed from kde-plasma/breeze/breeze-5.23.4-r1.ebuild)14
-rw-r--r--kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch35
-rw-r--r--kde-plasma/discover/Manifest4
-rw-r--r--kde-plasma/discover/discover-5.24.5.ebuild (renamed from kde-plasma/discover/discover-5.23.5.ebuild)8
-rw-r--r--kde-plasma/discover/discover-5.25.2.ebuild (renamed from kde-plasma/discover/discover-5.23.4.ebuild)18
-rw-r--r--kde-plasma/discover/files/discover-5.25.1-tests-optional.patch87
-rw-r--r--kde-plasma/drkonqi/Manifest4
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.24.5.ebuild (renamed from kde-plasma/drkonqi/drkonqi-5.23.4.ebuild)4
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.25.2.ebuild (renamed from kde-plasma/drkonqi/drkonqi-5.23.5.ebuild)11
-rw-r--r--kde-plasma/kactivitymanagerd/Manifest4
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.ebuild)4
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.5.ebuild)6
-rw-r--r--kde-plasma/kde-cli-tools/Manifest4
-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.4.ebuild)4
-rw-r--r--kde-plasma/kde-cli-tools/kde-cli-tools-5.25.2.ebuild (renamed from kde-plasma/kde-cli-tools/kde-cli-tools-5.23.5.ebuild)8
-rw-r--r--kde-plasma/kde-gtk-config/Manifest4
-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.4.ebuild)4
-rw-r--r--kde-plasma/kde-gtk-config/kde-gtk-config-5.25.2.ebuild (renamed from kde-plasma/kde-gtk-config/kde-gtk-config-5.23.5.ebuild)6
-rw-r--r--kde-plasma/kdecoration/Manifest4
-rw-r--r--kde-plasma/kdecoration/kdecoration-5.24.5.ebuild (renamed from kde-plasma/kdecoration/kdecoration-5.23.4.ebuild)5
-rw-r--r--kde-plasma/kdecoration/kdecoration-5.25.2.ebuild (renamed from kde-plasma/kdecoration/kdecoration-5.23.5.ebuild)7
-rw-r--r--kde-plasma/kdeplasma-addons/Manifest4
-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.5-r1.ebuild (renamed from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild)8
-rw-r--r--kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild (renamed from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5.ebuild)7
-rw-r--r--kde-plasma/kgamma/Manifest4
-rw-r--r--kde-plasma/kgamma/kgamma-5.24.5.ebuild (renamed from kde-plasma/kgamma/kgamma-5.23.4.ebuild)4
-rw-r--r--kde-plasma/kgamma/kgamma-5.25.2.ebuild (renamed from kde-plasma/kgamma/kgamma-5.23.5.ebuild)6
-rw-r--r--kde-plasma/khotkeys/Manifest4
-rw-r--r--kde-plasma/khotkeys/khotkeys-5.24.5.ebuild (renamed from kde-plasma/khotkeys/khotkeys-5.23.4.ebuild)4
-rw-r--r--kde-plasma/khotkeys/khotkeys-5.25.2.ebuild (renamed from kde-plasma/khotkeys/khotkeys-5.23.5.ebuild)6
-rw-r--r--kde-plasma/kinfocenter/Manifest4
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild106
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild (renamed from kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild)28
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.25.2.ebuild (renamed from kde-plasma/kinfocenter/kinfocenter-5.23.5.ebuild)37
-rw-r--r--kde-plasma/kinfocenter/metadata.xml3
-rw-r--r--kde-plasma/kmenuedit/Manifest4
-rw-r--r--kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild (renamed from kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild)4
-rw-r--r--kde-plasma/kmenuedit/kmenuedit-5.25.2.ebuild (renamed from kde-plasma/kmenuedit/kmenuedit-5.23.5.ebuild)7
-rw-r--r--kde-plasma/kscreen/Manifest4
-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-fix-kded-xcb-resources-leak.patch61
-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.5-r2.ebuild (renamed from kde-plasma/kscreen/kscreen-5.23.4.ebuild)11
-rw-r--r--kde-plasma/kscreen/kscreen-5.25.2.ebuild (renamed from kde-plasma/kscreen/kscreen-5.23.5.ebuild)7
-rw-r--r--kde-plasma/kscreenlocker/Manifest4
-rw-r--r--kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild (renamed from kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild)4
-rw-r--r--kde-plasma/kscreenlocker/kscreenlocker-5.25.2.ebuild (renamed from kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild)35
-rw-r--r--kde-plasma/ksshaskpass/Manifest4
-rw-r--r--kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild (renamed from kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild)4
-rw-r--r--kde-plasma/ksshaskpass/ksshaskpass-5.25.2.ebuild (renamed from kde-plasma/ksshaskpass/ksshaskpass-5.23.5.ebuild)6
-rw-r--r--kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild2
-rw-r--r--kde-plasma/ksysguard/ksysguard-5.22.0.ebuild55
-rw-r--r--kde-plasma/ksystemstats/Manifest4
-rw-r--r--kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild (renamed from kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild)4
-rw-r--r--kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild (renamed from kde-plasma/ksystemstats/ksystemstats-5.23.5.ebuild)6
-rw-r--r--kde-plasma/kwallet-pam/Manifest4
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild (renamed from kde-plasma/kwallet-pam/kwallet-pam-5.23.4.ebuild)4
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.25.2.ebuild (renamed from kde-plasma/kwallet-pam/kwallet-pam-5.23.5.ebuild)4
-rw-r--r--kde-plasma/kwayland-integration/Manifest4
-rw-r--r--kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild (renamed from kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild)9
-rw-r--r--kde-plasma/kwayland-integration/kwayland-integration-5.25.2.ebuild (renamed from kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild)12
-rw-r--r--kde-plasma/kwayland-server/Manifest3
-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.23.5.ebuild36
-rw-r--r--kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild (renamed from kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild)17
-rw-r--r--kde-plasma/kwin/Manifest4
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch30
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch50
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch34
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch100
-rw-r--r--kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch36
-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-fix-plasmashell-crash-1.patch307
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch35
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch32
-rw-r--r--kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch32
-rw-r--r--kde-plasma/kwin/kwin-5.23.4-r2.ebuild139
-rw-r--r--kde-plasma/kwin/kwin-5.24.5-r2.ebuild (renamed from kde-plasma/kwin/kwin-5.23.4-r1.ebuild)19
-rw-r--r--kde-plasma/kwin/kwin-5.25.2.ebuild (renamed from kde-plasma/kwin/kwin-5.23.5.ebuild)41
-rw-r--r--kde-plasma/kwin/metadata.xml1
-rw-r--r--kde-plasma/kwrited/Manifest4
-rw-r--r--kde-plasma/kwrited/kwrited-5.24.5.ebuild (renamed from kde-plasma/kwrited/kwrited-5.23.4.ebuild)4
-rw-r--r--kde-plasma/kwrited/kwrited-5.25.2.ebuild (renamed from kde-plasma/kwrited/kwrited-5.23.5.ebuild)6
-rw-r--r--kde-plasma/layer-shell-qt/Manifest4
-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.4.ebuild)5
-rw-r--r--kde-plasma/layer-shell-qt/layer-shell-qt-5.25.2.ebuild (renamed from kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild)7
-rw-r--r--kde-plasma/libkscreen/Manifest4
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.24.5.ebuild (renamed from kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild)12
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.25.2.ebuild (renamed from kde-plasma/libkscreen/libkscreen-5.23.4.ebuild)19
-rw-r--r--kde-plasma/libksysguard/Manifest4
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch76
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch32
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch35
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch43
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild79
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.23.4.ebuild)10
-rw-r--r--kde-plasma/libksysguard/libksysguard-5.25.2.ebuild (renamed from kde-plasma/libksysguard/libksysguard-5.23.5.ebuild)9
-rw-r--r--kde-plasma/libkworkspace/Manifest4
-rw-r--r--kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch48
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.ebuild)9
-rw-r--r--kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild)11
-rw-r--r--kde-plasma/milou/Manifest4
-rw-r--r--kde-plasma/milou/milou-5.24.5.ebuild (renamed from kde-plasma/milou/milou-5.23.4.ebuild)4
-rw-r--r--kde-plasma/milou/milou-5.25.2.ebuild (renamed from kde-plasma/milou/milou-5.23.5.ebuild)6
-rw-r--r--kde-plasma/oxygen-sounds/Manifest1
-rw-r--r--kde-plasma/oxygen-sounds/metadata.xml11
-rw-r--r--kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild17
-rw-r--r--kde-plasma/oxygen/Manifest4
-rw-r--r--kde-plasma/oxygen/oxygen-5.24.5.ebuild (renamed from kde-plasma/oxygen/oxygen-5.23.5.ebuild)4
-rw-r--r--kde-plasma/oxygen/oxygen-5.25.2.ebuild (renamed from kde-plasma/oxygen/oxygen-5.23.4.ebuild)15
-rw-r--r--kde-plasma/plasma-browser-integration/Manifest4
-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.4.ebuild)5
-rw-r--r--kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild (renamed from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.5.ebuild)7
-rw-r--r--kde-plasma/plasma-desktop/Manifest4
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch126
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch53
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch35
-rw-r--r--kde-plasma/plasma-desktop/metadata.xml1
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild)14
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild)22
-rw-r--r--kde-plasma/plasma-disks/Manifest4
-rw-r--r--kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild (renamed from kde-plasma/plasma-disks/plasma-disks-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-disks/plasma-disks-5.25.2.ebuild (renamed from kde-plasma/plasma-disks/plasma-disks-5.23.5.ebuild)6
-rw-r--r--kde-plasma/plasma-firewall/Manifest4
-rw-r--r--kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild (renamed from kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-firewall/plasma-firewall-5.25.2.ebuild (renamed from kde-plasma/plasma-firewall/plasma-firewall-5.23.5.ebuild)7
-rw-r--r--kde-plasma/plasma-integration/Manifest4
-rw-r--r--kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild (renamed from kde-plasma/plasma-integration/plasma-integration-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-integration/plasma-integration-5.25.2.ebuild (renamed from kde-plasma/plasma-integration/plasma-integration-5.23.5.ebuild)19
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild)2
-rw-r--r--kde-plasma/plasma-meta/plasma-meta-5.25.2.ebuild (renamed from kde-plasma/plasma-meta/plasma-meta-5.23.5.ebuild)6
-rw-r--r--kde-plasma/plasma-nm/Manifest4
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild (renamed from kde-plasma/plasma-nm/plasma-nm-5.23.5.ebuild)6
-rw-r--r--kde-plasma/plasma-pa/Manifest4
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild (renamed from kde-plasma/plasma-pa/plasma-pa-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild (renamed from kde-plasma/plasma-pa/plasma-pa-5.23.5.ebuild)6
-rw-r--r--kde-plasma/plasma-sdk/Manifest4
-rw-r--r--kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild (renamed from kde-plasma/plasma-sdk/plasma-sdk-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild (renamed from kde-plasma/plasma-sdk/plasma-sdk-5.23.5.ebuild)4
-rw-r--r--kde-plasma/plasma-systemmonitor/Manifest4
-rw-r--r--kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch36
-rw-r--r--kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch73
-rw-r--r--kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild (renamed from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild)4
-rw-r--r--kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.2.ebuild (renamed from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild)14
-rw-r--r--kde-plasma/plasma-thunderbolt/Manifest4
-rw-r--r--kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild (renamed from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild (renamed from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.5.ebuild)4
-rw-r--r--kde-plasma/plasma-vault/Manifest4
-rw-r--r--kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild (renamed from kde-plasma/plasma-vault/plasma-vault-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild (renamed from kde-plasma/plasma-vault/plasma-vault-5.23.5.ebuild)6
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/Manifest4
-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.4.ebuild)2
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.2.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.5.ebuild)2
-rw-r--r--kde-plasma/plasma-workspace/Manifest4
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch33
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch34
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch31
-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/files/plasma-workspace-5.24.80-split-libkworkspace.patch37
-rw-r--r--kde-plasma/plasma-workspace/metadata.xml2
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild)55
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.25.2.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild)45
-rw-r--r--kde-plasma/plymouth-kcm/Manifest4
-rw-r--r--kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild (renamed from kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild)4
-rw-r--r--kde-plasma/plymouth-kcm/plymouth-kcm-5.25.2.ebuild (renamed from kde-plasma/plymouth-kcm/plymouth-kcm-5.23.5.ebuild)4
-rw-r--r--kde-plasma/polkit-kde-agent/Manifest4
-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.4.ebuild)4
-rw-r--r--kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild (renamed from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.5.ebuild)6
-rw-r--r--kde-plasma/powerdevil/Manifest4
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.24.5.ebuild (renamed from kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild)3
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.25.2.ebuild (renamed from kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild)7
-rw-r--r--kde-plasma/sddm-kcm/Manifest4
-rw-r--r--kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild (renamed from kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild)4
-rw-r--r--kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild (renamed from kde-plasma/sddm-kcm/sddm-kcm-5.23.5.ebuild)6
-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.5-r1.ebuild (renamed from kde-plasma/systemsettings/systemsettings-5.23.4.ebuild)9
-rw-r--r--kde-plasma/systemsettings/systemsettings-5.25.2.ebuild (renamed from kde-plasma/systemsettings/systemsettings-5.23.5.ebuild)7
-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-screencast-close-only-streams-of-closing-session.patch107
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch358
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch28
-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.5-r2.ebuild (renamed from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.ebuild)17
-rw-r--r--kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.2.ebuild (renamed from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild)16
-rw-r--r--kde-plasma/xembed-sni-proxy/Manifest4
-rw-r--r--kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch60
-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.4.ebuild)4
-rw-r--r--kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild (renamed from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.5.ebuild)13
218 files changed, 2819 insertions, 1900 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index b7d048df6599..b1daaa592e3a 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
-DIST bluedevil-5.23.4.tar.xz 171304 BLAKE2B 239dc03d078f38c371446e3a1d73ad667eed2f4aa9c7d434d41ff2c973b5abf6d9b3b8661c7d3907adc55cb588e5481a66039b258a9ba7f468ce331c1dc172dc SHA512 41564e1e7fc7ecf5225063180a69d04c36340bd5b7c4ed8540b1b46b232c43c684e9c3faaafa1ded037c08a4a1bc49a82b9a4660df97e00e5ae2711fceba9a6b
-DIST bluedevil-5.23.5.tar.xz 171644 BLAKE2B b555e1f56706ae20b5017f6b97c4db9ed6e8ee7e7dba5a8e172e0e6d6e85c695c14bb220e95ef01c9390ad5163dbc4490b5142cb18cfb526fc4efc5f18106123 SHA512 66185703fe36b7da48ccf21db09832a80497562f5f57e539fc11d4e898f5d6f0e47ad94c81ad03ca3b0b82163f40f23b64de3af084453931dfe30861e1e3b000
+DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757
+DIST bluedevil-5.25.2.tar.xz 173204 BLAKE2B 6953a4978b66ae557096980d5b78176bd02bb0135fc44b0f0229597aabac0fde2737c44d48fa5fade5f0f6ab59c5beb5cb5e805ece812e00f6947992e7c26528 SHA512 270ac2f073b1ea223b3500bb99fa5fcacfd738305757b79904f4a82448322ed718210cd36a61900eea69b6ad9f778a56939e7eb27e5b13c9846ca29799f92d84
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
index c50dffa5f1b3..b556abdcbb05 100644
--- a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.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
@@ -16,10 +16,6 @@ SLOT="5"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
-PATCHES=(
- "${FILESDIR}"/${P}-save-bluetooth-status-on-teardown.patch # KDE-bug 445376
-)
-
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.25.2.ebuild
index c56714bd5a0a..bb1f87656ce3 100644
--- a/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Bluetooth stack for KDE Plasma"
diff --git a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
deleted file mode 100644
index 1a0a28e50ec9..000000000000
--- a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From daaa18920ae93b482585eb3df790a6d5a647b6db Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 19 Nov 2021 19:37:58 -0700
-Subject: [PATCH] Save bluetooth status on teardown
-
-Instead of watching for the shutdown and restart signals, just save
-status anytime kded quits, which automatically covers those use cases as
-well as when logging out. This is what the code was already halfway
-doing; let's go all the way.
-
-BUG: 445376
-FIXED-IN: 5.23.5
-(cherry picked from commit e57bb7580251f38e798bea21cdad43a3f90f2568)
----
- src/kded/devicemonitor.cpp | 29 +++--------------------------
- src/kded/devicemonitor.h | 1 -
- 2 files changed, 3 insertions(+), 27 deletions(-)
-
-diff --git a/src/kded/devicemonitor.cpp b/src/kded/devicemonitor.cpp
-index 735747ee..5090a8be 100644
---- a/src/kded/devicemonitor.cpp
-+++ b/src/kded/devicemonitor.cpp
-@@ -46,15 +46,6 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
- this,
- SLOT(login1PrepareForSleep(bool)));
-
-- // Catch shutdown events so we can save status when shutting down and
-- // optionally resume when starting up
-- QDBusConnection::systemBus().connect(QStringLiteral("org.freedesktop.login1"),
-- QStringLiteral("/org/freedesktop/login1"),
-- QStringLiteral("org.freedesktop.login1.Manager"),
-- QStringLiteral("PrepareForShutdown"),
-- this,
-- SLOT(login1PrepareForShutdown(bool)));
--
- // Set initial state
- const KConfigGroup globalGroup = m_config->group("Global");
- const QString launchState = globalGroup.readEntry("launchState", "remember");
-@@ -75,17 +66,11 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
- }
- }
-
--// Save state when tearing down to avoid getting out of sync if kded crashes
--// or is manually restarted
- DeviceMonitor::~DeviceMonitor()
- {
-- KConfigGroup globalGroup = m_config->group("Global");
--
-- if (m_manager->isBluetoothBlocked()) {
-- globalGroup.writeEntry<bool>("bluetoothBlocked", true);
-- } else {
-- globalGroup.deleteEntry("bluetoothBlocked");
-- }
-+ // Save state when tearing down to avoid getting out of sync if kded crashes
-+ // or is manually restarted
-+ saveState();
- }
-
- KFilePlacesModel *DeviceMonitor::places()
-@@ -140,14 +125,6 @@ void DeviceMonitor::login1PrepareForSleep(bool active)
- }
- }
-
--void DeviceMonitor::login1PrepareForShutdown(bool active)
--{
-- if (active) {
-- qCDebug(BLUEDAEMON) << "About to shut down";
-- saveState();
-- }
--}
--
- void DeviceMonitor::saveState()
- {
- KConfigGroup adaptersGroup = m_config->group("Adapters");
-diff --git a/src/kded/devicemonitor.h b/src/kded/devicemonitor.h
-index 6a35fed4..a7b38cab 100644
---- a/src/kded/devicemonitor.h
-+++ b/src/kded/devicemonitor.h
-@@ -35,7 +35,6 @@ private Q_SLOTS:
-
- void deviceConnectedChanged(bool connected);
- void login1PrepareForSleep(bool active);
-- void login1PrepareForShutdown(bool active);
-
- private:
- void restoreState();
---
-GitLab
-
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 99e5110fe3da..d43243c4bc8e 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-grub-5.23.4.tar.xz 3150820 BLAKE2B 712e0e21e4a7f9e0f329e5e9cafe87fafbb7c142e5545b5895c97598930ba3efbad77e803f9b136f556012759ae3deb4147d699f4dc4519e9e4da5df48980965 SHA512 6ebc30ef4fff30bc626b9a5d3b9ba999cfab3b1492a7084df211e3eb15325d3e308ad72d2719cfef996b817593414a86fc2481469530425ded7dc3db5ca1ca78
-DIST breeze-grub-5.23.5.tar.xz 3154068 BLAKE2B a1eae06807e71dcdd445042844e0bf6ccc03205a21af78dec3095d9253f2d4468c689241d4891d724dcec47e679e4c8aad02c99bf383a936c9181b6668c72d89 SHA512 e05770189625991fc80c4cac404757d2251b64ee4dc34ec0b3c79e9eae359048b6c8b9a376caf1f1f6ecdd6e4b172750e5d4493689216b61bfb91c20163d51c9
+DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355
+DIST breeze-grub-5.25.2.tar.xz 3141364 BLAKE2B 5e6f25ab019c52f61748612c8bf906bdeac095ddb34126da2e30c7373fae77e6a83dae0ed4e6c0d35205b23e742c8aaf339e5b5338d083a4673baf735bf3d082 SHA512 b4097285ba92f5756f7a023d585cf2b3b7c7bbe0e5700bc568170dd24adabc2b1989fc532f91bb66b26a9f8a58ba762026f6fdac75ac40894ac7c33af64442bd
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.23.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
index 3a7cb69d9738..dfc1b0a3ae8b 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.23.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
@@ -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-grub/breeze-grub-5.23.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.25.2.ebuild
index 4928f6df65ef..af842b702646 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.23.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.25.2.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 13de798bc8db..a51e809fc387 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-gtk-5.23.4.tar.xz 43560 BLAKE2B 5d7e89e7639b69b01595852d20aecb1714be0ec27b8732fac6507b326372716254ecd29373e2f6d2d890a10430bb298cf9d033aa5d7c8c7bb405b49721e4cdc2 SHA512 05b92b30a2cc25f930b2f8c54eb6068b1e74edab96ad5fd1c42ddf4eef81d5d333c59fb11747056b15da6cfe356666bb573d290055ab56fe3a2c940334d659ed
-DIST breeze-gtk-5.23.5.tar.xz 43576 BLAKE2B 506fce5b9e0b5b27bf588aac9f7dc0588770f096af562704ed48adf4de5519b89c09d5963e31287d92d7f99f9abb00a9902ba7645d96c765119e09dfa6b01d85 SHA512 658962c95bc96fbc67ef094be498a37af39647f18da83b6505e7c7e7503b0796398cef3599f3c066d3301d91a7a278026090dc21edabb56e004db0252bb82633
+DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29
+DIST breeze-gtk-5.25.2.tar.xz 45828 BLAKE2B ee1403423efc0bee722bba27a6939d2ce16de629d817393fb32e3cc9e69e8d282794770e15d7e32aa45bd45d676f77d07fde4832f2e2738f1efffd69e95f60cb SHA512 fbae160173b9b51ad7e4ce56850c0fa9734abe294a4a606880e2e7adf83e9053ca90f7848bf61a978df82d6463ed2d9bb8b8b1c47ed5ff9651643a65c9ee3d3a
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.23.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
index 325c2a0fc59f..db378cc0e98b 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.23.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.25.2.ebuild
index 706ef57ba239..5e5007caad6c 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.25.2.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
@@ -12,13 +12,12 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
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-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 283c1f8dcfaf..563d54ebc011 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-plymouth-5.23.4.tar.xz 110552 BLAKE2B 5579ed55555e2dcbf41feb469d28ef208d1abe05ef832d00fd7436f11df0bed5489681bd1a2948369bc9e18815c5851abcdf2f981c83d6673de5d71dc654dbb0 SHA512 c4dcfbbe7b465f76a53ec99fb6a352a992c08fdb162568d7b533a67e7eacbb8607f24016e9f8acf6b0a7d68e220eef70c6602fdd4cc7cef5acd008253d074b90
-DIST breeze-plymouth-5.23.5.tar.xz 110580 BLAKE2B 8b4dec803c57f51cc10231c936958444b66089e21c55837368ccf1df18d8a91bb6597caf6a253a78f745e71a6f1f7473b5d8e5cdc4d05ddf90cfedc9717dbe76 SHA512 1f8058aeab1c3342b3f93a304f35d81c877822b77887376af260a5d54b6d327186baf5117cecb90aec7e66acff19c77f7e3ba03bced8d3113065b4b6dd97af44
+DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f
+DIST breeze-plymouth-5.25.2.tar.xz 110792 BLAKE2B 18dfb37e87d744e5bc511c8157a0112d44fca06a634483d1e38f474a078327cb626c2f9da30a78952302fd16ccbbb2e590d0461fd59b426437e640400d6eb6ab SHA512 4451c6aaff697b369c4fe6987d9c91b7636f90cf73305e8a9416fc412246f99689fe8a3512b6797464ca364b8216b1fa032a85192233b44d18940367eb21626b
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
index 9bae488c5c64..188483457ed0 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.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-plymouth/breeze-plymouth-5.23.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.2.ebuild
index e5a5cc47064c..cc1ed57083be 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
inherit cmake kde.org
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index e5d3354cc318..3603e29a8220 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-5.23.4.tar.xz 73813800 BLAKE2B 0821a0b484dac61c8c7a492248f9c9bc52abb347b0998a69567f931fd436df4c3f84fdfd7153453b15a7fb7015000012bd45c56d625edf8e952296748ebb5413 SHA512 5273100b059c58689028fbafbfc25f9d185f9b21abe011f8b7e8c9301c8b6d7f1846989c292709016b8c5c5edf627985f99968a809b779d46c23a7c7f773e913
-DIST breeze-5.23.5.tar.xz 73813928 BLAKE2B 4ae30793f9694ff7fd00d41894cc8464c2034641365e2e92d46e76a5ca37a8d0e6c1fa40956f1f36ade9e4f26f824182a067a30ab9de373c23ac173c29984dd9 SHA512 a2002a5399376028fbaa1d742f56f6ee4af1076d61d9537e7c7a792dd6e1f8e0f35806cd374b789d682477a9dbcb38f428c7b8605ab3f6c0a6b237cde78614dc
+DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0
+DIST breeze-5.25.2.tar.xz 31154056 BLAKE2B b421a24abe50aa7c6ab9fbd0de1f2d7e0278f6548feef5438be8cda61438920cb41697b4f145e021ce4d4182d3ab3d7f034e6acbceda2ba877cd0e4c0c85621d SHA512 78b0fb2c8817010f268f59e35c85b1698eefba154834ae6430564d2ef7ede078e5408ba787b52b40d4f841ec7b5e49114a42314d61f4cc93acb2066ea1bf324a
diff --git a/kde-plasma/breeze/breeze-5.23.5.ebuild b/kde-plasma/breeze/breeze-5.24.5.ebuild
index 86fdcde0d1b1..3d50e72e704a 100644
--- a/kde-plasma/breeze/breeze-5.23.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.24.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="X"
RDEPEND="
@@ -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.4-r1.ebuild b/kde-plasma/breeze/breeze-5.25.2.ebuild
index adf3225d6dbe..af43a2b210bd 100644
--- a/kde-plasma/breeze/breeze-5.23.4-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.25.2.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
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Breeze visual style for the Plasma desktop"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="X"
RDEPEND="
@@ -35,16 +35,12 @@ 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
"
-PATCHES=( "${FILESDIR}"/${P}-fix-kstyle-crash.patch )
-
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X XCB)
diff --git a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
deleted file mode 100644
index 1d714c7aa6df..000000000000
--- a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2aa08ed366917b7b207842844b78e5dadd5a06ed Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 16:50:10 +0000
-Subject: [PATCH] [kstyle] Fix logic error in
- drawIndicatorButtonDropDownPrimitive
-
-The current code checks for !complexOption, but then continues to
-de-reference it in the second clause of the statement leading to an
-inveitable crash.
-
-I assume it's meant to be an `or` for the latter part of the statement
-to make sense.
-
-
-(cherry picked from commit b09dbd9282f848e779e74840a5a3ef13c71fa82e)
----
- kstyle/breezestyle.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
-index ee06f41c..1337d26e 100644
---- a/kstyle/breezestyle.cpp
-+++ b/kstyle/breezestyle.cpp
-@@ -4024,7 +4024,7 @@ namespace Breeze
-
- // cast option and check
- const auto complexOption( qstyleoption_cast<const QStyleOptionComplex*>( option ) );
-- if( !complexOption && !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
-+ if( !complexOption || !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
-
- // button state
- bool enabled = option->state & QStyle::State_Enabled;
---
-GitLab
-
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 6776b45b75c9..a353280b2339 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,2 @@
-DIST discover-5.23.4.tar.xz 8237056 BLAKE2B 734c7fd44cf01d958fb9f6a4eb64192b0e608c75c58d83f20f64407762ca69ce4f9c90f538c0a1447e06853fb99952ce860d8d0e4a94071a1f6aae2514449764 SHA512 a2f36b80d14b72c3fa79b0bf1a06f61e66d4363c2167edcf862be97ce7d607ab7c5fad021c4317eee7c339730898e4a87817abeef538b498e08a050edaedd2b4
-DIST discover-5.23.5.tar.xz 8237796 BLAKE2B 75b06d47044251b15e599e29631ad030d7cf46361e7104f6c7907d2e35d98e629c5ff7cade88147a65e1b7f22a8996aaf19787fb90b9984745e1af8f637a8669 SHA512 1a5efea14b7966713240a085c632172eee7e11c6b6a600460374f1abae5446c998397326530231c09946c96495a6591adb9d3c278001279f05dfd6c5e7eb8873
+DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
+DIST discover-5.25.2.tar.xz 8300024 BLAKE2B 87ae77a48ec2327a55341979293f1b9a74287daa1eb588c5718696e6960dda4c3ba91b506d6ca1b6e69449e68931d2ebaab970cf8169b6232e0488d72466b9d3 SHA512 b7d8831037f9c02c1986e51da232f2184caa362f05b3d1c073e07a050f0ff6867173928f4e9c4c7e6befdb02751d7db10fa39e9f033b46444d5a4e9e7be04507
diff --git a/kde-plasma/discover/discover-5.23.5.ebuild b/kde-plasma/discover/discover-5.24.5.ebuild
index 029232e6f720..be46b5a49318 100644
--- a/kde-plasma/discover/discover-5.23.5.ebuild
+++ b/kde-plasma/discover/discover-5.24.5.ebuild
@@ -4,7 +4,7 @@
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="+firmware flatpak telemetry"
# libmarkdown (app-text/discount) only used in PackageKitBackend
@@ -62,6 +62,10 @@ src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
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.4.ebuild b/kde-plasma/discover/discover-5.25.2.ebuild
index 8974e25183c2..fe6197a020ff 100644
--- a/kde-plasma/discover/discover-5.23.4.ebuild
+++ b/kde-plasma/discover/discover-5.25.2.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"
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+firmware flatpak telemetry"
# libmarkdown (app-text/discount) only used in PackageKitBackend
@@ -25,7 +25,6 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/attica-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -39,7 +38,6 @@ DEPEND="
>=kde-frameworks/kidletime-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
@@ -56,12 +54,16 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-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.25.1-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
new file mode 100644
index 000000000000..fc01ca3214bc
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
@@ -0,0 +1,87 @@
+From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Use BUILD_TESTING to make tests optional
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++++-
+ libdiscover/CMakeLists.txt | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd8c61aa..8ce3fa8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,11 @@
+ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
++
++if(BUILD_TESTING)
++ find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+
+ find_package(PkgConfig REQUIRED)
+
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index a26d6934..ca827f3b 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_
+
+ add_subdirectory(backends)
+ add_subdirectory(notifiers)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(discovercommon_SRCS
+ Category/Category.cpp
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 5b4aef10..38377d80 100644
+--- a/libdiscover/backends/DummyBackend/CMakeLists.txt
++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(dummy-backend_SRCS
+ DummyResource.cpp
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index 55e6b38e..e2d11b93 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(flatpak-backend_SRCS
+ FlatpakResource.cpp
+diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index 54f19e1f..ec3443e9 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ add_library(kns-backend MODULE
+ KNSBackend.cpp
+--
+2.35.1
+
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 1f4d6190c3a2..c23a4e3fcefe 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,2 @@
-DIST drkonqi-5.23.4.tar.xz 793452 BLAKE2B 52c3f321d1995c8ee9707f8f448b788061c6656fb40a528247b7828223cd7d80d77cb08517c3217b7d7e1526c444c1be5320b1fd2abf75ca2b4376c009734040 SHA512 75d0238444bed2c2e105fc8202a6a8a2b5841baa9e397135dd2b37cee247c3e397bda0828fca6939abf1e2e8415a9aa22029fe98363e47edca5bf22cc7b7d828
-DIST drkonqi-5.23.5.tar.xz 793388 BLAKE2B cd3ce6c1ffc76436b3fbe948ecd4940f50e50baff173218e1533caa1754039a1f210ac48d5d687c762cbfbc02bcf2451d661e34cdc6a18269c4f02a76346a5d3 SHA512 d13d1776e3730cb9ed92d86bb56be9d27ee4a6770d7ac2737077ecea07a9c3ec3edef9d2020bfb8e462e7e2df406a3bd3210083094ab00ab7880df134829e285
+DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405
+DIST drkonqi-5.25.2.tar.xz 485904 BLAKE2B 05bc0f6e57a0805eefb8632b73928ec9e47dbf700fd730894d46926cf93c0a6d3b767f39b107aaef54c2e2af62e875411d09fb3543ce72bbfe4554aea3c19dc4 SHA512 428abc2740e714f912fe86e3d6529f7135a672d5434fa312ffaccba04c7d52b6617adc10585704d93bae0a4a355178b161ad04b31b34876fd17f8cf563cddc89
diff --git a/kde-plasma/drkonqi/drkonqi-5.23.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
index a732021c8875..0489a66fa83a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.23.4.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/drkonqi-5.23.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.25.2.ebuild
index fd8adc2422d9..3f5ee0130ce6 100644
--- a/kde-plasma/drkonqi/drkonqi-5.23.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.25.2.ebuild
@@ -3,28 +3,29 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}: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/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
@@ -40,6 +41,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
"
RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
|| (
sys-devel/gdb
dev-util/lldb
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 3c748ec26e22..3121e556b806 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,2 @@
-DIST kactivitymanagerd-5.23.4.tar.xz 104468 BLAKE2B 631e08b007c91d3b1ebaf1ef7b9741e362ea49a70161eb772d14761c56e9575729495328bcfae06259f0616b7fb971b8cce0e24fc2b4b7a74d4b8d1cbb34ef1a SHA512 fe1b475896fdd21b27cdb5c461df5d89f751faaeba4e7d5f91433dc54fe3de4bd14285c4575b288887fb5f6e49fe5df2d9069fbbfe32c94369de180b25eed3a5
-DIST kactivitymanagerd-5.23.5.tar.xz 104404 BLAKE2B 9c6f36d6042577aa9c86e008dc3b3599885416a2feb2bbd39b260d036a3e8de43d8debb7ce202384a60b03a98903e0a4406088c4f256481ff467e81846b0da1a SHA512 784285e0f2e4a86da072cc1d3212d38a67b6f8b740bc408285f725b8c4b45928e7a777762f2b4fc857928a03bde9641cb8b258cc23d711631641af526b27f917
+DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c
+DIST kactivitymanagerd-5.25.2.tar.xz 106364 BLAKE2B db5c0195934c851ac41aeda13523b6588b4476a5235eaa7f37fb485edf53be261d058e1786c7661865d1ce69c6d75062015774f480147878dc806477e3e2f4f3 SHA512 3d64e242c9151f4c5775e11226b9cc2d7f35151b0942eed6aa7cabe2345313cc4c4cdad4c54f63e9a5fa33ede84ab5b3bee714a230c1b0f11bc65abd48d94c29
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
index 1de5aa1676c4..a2e2bf34c5d2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.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/kactivitymanagerd/kactivitymanagerd-5.23.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild
index 0a6be3f16264..c221d6fad657 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild
@@ -3,16 +3,16 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 97416b1eb536..6e24e6159c00 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
-DIST kde-cli-tools-5.23.4.tar.xz 631892 BLAKE2B 18a1f5cab4b7e106fb1f4546faecf89ca25403c40d1878092e988dcd454462508e918464acc207f36d9236bfead061b8386c7887dc467e19f36ef5feb571ca9b SHA512 ff7fb345ed5506452417ad1273999e03280b4b630e5bf2af11ccb9722c71620003943e5764848e3a6b776e77943c100376015f4b7d3ff83273e7944d7e6c602c
-DIST kde-cli-tools-5.23.5.tar.xz 631208 BLAKE2B 0fd1f5bf51f74d40631097f050ac1a424ac7309ffc3dbd4be36b5f62035e2d57f212e0c32f21d7e79ea43c2f1aecc46e45efe1042ae067895fc8d36af7c1ac54 SHA512 5dc192d0ea512c2e25637f65bd2eec2fc2d2388b5756ac987bf66948c336669ae0259c9a883cd0f2c6d01206e569b17aab73a639ee1c7c0cf5764dfe4c2718e3
+DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844
+DIST kde-cli-tools-5.25.2.tar.xz 631428 BLAKE2B ffe9f725f860e3ca4578a44b01a0d59ce99db70e2a8e34a3b17191427f3fb5813326a19dc3f8dc9303563b23bd38d0e8ccfa48e934b8500288434622a9d05b4b SHA512 bbc2b7d5358a4c6a1a4687509d38df8335c786eb238780b0c1ab730acb1130a984bc1954dc43c41ed430ce9be7b5c9b67b9d42bd4daca62fae750c2263a79921
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
index 8411409083d2..a004399d626b 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.4.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-cli-tools/kde-cli-tools-5.23.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.2.ebuild
index 8ac2483eae63..154028ff6c24 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.2.ebuild
@@ -5,9 +5,9 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="kdesu X"
REQUIRED_USE="kdesu? ( X )"
@@ -34,10 +34,10 @@ 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/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 2085207e6ef3..dec366872c15 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
-DIST kde-gtk-config-5.23.4.tar.xz 71084 BLAKE2B 36b77bb0ffdaff67594c7c3c0f216f0ec3c05f2456d8edfec501a99b9d441728fa80dc54a7e51a036ec21ee8c1222c4ee45914bd12d7d5dea9764588074dfd53 SHA512 de439e689292b2742858c326a9704bc7e39281c80fa4788d59c0ebe5f5a2772d1383b48f8b460c5a46aa105756fd2322c168ab40d7c0fc170c84af07e0ca135b
-DIST kde-gtk-config-5.23.5.tar.xz 71100 BLAKE2B 986d23a41d6ca57d5c2a916a1348956b2ca6a7fd140cfa8e3636b06fd5e3d2ef7da59485540bde86c8b1cc83e5b1ff535adfba426141dc0a8a5d8aed5b91c295 SHA512 060634ec449eb715d988476ebfd7fa44a2c399e7e4a0978b3e58a036b07eb7b1c0fe7041ff8824ca30ccfef511d7e48b5425d14c4620459a7d7c95fd7d82980a
+DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d
+DIST kde-gtk-config-5.25.2.tar.xz 72052 BLAKE2B 84fd12ab954ecd39b5722da8e7f515e9d0b9a8ac193e78599229da876a7137daf0481c6714ad3542a32057134a93d558a273008c0aa84ef19c84861ce3c09482 SHA512 6eb050bca9dea54b98a643de89c0f024314b45899fe07ca0645f7e48a0c1991c18438563d5a41ebbe9cf360af4a42d5a51d62393561ce01916118d6e79e846e0
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
index 8c9b2ee38654..8bbe52c868c7 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.4.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/kde-gtk-config/kde-gtk-config-5.23.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.2.ebuild
index b07b3b2fe0a7..d385b61ce943 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
LICENSE="GPL-3"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 6b58400ecfce..0b52d311a29d 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
-DIST kdecoration-5.23.4.tar.xz 47400 BLAKE2B 8737415204324b62593a1004da9c3caac360201a7ace0c05e87662d5e1745ba1757cca9f121c7f9a42cae5f5491d093c1787726628ad43ddc48303599e8b4c19 SHA512 17ea89c7eb0cad35b46af401ef2e38243a711c5ee9f3c26b86bec65dab86b26ac19a8d29fe523c45e3f8ed7908f3fb3515e58a15466cd9f6e879a3c577667ce9
-DIST kdecoration-5.23.5.tar.xz 47348 BLAKE2B d7e2f26dbb2ef6d4e1f8862e3ef62c6856dc6f9283d7cc640fede20fafc2b8d02e38950d188861b87d907b609075edc849f129513cb1cc488fe65ef857b157cf SHA512 e4619ff8918e9ac2fb1d167267846155b5305b4709534c111a256b15efa6f7a193fd3d68f55fef7f49bd6e0970339e3fea38743670afd7cb7f596c36088e4c7f
+DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a
+DIST kdecoration-5.25.2.tar.xz 49208 BLAKE2B 32cee60f39f13b3b6a78fe7653bd197756f433228ef76b8dc1be139243bea2c83f1f9dc7070874ae032e19009a3d40b228aa2fe27591382b3a68287046f6efd7 SHA512 2be02149d6da7690aa0802510107291c481106368df3da68b12c5428193cf01fb4769f853526dfd0eb9a3a3641e057c66f34ff703cd11e843271f7f4a4c09c37
diff --git a/kde-plasma/kdecoration/kdecoration-5.23.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
index 0415eb552f9e..dd18504d63bf 100644
--- a/kde-plasma/kdecoration/kdecoration-5.23.4.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/kdecoration/kdecoration-5.23.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.25.2.ebuild
index 6d6e429f08c7..98592d149e0f 100644
--- a/kde-plasma/kdecoration/kdecoration-5.23.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,11 +14,12 @@ DESCRIPTION="Plugin based library to create window decorations"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
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 f03c82b82b89..ca78f6b8cd3a 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
-DIST kdeplasma-addons-5.23.4.tar.xz 628708 BLAKE2B 687ee4f9b68e6521d2165d7b9d570facf786c4b8c9c9d9de98b20533d6b43d197e7b9682de645a09de80e6e28f87120f6b446a86b0408ea7c5ca865413311391 SHA512 03e2db5e8875832d2d430115ec34f5eb86467167f56e09795bcf1595742fc8dc45e61cb88663ab7b2ee65188d41ae81b08b692cd50291a336a0e9c297f028b80
-DIST kdeplasma-addons-5.23.5.tar.xz 628596 BLAKE2B ee2b96a9fb2b2ec9625ff9ac96086a80ea99798e53a886ae55a5eb2f389ff81e5daba750677f3cdb9a0c5dd934e23806af6d3309f845dfe5f197edcdaf69d582 SHA512 7ff015eca9ce0500ad41547eb3831cff036af3480bfc1e1366330db42d366a0ca3e36453399068384c86418723e1e86e44dffbaf9fb607cc8d7299789fd39fec
+DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
+DIST kdeplasma-addons-5.25.2.tar.xz 657952 BLAKE2B bf81211228869d615ca0ec755d61d03947e81e175e252d3b3b35dfb19d1524ee13346b16b2094d91b73312ba756f62086460ab1399939ef190877406ddc64d3b SHA512 9a4707c567b339a2b8916252318a567997abd54864f13187d0ed3e71178f0dafb82631a2dbc6fbdc0d4547378589a7be0984f19be1c5b745d9ea06216c0b1bc9
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.23.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
index 28a9864b5456..a5195e5682e3 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.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"
@@ -54,6 +54,10 @@ RDEPEND="${DEPEND}
>=kde-plasma/plasma-workspace-${PVCUT}:5
"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package share KF5Purpose)
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild
index 5e90d7ee55a1..a3695f4c18c8 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org optfeature
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="share webengine"
RESTRICT="test" # bug 727846
@@ -41,7 +41,6 @@ DEPEND="
>=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
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index ac6ea122ea74..6db83600ba03 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
-DIST kgamma5-5.23.4.tar.xz 83136 BLAKE2B acf93b0c21cfbd21fcc5113dd28a45bd041c30a18c0cc492e5913f8e2b06df4a3268b64fab75af2c6ef3136fb4f05723f6089ae18454246aea2497f25e3eb5c7 SHA512 bfc36ca07b39dd6af1bbf7c09f1648f18d09bcf43946b97ff1f6f8344a50bcb1c04b8440448d77a0b5c89abec675cd5fed4dce1adc71b92cb1ae76159ad59c07
-DIST kgamma5-5.23.5.tar.xz 83092 BLAKE2B 165c94368be591bd1ca01a0ca97795ef66326ab7bf0b5f1419766b3cd855bd0a09a061215f2528f63cf09cf882d659b1b00bfef92fe163fe7ac55caaefb9bbff SHA512 05941dc2ffdc3b60fb356649e5f7eb94e2ab3f3acf929be2474f0930b31dd8ab6584cb453f40abe38b1321a24e75d6360aaca661f08c40cab7211b7403e07edb
+DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f
+DIST kgamma5-5.25.2.tar.xz 84240 BLAKE2B d8d4713fbe011070ae5735004f0b84b83ddbacce51c3a609b1bb56dc8a89dff3b85adb600354337961845437ab83922265eca151c1f8835a1bb93e44a10da95f SHA512 c57647bd0cc57057feddef920d1438b38124ab5e26805e7020315a847fe39c1031963318ca8848b10cf243da8415f0b542218d9d496bd78a9b914e8c4a6bdab1
diff --git a/kde-plasma/kgamma/kgamma-5.23.4.ebuild b/kde-plasma/kgamma/kgamma-5.24.5.ebuild
index 6f284e55c58c..30f59eedc23c 100644
--- a/kde-plasma/kgamma/kgamma-5.23.4.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/kgamma/kgamma-5.23.5.ebuild b/kde-plasma/kgamma/kgamma-5.25.2.ebuild
index d199ffe05c66..747adda8e22e 100644
--- a/kde-plasma/kgamma/kgamma-5.23.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.25.2.ebuild
@@ -5,16 +5,16 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
KDE_ORG_NAME="${PN}5"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Screen gamma values kcontrol module"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 38ba76c17b86..2e6c1e2e61e1 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
-DIST khotkeys-5.23.4.tar.xz 1851476 BLAKE2B 065fca99c6071a2537f1fc595063cbacfbbe5ade7d6db1a5c8f59f536e28d2311484d2e31bd7800c9ecb1fef41612fba84464c5bf21a9993f3bec52e7840b7f6 SHA512 34394d3d3c81b9018ddac2ceda5d354d82017d0ae6d6b56e19388a9dc698c1796a4490281008237584488522e153b1b33a5fe70cc4dc2423afdcc7d2e45c04a4
-DIST khotkeys-5.23.5.tar.xz 1851148 BLAKE2B 8986f66f85b7c00d70df841c3092b10baf53d543cb5fc9d449665a6d0643041adb5d1e15b73186652ee639a9504bc5765a0135a83da5674390c7f1a75237510c SHA512 d8474ab086d74e629d82ae99b88fc35965272da84cb6ba49e2de42816888dc5a1b89f4ade1490ebdb380285433bef13164ec1a69ab22e4d49e137d442cfb5d70
+DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876
+DIST khotkeys-5.25.2.tar.xz 1831608 BLAKE2B 8fcadc953fd09166f54ac167e7022039a031eecc3f64774975cd198aec4dfb6e46cfc6609c489e631516b0e6aa759624445fa5fa5a0017b8809a78ea3a40ca52 SHA512 021e548b590a9c1cc9ba65719fb118cc6c5e6902c428333d58ab79d62535d7317ebcc05760c45a95a9e1e064395802c8e225724e7e4601d3af9e4913e1c5694c
diff --git a/kde-plasma/khotkeys/khotkeys-5.23.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
index 95f1414f8e4a..09d090616a7d 100644
--- a/kde-plasma/khotkeys/khotkeys-5.23.4.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
diff --git a/kde-plasma/khotkeys/khotkeys-5.23.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.25.2.ebuild
index 6853729735c7..7dadedfd8bd1 100644
--- a/kde-plasma/khotkeys/khotkeys-5.23.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.25.2.ebuild
@@ -4,16 +4,16 @@
EAPI=8
ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma workspace hotkey module"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index c6e2103afef0..df1b5b6ee78e 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.23.4.tar.xz 1153160 BLAKE2B 8273d69e6e548f5b2b7bc95eca7d9fac204f6dcc1a3f26a1b496da926b241e11c20fa047f449255e3e6d31c61056d44e2b89301c0e6b9851312fb53bcda58962 SHA512 c3fb598ef27dc696d3763b5ca982b17d521999c5ebaa00484dfac120f1eeafaa41adc1694bc6f0cc96388eb56e83b015c80bc94a54af334d5e643730ad4485ae
-DIST kinfocenter-5.23.5.tar.xz 1152396 BLAKE2B f30af8e32a43079cd87b52e5d8180ca58f8d5743fa2f26afbc4f7cf70bbb2260929f7bfc0907d03320ff29fd2440968f14fa8185832052194390bd4581a085e1 SHA512 9cb25087587f3b469178424ee991b1832bed23cabcdfe2fc515fb1824ba618ee0cc7e5cd270f9ca348f90ceac68f5758d0c7d690cc1ae29b5c136995d7a2e684
+DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883
+DIST kinfocenter-5.25.2.tar.xz 730812 BLAKE2B b006cf585f8dfec29cf5cf37f64f23d14e5bffeaca0a8e9a32ef12fe42a8786c5859070ec07cbbd13e8f7f0bc664ae3de05007893bf5dd5b78d8bcba281bdb63 SHA512 163cc8f501f6c91109bbd5f3b324a5224b47fa81c0b4664da671849799b76ad0dced78d9f9a18d1248bad381f95b8095a90eeafc6ca487d46905621ef5c363f2
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
deleted file mode 100644
index 101c2ca7de15..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-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 ) )"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
- >=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/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
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=kde-plasma/systemsettings-${PVCUT}:5
-"
-
-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
-}
-
-src_test() {
- local myctestargs=(
- -E "smbmountmodeltest"
- )
- ecm_src_test
-}
-
-src_install() {
- ecm_src_install
-
- # TODO: Make this fully obsolete by /etc/os-release
- insinto /etc/xdg
- doins "${FILESDIR}"/kcm-about-distrorc
-
- insinto /usr/share/${PN}
- doins "${DISTDIR}"/glogo-small.png
-}
-
-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
- ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
index 771923518700..b08d48776b71 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
@@ -4,7 +4,7 @@
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
@@ -15,10 +15,8 @@ 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 +X"
-
-REQUIRED_USE="opengl? ( X )"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE="gles2-only usb"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -31,21 +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 )
- X? ( x11-libs/libX11 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -56,18 +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 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
}
@@ -90,5 +71,8 @@ pkg_postinst() {
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.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.25.2.ebuild
index 6ff1dc3660ad..33ceeed36b27 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org optfeature
DESCRIPTION="Utility providing information about the computer hardware"
@@ -15,10 +15,8 @@ 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 ) )"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+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 3dcd42499ca4..4f831686e7a5 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
-DIST kmenuedit-5.23.4.tar.xz 900584 BLAKE2B 7a41049a0f996db3d80172a874c2cb48c03db27cf5f88c5556e479d2e786d19368138b19eef02f45d05fd3300122998527a8c765863ef2f5afcc5136e366adb8 SHA512 a1b8ca7ae80a44b95f01765eab302d2afbcaf78e45417bfb3d5959030f9af2fde8f153d21dd9cfb6d67858767fe7e3ec7ddae757885ff32e13f5cf5067ef3c5f
-DIST kmenuedit-5.23.5.tar.xz 900464 BLAKE2B ea2838af50e82abf6b25f4ae7a5761b116af321483949d7f820a761ac485fe672eef660f1b56892dbc8b7b74dde719e3bcb7bfa343cf7f4476b5d809e58becb9 SHA512 d0c60d7dc2372661c8032ae3d3cf120a217886105b9277040c3ca614edede3894f47716e942eadb4aca3412e34466a2605e82f55d577ffa714cce301f2f89eb4
+DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759
+DIST kmenuedit-5.25.2.tar.xz 904148 BLAKE2B 24eb956bc39f996db241902ff3cdc59648a2553e44345aaee84e18d24900693c008f0ed337afa8d78a00fa138de86cb996b2b7daf450f1b06e00d20370edb061 SHA512 cdee11da03f1b4ddc30e105cca24c0268e041c01796db454740b21fc9567c4670b4399d39c6f23abf441ff09f6abf3c658e01de44bbf07ec052ec962657db798
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
index d919dd508b3d..ec4bfa6adfbb 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.23.4.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/kmenuedit/kmenuedit-5.23.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.25.2.ebuild
index 372999f567a7..9b9df22b874e 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.23.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.25.2.ebuild
@@ -4,8 +4,8 @@
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma menu editor"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="
@@ -33,6 +33,7 @@ RDEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 63d8b2d65655..b5e348ecd4dd 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
-DIST kscreen-5.23.4.tar.xz 134104 BLAKE2B 9de998665a825733fb3f17daeb1b0fd74a1703b384c0100c46779e1d0c074c79b01f512ae92eebbbcd8ef6ba258644108e2814fdeed74306e0221d850cdce0f6 SHA512 e7d8fe6caa394012fa876cf7dd41900617af6aa8efd48b2645483d1864e8a8c422a64f8d5d92b64a7bf6e851846ec728cb10b1c650098cffa6d93a772853b3b5
-DIST kscreen-5.23.5.tar.xz 133864 BLAKE2B 376b00bb2de899f51cf1a2b4e41a375b0554e0d7b41d5ac1db7133b2b5928075a51edf42c2d48b40c82bc17e02b4fa5d584d46db2ce5aeaabc38327ee73a1c13 SHA512 66f980f33f74a419f697dabec70d6ac0ef5b4d660a9b5cf50eb362050b6961b19f8614926ba1997915e6b9d9f1b5e61194f33078270f5fed50d23b4ddf6dd2b9
+DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97
+DIST kscreen-5.25.2.tar.xz 142956 BLAKE2B b1c14a95eb8780549baa3134c34e3519a482ec1c83fee265bf3847a5eda681c20ea6c6dc38da0af0a7bae499c4013903b8d0cee3e75621d8c117de6316d06561 SHA512 377580c04a1f6765c921dfc421b569434c976daf043bfcbaafad6006336e8de45d6340872f1bf8de9f55e40077f6eda50cd913b37f470d2568a278766086891f
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-fix-kded-xcb-resources-leak.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
new file mode 100644
index 000000000000..ecba1664c51c
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
@@ -0,0 +1,61 @@
+From 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk@gmail.com>
+Date: Sun, 29 May 2022 23:33:55 +0300
+Subject: [PATCH] X11: fix kded xcb resource leak
+
+This fixes commit 579358f501ae978aa527a25eb3ef9dd42557db46
+
+XOpenDisplay() internally calls xcb_connect(), creating a new XCB client
+connection. This means that on every KScreen configuration change event
+the kded5 process creates a new connection until XCB runs into the hard
+limit of 256 of clients, leading to the dreaded "Maximum number of
+clients reached" error.
+
+Re-use the display from QX11Info instead of calling XOpenDisplay().
+
+BUG: 453280
+
+
+(cherry picked from commit 0270a49328aa70b14dd08e2ed5a425ca3f8e4fd5)
+---
+ kded/daemon.cpp | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/kded/daemon.cpp b/kded/daemon.cpp
+index e8ed4ac..443d98d 100644
+--- a/kded/daemon.cpp
++++ b/kded/daemon.cpp
+@@ -361,6 +361,14 @@ void KScreenDaemon::alignX11TouchScreen()
+ if (qGuiApp->platformName() != QStringLiteral("xcb")) {
+ return;
+ }
++ auto *display = QX11Info::display();
++ if (!display) {
++ return;
++ }
++ auto *connection = QX11Info::connection();
++ if (!connection) {
++ return;
++ }
+
+ const QRect totalRect(QPoint(0, 0), m_monitoredConfig->data()->screen()->currentSize());
+ QRect internalOutputRect;
+@@ -411,15 +419,6 @@ void KScreenDaemon::alignX11TouchScreen()
+ break;
+ }
+
+- auto *display = XOpenDisplay(nullptr);
+- if (!display) {
+- return;
+- }
+- auto *connection = QX11Info::connection();
+- if (!connection) {
+- return;
+- }
+-
+ auto getAtom = [](xcb_connection_t *connection, const char *name) {
+ auto cookie = xcb_intern_atom(connection, true, strlen(name), name);
+ auto reply = xcb_intern_atom_reply(connection, cookie, nullptr);
+--
+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.23.4.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
index 0f5a369f667b..f4e86614ad8d 100644
--- a/kde-plasma/kscreen/kscreen-5.23.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.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,3 +44,10 @@ 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"
+ "${FILESDIR}/${P}-fix-kded-xcb-resources-leak.patch" # KDE-bug 453280
+)
diff --git a/kde-plasma/kscreen/kscreen-5.23.5.ebuild b/kde-plasma/kscreen/kscreen-5.25.2.ebuild
index 6a6e69c4e411..4bfa5020633f 100644
--- a/kde-plasma/kscreen/kscreen-5.23.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma screen management"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
# bug #580440, last checked 5.6.3
@@ -39,6 +39,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-plasma/libkscreen-${PVCUT}:5
+ x11-libs/libX11
"
RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 9c41da112820..82a735d015b6 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,2 @@
-DIST kscreenlocker-5.23.4.tar.xz 117720 BLAKE2B 9b4178915b9d2fa33ea308b49417e4a2a33495054dddc8a0e8a3eb7b6465b81a8ba1116323b3e9392f192b0449287e0ff37624ebdb3311cf3423fb649c46d462 SHA512 a043cca755d266548bac5a10cdc812f7c1476d1a95f4ae17c475a4d6b74a3d2b2f2e67373e4c3df3d5299c3013394abe7fc8e7d79353f1d14073a06f4f6794bd
-DIST kscreenlocker-5.23.5.tar.xz 117656 BLAKE2B ac7b90165383cc66af21a026b7cf6ddf7aeb04b3aceaccec8d12eeeb8af1b2d296200929a2118d7b6c0b3079db125baa60903a86d9111e0957e3784b4c9ad913 SHA512 1f2a9ffb61de664e4b0ccda0f162fe96936ff476271e906498434c9818a63405d687f3fd4c69baa8a98e470d4a085a874f10e2d37987d7b17b474757c89326d2
+DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83
+DIST kscreenlocker-5.25.2.tar.xz 112824 BLAKE2B c500de1ac83f26f4e282965df68fb7a78679ac3500abd01559c899c759d061db165dbc63ff9f8e0e3c9220aa46b61bb41ff736b4a401092bbaf6e2f5e37a3c07 SHA512 0a56ca34e62bcc42cbc889d329bdfcff2b4197cf39645da877d63dc5e6a3dd598799604c9e1e2b54cf840c84ada4ad61b533ca725e75a0b7493008235036fb7f
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
index 1e988535cf0f..5ebb504f19e5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
@@ -4,7 +4,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"
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="+pam"
RESTRICT="test"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.25.2.ebuild
index edc1dafc72f9..c7bd795fab4d 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.25.2.ebuild
@@ -1,12 +1,12 @@
-# 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.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org pam
@@ -14,10 +14,10 @@ DESCRIPTION="Library and components for secure lock screen architecture"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+pam"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
-RESTRICT+=" test"
+RESTRICT="test"
COMMON_DEPEND="
dev-libs/wayland
@@ -28,7 +28,7 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5[qml]
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
@@ -43,11 +43,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=kde-plasma/layer-shell-qt-${PVCUT}:5
+ sys-libs/pam
x11-libs/libX11
x11-libs/libXi
x11-libs/libxcb
x11-libs/xcb-util-keysyms
- pam? ( sys-libs/pam )
"
DEPEND="${COMMON_DEPEND}
x11-base/xorg-proto
@@ -65,14 +65,6 @@ src_prepare() {
use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
}
-src_configure() {
- local mycmakeargs=(
- -DPAM_REQUIRED=$(usex pam)
- $(cmake_use_find_package pam PAM)
- )
- ecm_src_configure
-}
-
src_test() {
# requires running environment
local myctestargs=(
@@ -84,11 +76,6 @@ src_test() {
src_install() {
ecm_src_install
- if use pam; then
- newpamd "${FILESDIR}/kde.pam" kde
- newpamd "${FILESDIR}/kde-np.pam" kde-np
- else
- chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
- chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
- fi
+ newpamd "${FILESDIR}/kde.pam" kde
+ newpamd "${FILESDIR}/kde-np.pam" kde-np
}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 0640f7041210..74102c584bd3 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
-DIST ksshaskpass-5.23.4.tar.xz 24072 BLAKE2B 559b49d49b18968a09a52b94b0e894c9db794a305e11d6507dce0860d2dd1851ec4801d630a1a8389d206823931670305e35daad81fd9da69aad7d5a29db8893 SHA512 1fc973dbb2a385dc6471f6928cd61d33ce91bbd414f8e2ce65e2d6e149828963675a8c4140bd968adeebf8bdf449cb92c1415f4963869eb9db5b9cc0125edb88
-DIST ksshaskpass-5.23.5.tar.xz 24068 BLAKE2B 42b366d66690e0bc2a0bd1abf78fc9ded0f62c71b3abd512601805ca05828449808ff87bed3dbd3cb2e421d8b50b794c207def51a73e5c0a2a53b79a51e64953 SHA512 e1bf158cc199406648afae537c73178aa5230a108371cb0d4d150849c16201d225a863c5154d52ab5b09a947671a2d91ae33dcb227d9a28c31a4d4d4f404c817
+DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457
+DIST ksshaskpass-5.25.2.tar.xz 24908 BLAKE2B 3103df99571277a9b2dbff8426e2d62a48f6fdc281bc22041edac173c3dc75cab28cb9ef67a6a46de7a3e27031c48a530ade23da278021a90f7c1e3b4bdc69d5 SHA512 1ac15dba4a6263a45d9a5468029b57405764702fa4facc8f3eebf9c09f051e60cfa9cbe6236f10d0890a0e331e14d901a0ed78f09fe69f53718aec94f9be5afa
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
index e181be3cca85..e198cd959e39 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.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/ksshaskpass/ksshaskpass-5.23.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.25.2.ebuild
index 3370fc96efc1..99b8cf6579dd 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.23.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.25.2.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
index 34a165e4c311..ec8ad40f2c55 100644
--- a/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="lm-sensors"
DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
deleted file mode 100644
index f5af6757b0ad..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-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
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="lm-sensors"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package lm-sensors Sensors)
- )
- ecm_src_configure
-}
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index f1b5dbe95dd1..1e5886215314 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,2 +1,2 @@
-DIST ksystemstats-5.23.4.tar.xz 90636 BLAKE2B f03214ad13f155795438f02e667dcffbb47ce5ec94955349c89a869bae56a3c0f30fc895cf192e98ecef88608bbef9916f7193dd1ee900f13c0be5bc1407ffe2 SHA512 8570c39053556a61489db8c4004a52902593be1dff41d56ecf86aae105f2591b5c5a6ec2f60526ef3f5df74eb98d0655d5a4e2f4adfe7439a9f4aca886a46a03
-DIST ksystemstats-5.23.5.tar.xz 90616 BLAKE2B 51c6774ac4072423c424ffbde706aeedbcfc9a8e3f0fa56d70e64eb7ec50667358c32fe736f00b89fa16b25acafde0399c690e93cd310b2576dd01829ce5b897 SHA512 12d7e6d4a5cb0d62f3224ade404a863c7aa0fd1b5d1f754e595f0cbfdda1fe1397cff3b11e4cc991a66a2310bb19a18466e1fc181b04c2e11b7e9525b627d4ee
+DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969
+DIST ksystemstats-5.25.2.tar.xz 98556 BLAKE2B 78a377e8e697250b7c4bfb0d1931e7c49751b467d5d524ba3a96c44ff719768adfbf8c6c6db4b6babdb81914bcf77d1bd3905338a08e1778d00e303795a50320 SHA512 893e2c9d1c9b46e054e10e974c82522bcfa9b978724447940606964aa4e90d97245327c8157383f4731cc439b616899c2d49f25ad2f96420e23f8d760810e9e5
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
index c9fe385b900b..84530f541465 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.23.4.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/ksystemstats/ksystemstats-5.23.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild
index 12ea7c6a2f6c..02e68e7de73e 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.23.5.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild
@@ -5,9 +5,9 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,7 +15,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="networkmanager"
DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index b624d7810bcc..962833f39e8a 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-pam-5.23.4.tar.xz 20116 BLAKE2B a18c9b8de493c068ffae6310631c39b0bf8691c8ed8c923c51544d7ab72d9d8f3a917638b59f22953113cb6e4fb3a0687021ab25ff7484b33b2f837c076179d7 SHA512 256e33b63ffeab99b5d1758baec794abbc0d838b338341461b179a5ac80f8ee91a85987677cd33ad25f449a85b9959f92c7cc18dca46fd319577203659e2727f
-DIST kwallet-pam-5.23.5.tar.xz 20128 BLAKE2B 8c6aab56cce55f750981d9bdf2c0b9daf9855d64fd69d406828c426c588f80a042761db795b754f1c0e02d28fd4946f7a26f03d66db029223f2775c3279714b5 SHA512 d7f876c6ede1719fa0d7886fd4f79ff52d8d62b175e52552bbc587ecd5464812eb19c875c51e64ab557af4668446a4b3838b76637555604239f3e314a605d18b
+DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740
+DIST kwallet-pam-5.25.2.tar.xz 20524 BLAKE2B 0b2fce85cd54ff7f6583c2d21bfdde8aece8fcd26b47405e524501e06375742ba0db107f03161d6b498090e270c5e9b7813b2336edb947f5f93dd796f97c6b24 SHA512 58c145850a0adabe69875a62f2354d7dc4744d2ef30b05e011e168b75e260333cd4e3d8fa1ae48a1a541c121add22a34d87d6bb74780b6105c7bfa042e841a4b
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
index da2cc6159515..8ddb3f24688e 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.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/kwallet-pam/kwallet-pam-5.23.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.25.2.ebuild
index 646a78d29e8d..510f5681057b 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.23.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.25.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
inherit ecm kde.org
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index db30430828d5..f0e68c6cd76f 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-integration-5.23.4.tar.xz 24184 BLAKE2B 2b6c6d525976daacb4df3970f0dde3754d8220b847f34a353e8a08f12457790d34357c4e62c19ed3919cbe14996b135273e262a4d129ab7f9dd90311fdee9eee SHA512 681724524831eb63c014c5eda79fd41aae4b9f66badc094d312948ba44aee82fd294042978c4475a1db30380fefb4c80b324e769b4bd26d81ba02944d54b104a
-DIST kwayland-integration-5.23.5.tar.xz 24188 BLAKE2B 7e6e4b842a9751539a709a452e8081ce615ec960965bac42a03aa2b685c0815dfebf996dd485d433d9d5797c26bc2d4e5782cd49235eb8936a50bc8f1d5b7d26 SHA512 105ee9df541cd6c167fd3434ac846a065c20b82b85c57a2d465c17256567fc7ee717f2fbae4f6acad61c4a6111f6262a2dc7e3fe23cab0bbb3ae2e478ef4ec19
+DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac
+DIST kwayland-integration-5.25.2.tar.xz 24292 BLAKE2B d8546b2188db05deea3e12263a920916a36806bd244bceed95946f465d27340a62791b1ba3e1daba1a86ed5486b3c5b9fcde0574510231ae4cbe73030fbeb5c3 SHA512 0c7ce622c27f7a51da607442a7f05cef180197a153bf5a4fa16d95bf63665321511a973b93eb68788b0a9a481027de5383a1658539b1af25fef5443053d2b4ce
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
index 95ad37074878..7ea29d557359 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.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-integration/kwayland-integration-5.23.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.25.2.ebuild
index feb880e0e9bd..8602ac348b3b 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT="test" # bug 668872
@@ -32,11 +32,13 @@ DEPEND="
)
>=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
>=kde-frameworks/kwindowsystem-${KFMIN}:5=
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 8d3f7b027f77..6ba5254c5e4a 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,2 +1 @@
-DIST kwayland-server-5.23.4.tar.xz 217608 BLAKE2B 82a8b688a2e146314a667d6d75f835bce3d1b36e2e4fefb5d748da414c7a954e317c5a897166f764325c4f94ce60ff385961ad298d303afeca2bffdc160091c1 SHA512 37864c5943721b8e2fbf14824eab8f9eb8d4a3dc36db0837640ae7f07169f10c253b918481702c6a32b46191a8e27713ea9357bab513f3a711104d798ef5b3a0
-DIST kwayland-server-5.23.5.tar.xz 217524 BLAKE2B 0bc2f6b3137ba9620e7c37fa381fea3037d06cfabb8921ad5417589e6408ebfc603c6a7d73e550b40d7c00f0d8a97f1d946df730358fd6b1758a29183d3779c3 SHA512 bb5305e823d60612f79863de02337855c96de1ba908bf19ad14d0d67c8a199e9f4215faaf5251974cf1f012337a71c444d831a307d112bf5e7fd5b7156c384cd
+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.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.23.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
deleted file mode 100644
index 4c8b8adeac0e..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-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.3.0
- >=dev-libs/wayland-protocols-1.21
-"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
index 689db160e65a..8950843499dd 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.4.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.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-2)
QTMIN=5.15.2
inherit ecm kde.org
@@ -30,7 +30,14 @@ 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-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/kwin/Manifest b/kde-plasma/kwin/Manifest
index 2e3f127f188f..5c7c720078cd 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
-DIST kwin-5.23.4.tar.xz 6341720 BLAKE2B 5dd984c0ff4c62f9d3e4915be5f5423477314a79c4e8fa9a0c306f99be968ca99e61ab9f23ee1b866e171c40c0ad173c96f6de49a28b2eea3a2c62bf5c9a20b3 SHA512 82da0883cf5e900c2278351e815453e25052edfb6534e4be015636dcc2c4051f154c6685eb2542e851d48bf8026bf2b359189864dda336b266208344dcfc851d
-DIST kwin-5.23.5.tar.xz 6347020 BLAKE2B 30a47d572665084aa4569dcfd525ac197648bcc32f2650460803eb592e34dd6e2395be2e491c76b71afe32968bdc2d6aa67dd6f8adb0f776366a7f9f48fb5047 SHA512 45bae86857391b9ce9eca8e75c664914b3b59d0327b670af8eaca6b2bd8008376ecb18347019906c9a9553c8767ea3e05d8ad81d57d4bfb3e91589ae27e3680f
+DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089
+DIST kwin-5.25.2.tar.xz 6622476 BLAKE2B ee659cce95cc2fea3d9b0a2ce8669c107cac60c1844f3c569e002782ea19bd980a999076ad84231215712a8e25a6fa91cf4b979c88b30d09e9c5437a67c39430 SHA512 1a93bcd5d0a6f70aa67e1bb940fa505ffa2c946280e772a1fd061dd3acfaa84a851302cd6c96d30abd10d01dbdc731d884f3a79e590b0c7ff26a44b019cc7ec9
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch b/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
deleted file mode 100644
index cc323e4540f6..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8a0036fdee0eaa7dc5808dfe2dfc516fc32dfd8e Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Thu, 9 Dec 2021 12:51:55 +0100
-Subject: [PATCH] platforms/drm: remove the dpms filter when outputs are added
-
-When the dpms filter is active and an output is hotunplugged, or
-is momentarily detected as hotunplugged, adding a new output should
-remove the dpms filter again.
-
-BUG: 446699
-FIXED-IN: 5.23.5
----
- src/plugins/platforms/drm/drm_backend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/plugins/platforms/drm/drm_backend.cpp
-index a99b720177..d7908f6332 100644
---- a/src/plugins/platforms/drm/drm_backend.cpp
-+++ b/src/plugins/platforms/drm/drm_backend.cpp
-@@ -321,6 +321,7 @@ void DrmBackend::addOutput(DrmAbstractOutput *o)
- primaryGpu()->removeVirtualOutput(m_placeHolderOutput);
- m_placeHolderOutput = nullptr;
- }
-+ checkOutputsAreOn();
- }
-
- void DrmBackend::removeOutput(DrmAbstractOutput *o)
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
deleted file mode 100644
index 5abcfa49969c..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8accc777a5b3ab1e53341f1838ed636652dc1221 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 13 Dec 2021 12:53:32 +0200
-Subject: [PATCH] Fix memory leak in some plasma components
-
-A few plasma components cache QSGTexture. Those components rely on
-texture references going away with QSGNode users. However, with the
-current tear down logic, OffscreenQuickView won't destroy any paint
-nodes.
-
-Destroy QQuickRenderControl before QQuickWindow to ensure that are no
-paint nodes left alive after OffscreenQuickView.
-
-BUG: 444429
-BUG: 444381
-BUG: 444077
-BUG: 444306
-(cherry picked from commit 64f2cdf9ed290a1fb7c2bf41753613078eb023c4)
----
- src/libkwineffects/kwineffectquickview.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/libkwineffects/kwineffectquickview.cpp b/src/libkwineffects/kwineffectquickview.cpp
-index ca5a025729..14be1e1b25 100644
---- a/src/libkwineffects/kwineffectquickview.cpp
-+++ b/src/libkwineffects/kwineffectquickview.cpp
-@@ -160,13 +160,15 @@ EffectQuickView::EffectQuickView(QObject *parent, QWindow *renderWindow, ExportM
- EffectQuickView::~EffectQuickView()
- {
- if (d->m_glcontext) {
-- d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
- // close the view whilst we have an active GL context
-- delete d->m_view;
-- d->m_view = nullptr;
-- d->m_renderControl->invalidate();
-- d->m_glcontext->doneCurrent();
-+ d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
- }
-+
-+ delete d->m_renderControl; // Always delete render control first.
-+ d->m_renderControl = nullptr;
-+
-+ delete d->m_view;
-+ d->m_view = nullptr;
- }
-
- bool EffectQuickView::automaticRepaint() const
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch b/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
deleted file mode 100644
index 6ec6a59cd59f..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fd8d01d9892f12c48a82c6e2ab675396bf6ec113 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Sun, 5 Dec 2021 18:24:35 +0200
-Subject: [PATCH] scripting: Fix type of KWinComponents.Workspace
-
-Currently, the workspace.clients property doesn't work in declarative
-scripts because wrong workspace wrapper is used.
-
-
-(cherry picked from commit 29a85e830cdca5ae483b411e942e7a5bf85f6140)
----
- src/scripting/scripting.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
-index b901db7455..929c94afab 100644
---- a/src/scripting/scripting.cpp
-+++ b/src/scripting/scripting.cpp
-@@ -650,10 +650,10 @@ void KWin::Scripting::init()
- qmlRegisterType<ScriptingModels::V3::ClientModel>("org.kde.kwin", 3, 0, "ClientModel");
- qmlRegisterType<ScriptingModels::V3::ClientFilterModel>("org.kde.kwin", 3, 0, "ClientFilterModel");
-
-- qmlRegisterSingletonType<QtScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
-+ qmlRegisterSingletonType<DeclarativeScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
- Q_UNUSED(qmlEngine)
- Q_UNUSED(jsEngine)
-- return new QtScriptWorkspaceWrapper();
-+ return new DeclarativeScriptWorkspaceWrapper();
- });
-
- qmlRegisterType<KWin::AbstractClient>();
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch b/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
deleted file mode 100644
index 7846681ed528..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 6a84b9454c869a16c2fa5fd49a8fac4a9497f30f Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 7 Dec 2021 09:32:33 +0200
-Subject: [PATCH] wayland: Resize the client to last requested client size if
- decoration is destroyed
-
-If the decoration is destroyed before the window is mapped, kwin can
-respond with a configure event that has 0x0 size. New tests check that
-problematic case.
-
-BUG: 444962
-(cherry picked from commit 9cc80d7468c92a2800daf98319e626e022ff1045)
----
- autotests/integration/xdgshellclient_test.cpp | 48 +++++++++++++++++++
- src/abstract_client.cpp | 3 +-
- 2 files changed, 50 insertions(+), 1 deletion(-)
-
-diff --git a/autotests/integration/xdgshellclient_test.cpp b/autotests/integration/xdgshellclient_test.cpp
-index c00e4ebb2d..eabed754dd 100644
---- a/autotests/integration/xdgshellclient_test.cpp
-+++ b/autotests/integration/xdgshellclient_test.cpp
-@@ -104,6 +104,8 @@ private Q_SLOTS:
- void testPointerInputTransform();
- void testReentrantSetFrameGeometry();
- void testDoubleMaximize();
-+ void testMaximizeAndChangeDecorationModeAfterInitialCommit();
-+ void testFullScreenAndChangeDecorationModeAfterInitialCommit();
- };
-
- void TestXdgShellClient::testXdgWindowReactive()
-@@ -1839,5 +1841,51 @@ void TestXdgShellClient::testMaximizeFull()
- QVERIFY(Test::waitForWindowDestroyed(client));
- }
-
-+void TestXdgShellClient::testMaximizeAndChangeDecorationModeAfterInitialCommit()
-+{
-+ // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
-+ // many don't do it. They initialize the surface after the first commit.
-+ // This test verifies that the client will receive a configure event with correct size
-+ // if an xdg-toplevel surface is set maximized and decoration mode changes after initial commit.
-+
-+ QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
-+ QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
-+ QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
-+ QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
-+ QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
-+
-+ // Request maximized mode and set decoration mode, i.e. perform late initialization.
-+ shellSurface->set_maximized();
-+ decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
-+
-+ // The compositor will respond with a new configure event, which should contain maximized state.
-+ QVERIFY(surfaceConfigureRequestedSpy.wait());
-+ QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
-+ QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Maximized);
-+}
-+
-+void TestXdgShellClient::testFullScreenAndChangeDecorationModeAfterInitialCommit()
-+{
-+ // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
-+ // many don't do it. They initialize the surface after the first commit.
-+ // This test verifies that the client will receive a configure event with correct size
-+ // if an xdg-toplevel surface is set fullscreen and decoration mode changes after initial commit.
-+
-+ QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
-+ QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
-+ QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
-+ QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
-+ QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
-+
-+ // Request fullscreen mode and set decoration mode, i.e. perform late initialization.
-+ shellSurface->set_fullscreen(nullptr);
-+ decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
-+
-+ // The compositor will respond with a new configure event, which should contain fullscreen state.
-+ QVERIFY(surfaceConfigureRequestedSpy.wait());
-+ QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
-+ QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Fullscreen);
-+}
-+
- WAYLANDTEST_MAIN(TestXdgShellClient)
- #include "xdgshellclient_test.moc"
-diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
-index 79c079109a..95576de0b1 100644
---- a/src/abstract_client.cpp
-+++ b/src/abstract_client.cpp
-@@ -2361,8 +2361,9 @@ void AbstractClient::createDecoration(const QRect &oldGeometry)
-
- void AbstractClient::destroyDecoration()
- {
-+ const QSize clientSize = frameSizeToClientSize(moveResizeGeometry().size());
- setDecoration(nullptr);
-- resize(clientSizeToFrameSize(clientSize()));
-+ resize(clientSize);
- }
-
- void AbstractClient::setDecoration(KDecoration2::Decoration *decoration)
---
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
deleted file mode 100644
index a80348be3562..000000000000
--- a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 77b678c522cce0e8e7b39087f74e2ac591cd28d0 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Sun, 12 Dec 2021 15:16:28 +0100
-Subject: [PATCH] XDGShellClient: Protect from invalid frameGeometry on
- updateDecoration
-
-When updating window decoration do not try to restore the previous frameGeometry
-if it was invalid.
-
-This fixes the case when applying a `noBorder=true` rule on a newly created
-client would set it to a minimal window size
-
-Targeted at 5.23 only, since this codepath is being reworked for 5.24
-
-BUG: 445140
-FIXED-IN: 5.23.5
----
- src/xdgshellclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
-index b4427b8cf7..75c4031498 100644
---- a/src/xdgshellclient.cpp
-+++ b/src/xdgshellclient.cpp
-@@ -637,7 +637,7 @@ void XdgToplevelClient::updateDecoration(bool check_workspace_pos, bool force)
- scheduleConfigure();
- }
- updateShadow();
-- if (check_workspace_pos) {
-+ if (check_workspace_pos && oldFrameGeometry.isValid()) {
- const QRect oldGeometryRestore = geometryRestore();
- setGeometryRestore(frameGeometry());
- checkWorkspacePosition(oldFrameGeometry, oldClientGeometry);
---
-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-fix-plasmashell-crash-1.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-1.patch
new file mode 100644
index 000000000000..46b6f0ad9c71
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-1.patch
@@ -0,0 +1,307 @@
+From 4c3195270d6c8e1da8c3e2e3abe5aae75d5bf3c2 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Fri, 26 Nov 2021 12:03:14 +0200
+Subject: [PATCH] Ensure that Toplevel::output() stays always in sync with
+ geometry
+
+Currently, if geometry updates are blocked, the Toplevel.output property
+won't be updated. On the other hand, it's reasonable to use the output
+property instead of manually looking up the output in window management
+code, e.g. Workspace::clientArea().
+
+In other words, using the Toplevel.output property is like walking on a
+mine field, things can blow up. You can't use Toplevel.output even if it
+makes perfect sense.
+
+This change ensures that Toplevel.output property is always kept in sync
+with the frame geometry. Unfortunately, this means that the output
+property no longer can be updated when the frameGeometryChanged() signal
+is emitted. It has to be done in moveResizeInternal() method.
+
+BUG: 448064
+
+(cherry picked from 510a41eeb89f51843405fa0258c852ab06d05bb8)
+
+Part-of: <https://invent.kde.org/plasma/kwin/-/merge_requests/2448>
+---
+ src/abstract_client.cpp | 3 ---
+ src/events.cpp | 1 +
+ src/internal_client.cpp | 6 ++++++
+ src/toplevel.cpp | 17 -----------------
+ src/toplevel.h | 10 ++--------
+ src/unmanaged.cpp | 6 ++++++
+ src/unmanaged.h | 1 +
+ src/waylandclient.cpp | 6 ++++++
+ src/x11client.cpp | 7 +++++++
+ src/x11client.h | 1 +
+ 10 files changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
+index 0714b9ac3f..ddff11e53c 100644
+--- a/src/abstract_client.cpp
++++ b/src/abstract_client.cpp
+@@ -63,8 +63,6 @@ AbstractClient::AbstractClient()
+ {
+ connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::moveResizedChanged);
+ connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::moveResizedChanged);
+- connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::removeCheckOutputConnection);
+- connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::setupCheckOutputConnection);
+
+ connect(this, &AbstractClient::windowShown, this, &AbstractClient::hiddenChanged);
+ connect(this, &AbstractClient::windowHidden, this, &AbstractClient::hiddenChanged);
+@@ -1011,7 +1009,6 @@ void AbstractClient::finishInteractiveMoveResize(bool cancel)
+ if (cancel) {
+ moveResize(initialInteractiveMoveResizeGeometry());
+ }
+- checkOutput(); // needs to be done because clientFinishUserMovedResized has not yet re-activated online alignment
+ if (output() != interactiveMoveResizeStartOutput()) {
+ workspace()->sendClientToOutput(this, output()); // checks rule validity
+ if (isFullScreen() || maximizeMode() != MaximizeRestore) {
+diff --git a/src/events.cpp b/src/events.cpp
+index b9bb9bbd36..a22960f0d0 100644
+--- a/src/events.cpp
++++ b/src/events.cpp
+@@ -1261,6 +1261,7 @@ void Unmanaged::configureNotifyEvent(xcb_configure_notify_event_t *e)
+ m_clientGeometry = newgeom;
+ m_frameGeometry = newgeom;
+ m_bufferGeometry = newgeom;
++ checkOutput();
+ Q_EMIT bufferGeometryChanged(this, old);
+ Q_EMIT clientGeometryChanged(this, old);
+ Q_EMIT frameGeometryChanged(this, old);
+diff --git a/src/internal_client.cpp b/src/internal_client.cpp
+index 3be51ff27b..b4c9250fd3 100644
+--- a/src/internal_client.cpp
++++ b/src/internal_client.cpp
+@@ -10,6 +10,7 @@
+ #include "internal_client.h"
+ #include "decorations/decorationbridge.h"
+ #include "deleted.h"
++#include "platform.h"
+ #include "surfaceitem.h"
+ #include "workspace.h"
+
+@@ -477,6 +478,7 @@ void InternalClient::commitGeometry(const QRect &rect)
+ // The client geometry and the buffer geometry are the same.
+ const QRect oldClientGeometry = m_clientGeometry;
+ const QRect oldFrameGeometry = m_frameGeometry;
++ const AbstractOutput *oldOutput = m_output;
+
+ m_clientGeometry = frameRectToClientRect(rect);
+ m_frameGeometry = rect;
+@@ -486,6 +488,7 @@ void InternalClient::commitGeometry(const QRect &rect)
+ return;
+ }
+
++ m_output = kwinApp()->platform()->outputAt(rect.center());
+ syncGeometryToInternalWindow();
+
+ if (oldClientGeometry != m_clientGeometry) {
+@@ -495,6 +498,9 @@ void InternalClient::commitGeometry(const QRect &rect)
+ if (oldFrameGeometry != m_frameGeometry) {
+ Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
+ }
++ if (oldOutput != m_output) {
++ Q_EMIT screenChanged();
++ }
+ Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
+ }
+
+diff --git a/src/toplevel.cpp b/src/toplevel.cpp
+index 698f6998e5..ff216835c4 100644
+--- a/src/toplevel.cpp
++++ b/src/toplevel.cpp
+@@ -47,7 +47,6 @@ Toplevel::Toplevel()
+ , m_skipCloseAnimation(false)
+ {
+ connect(screens(), &Screens::changed, this, &Toplevel::screenChanged);
+- setupCheckOutputConnection();
+ connect(this, &Toplevel::bufferGeometryChanged, this, &Toplevel::inputTransformationChanged);
+
+ // Only for compatibility reasons, drop in the next major release.
+@@ -379,22 +378,6 @@ void Toplevel::deleteEffectWindow()
+ effect_window = nullptr;
+ }
+
+-void Toplevel::checkOutput()
+-{
+- setOutput(kwinApp()->platform()->outputAt(frameGeometry().center()));
+-}
+-
+-void Toplevel::setupCheckOutputConnection()
+-{
+- connect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput);
+- checkOutput();
+-}
+-
+-void Toplevel::removeCheckOutputConnection()
+-{
+- disconnect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput);
+-}
+-
+ int Toplevel::screen() const
+ {
+ return kwinApp()->platform()->enabledOutputs().indexOf(m_output);
+diff --git a/src/toplevel.h b/src/toplevel.h
+index f6b5dd4e61..3309647eb4 100644
+--- a/src/toplevel.h
++++ b/src/toplevel.h
+@@ -636,13 +636,6 @@ Q_SIGNALS:
+ void visibleGeometryChanged();
+
+ protected Q_SLOTS:
+- /**
+- * Checks whether the screen number for this Toplevel changed and updates if needed.
+- * Any method changing the geometry of the Toplevel should call this method.
+- */
+- void checkOutput();
+- void setupCheckOutputConnection();
+- void removeCheckOutputConnection();
+ void setReadyForPainting();
+
+ protected:
+@@ -673,6 +666,8 @@ protected:
+ void deleteShadow();
+ void deleteEffectWindow();
+ void setDepth(int depth);
++
++ AbstractOutput *m_output = nullptr;
+ QRect m_frameGeometry;
+ QRect m_clientGeometry;
+ QRect m_bufferGeometry;
+@@ -700,7 +695,6 @@ private:
+ QRegion opaque_region;
+ mutable QRegion m_shapeRegion;
+ mutable bool m_shapeRegionIsValid = false;
+- AbstractOutput *m_output = nullptr;
+ bool m_skipCloseAnimation;
+ quint32 m_pendingSurfaceId = 0;
+ QPointer<KWaylandServer::SurfaceInterface> m_surface;
+diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp
+index de3caa303d..3164813a75 100644
+--- a/src/unmanaged.cpp
++++ b/src/unmanaged.cpp
+@@ -12,6 +12,7 @@
+ #include "workspace.h"
+ #include "effects.h"
+ #include "deleted.h"
++#include "platform.h"
+ #include "surfaceitem_x11.h"
+ #include "utils/common.h"
+
+@@ -206,6 +207,11 @@ QWindow *Unmanaged::findInternalWindow() const
+ return nullptr;
+ }
+
++void Unmanaged::checkOutput()
++{
++ setOutput(kwinApp()->platform()->outputAt(frameGeometry().center()));
++}
++
+ void Unmanaged::damageNotifyEvent()
+ {
+ Q_ASSERT(kwinApp()->operationMode() == Application::OperationModeX11);
+diff --git a/src/unmanaged.h b/src/unmanaged.h
+index e874fc1724..fa543eb0b8 100644
+--- a/src/unmanaged.h
++++ b/src/unmanaged.h
+@@ -45,6 +45,7 @@ private:
+ void configureNotifyEvent(xcb_configure_notify_event_t *e);
+ void damageNotifyEvent();
+ QWindow *findInternalWindow() const;
++ void checkOutput();
+ void associate();
+ void initialize();
+ bool m_outline = false;
+diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp
+index 39d6ea22bc..9d8070c7f8 100644
+--- a/src/waylandclient.cpp
++++ b/src/waylandclient.cpp
+@@ -7,6 +7,7 @@
+ */
+
+ #include "waylandclient.h"
++#include "platform.h"
+ #include "screens.h"
+ #include "wayland_server.h"
+ #include "workspace.h"
+@@ -289,6 +290,7 @@ void WaylandClient::updateGeometry(const QRect &rect)
+ const QRect oldClientGeometry = m_clientGeometry;
+ const QRect oldFrameGeometry = m_frameGeometry;
+ const QRect oldBufferGeometry = m_bufferGeometry;
++ const AbstractOutput *oldOutput = m_output;
+
+ m_clientGeometry = frameRectToClientRect(rect);
+ m_frameGeometry = rect;
+@@ -310,6 +312,7 @@ void WaylandClient::updateGeometry(const QRect &rect)
+ return;
+ }
+
++ m_output = kwinApp()->platform()->outputAt(rect.center());
+ updateWindowRules(Rules::Position | Rules::Size);
+
+ if (changedGeometries & WaylandGeometryBuffer) {
+@@ -321,6 +324,9 @@ void WaylandClient::updateGeometry(const QRect &rect)
+ if (changedGeometries & WaylandGeometryFrame) {
+ Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
+ }
++ if (oldOutput != m_output) {
++ Q_EMIT screenChanged();
++ }
+ Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
+ }
+
+diff --git a/src/x11client.cpp b/src/x11client.cpp
+index ce275fff1b..d7ed823128 100644
+--- a/src/x11client.cpp
++++ b/src/x11client.cpp
+@@ -4062,6 +4062,8 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
+ m_lastClientGeometry == m_clientGeometry) {
+ return;
+ }
++
++ m_output = kwinApp()->platform()->outputAt(frameGeometry.center());
+ if (areGeometryUpdatesBlocked()) {
+ setPendingMoveResizeMode(mode);
+ return;
+@@ -4070,6 +4072,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
+ const QRect oldBufferGeometry = m_lastBufferGeometry;
+ const QRect oldFrameGeometry = m_lastFrameGeometry;
+ const QRect oldClientGeometry = m_lastClientGeometry;
++ const AbstractOutput *oldOutput = m_lastOutput;
+
+ updateServerGeometry();
+ updateWindowRules(Rules::Position|Rules::Size);
+@@ -4077,6 +4080,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
+ m_lastBufferGeometry = m_bufferGeometry;
+ m_lastFrameGeometry = m_frameGeometry;
+ m_lastClientGeometry = m_clientGeometry;
++ m_lastOutput = m_output;
+
+ if (isActive()) {
+ workspace()->setActiveOutput(output());
+@@ -4092,6 +4096,9 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
+ if (oldFrameGeometry != m_frameGeometry) {
+ Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
+ }
++ if (oldOutput != m_output) {
++ Q_EMIT screenChanged();
++ }
+ Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
+ }
+
+diff --git a/src/x11client.h b/src/x11client.h
+index b523044d3d..adb8b0e8df 100644
+--- a/src/x11client.h
++++ b/src/x11client.h
+@@ -524,6 +524,7 @@ private:
+ QMetaObject::Connection m_edgeGeometryTrackingConnection;
+
+ QMargins m_clientFrameExtents;
++ AbstractOutput *m_lastOutput = nullptr;
+ QRect m_lastBufferGeometry;
+ QRect m_lastFrameGeometry;
+ QRect m_lastClientGeometry;
+--
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch
new file mode 100644
index 000000000000..026efdf9465b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch
@@ -0,0 +1,35 @@
+From a8477c1cf7acbf3358c85e53b236150dd43b4640 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 14 Apr 2022 18:48:56 +0200
+Subject: [PATCH] toplevel: set valid output in the constructor
+
+This makes it less easy to cause crashes and fixes some segfaults.
+
+BUG: 452433
+BUG: 448064
+
+(cherry picked from commit e48a5c0535f01dc380449ba8481c869ff23e5558)
+
+Tested-by: Merge Service <https://invent.kde.org/plasma/kwin/-/merge_requests/2448>
+Part-of: <https://invent.kde.org/plasma/kwin/-/merge_requests/2448>
+---
+ src/toplevel.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/toplevel.cpp b/src/toplevel.cpp
+index ff216835c4..5d3d7a5dde 100644
+--- a/src/toplevel.cpp
++++ b/src/toplevel.cpp
+@@ -34,7 +34,8 @@ namespace KWin
+ {
+
+ Toplevel::Toplevel()
+- : m_visual(XCB_NONE)
++ : m_output(workspace()->activeOutput())
++ , m_visual(XCB_NONE)
+ , bit_depth(24)
+ , info(nullptr)
+ , ready_for_painting(false)
+--
+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/files/kwin-5.24.5-update-device-outputName.patch b/kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch
new file mode 100644
index 000000000000..d1dbb3fb9bb8
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch
@@ -0,0 +1,32 @@
+From 1b96d21507a3b6b0a9ac6eac424d4e4db5602839 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Wed, 18 May 2022 13:34:45 +0200
+Subject: [PATCH] Update device outputName when setting output
+
+BUG:451279
+FIXED-IN:5.25.0
+
+
+(cherry picked from commit d3a37aa9aef58fbaedcef77d2797c22a015dc9c0)
+---
+ src/backends/libinput/device.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/backends/libinput/device.cpp b/src/backends/libinput/device.cpp
+index f247b66d74..30f51aca3c 100644
+--- a/src/backends/libinput/device.cpp
++++ b/src/backends/libinput/device.cpp
+@@ -668,8 +668,10 @@ void Device::setOutput(AbstractOutput *output)
+ {
+ m_output = output;
+ if (m_output) {
++ m_outputName = output->name();
+ writeEntry(ConfigKey::OutputName, output->name());
+ } else {
++ m_outputName = QString();
+ writeEntry(ConfigKey::OutputName, QString());
+ }
+ Q_EMIT outputNameChanged();
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.23.4-r2.ebuild b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
deleted file mode 100644
index 8b40bded6cad..000000000000
--- a/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 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
-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.14
- >=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/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/wayland-protocols-1.19
- >=dev-qt/qtwayland-${QTMIN}:5
- )
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
- "${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
- "${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
- "${FILESDIR}"/${P}-xdgshell-protect-from-invalid-frameGeometry.patch # KDE-bug 445140
- "${FILESDIR}"/${P}-fix-memory-leak-caching-QSGTexture.patch # KDE-bug 444077 +more
-)
-
-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.23.4-r1.ebuild b/kde-plasma/kwin/kwin-5.24.5-r2.ebuild
index 024d953ad4b3..8e56a5025394 100644
--- a/kde-plasma/kwin/kwin-5.23.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.5-r2.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
@@ -91,16 +92,20 @@ 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}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
- "${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
- "${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
+ "${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
+ "${FILESDIR}"/${P}-update-device-outputName.patch # KDE-bug 451279
+ "${FILESDIR}"/${P}-fix-plasmashell-crash-{1,2}.patch # KDE-bugs 448064, 452433
)
src_prepare() {
diff --git a/kde-plasma/kwin/kwin-5.23.5.ebuild b/kde-plasma/kwin/kwin-5.25.2.ebuild
index 3bc2182222d7..4b4bb9fd0c9a 100644
--- a/kde-plasma/kwin/kwin-5.23.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.25.2.ebuild
@@ -5,9 +5,9 @@ EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org optfeature
@@ -15,37 +15,38 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
RESTRICT="test"
COMMON_DEPEND="
- >=dev-libs/libinput-1.14
- >=dev-libs/wayland-1.2
+ >=dev-libs/libinput-1.19
+ >=dev-libs/wayland-1.20.0
+ >=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+ >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
+ >=dev-qt/qtwayland-${QTMIN}:5
>=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/kconfig-${KFMIN}:5[qml]
>=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/kitemviews-${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]
@@ -53,18 +54,18 @@ COMMON_DEPEND="
>=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/libglvnd
>=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/libxcvt-0.1.1
>=x11-libs/libxkbcommon-0.7.0
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
@@ -73,10 +74,12 @@ COMMON_DEPEND="
accessibility? ( media-libs/libqaccessibilityclient:5 )
caps? ( sys-libs/libcap )
gles2-only? ( media-libs/mesa[gles2] )
+ lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
screencast? ( >=media-video/pipewire-0.3:= )
"
RDEPEND="${COMMON_DEPEND}
+ !kde-plasma/kwayland-server
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
@@ -87,13 +90,15 @@ RDEPEND="${COMMON_DEPEND}
multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
"
DEPEND="${COMMON_DEPEND}
+ dev-libs/plasma-wayland-protocols
+ >=dev-libs/wayland-protocols-1.25
>=dev-qt/designer-${QTMIN}:5
>=dev-qt/qtconcurrent-${QTMIN}:5
x11-base/xorg-proto
- test? (
- >=dev-libs/wayland-protocols-1.19
- >=dev-qt/qtwayland-${QTMIN}:5
- )
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
@@ -109,8 +114,10 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
$(cmake_use_find_package accessibility QAccessibilityClient)
$(cmake_use_find_package caps Libcap)
+ -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
$(cmake_use_find_package plasma KF5Runner)
)
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 5c6a9ef157a9..d71da9e2cb08 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -9,6 +9,7 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
+ <flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
</use>
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index f42f01c9d727..e59fe40ad01f 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
-DIST kwrited-5.23.4.tar.xz 20552 BLAKE2B 215688884db742bb53bd334120c2488479e74d7dab3ee5f5db0c8392d80ee98a55a143344c8be24909c0a653ab8c7eee69107422bea7d9d8a2ef61313b0c470a SHA512 d1e2561d0598a31fee8b68a271035727645bda964ad01ac5f7c037da726c34c2c6fa9cc8d6f7cd197ed0face59e9e3894727ba336428e325da944a736bda0b42
-DIST kwrited-5.23.5.tar.xz 20552 BLAKE2B 354f4213ccce141a7a484c48b7b8d341549ac71044fc50dd82b6af1ed906e3ebb21482c9d39319fd0b8591375308515d601304bac64338e615bb40df74313ddf SHA512 56bd3f7b8ac3d2f8ccc7be2fcf5254ec247d20a4843d43504327db73623d2236991d78de8190973e8ff277f02be89aa382fb16cc002001a9c80c8d11331b3571
+DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4
+DIST kwrited-5.25.2.tar.xz 21040 BLAKE2B c87c8907e57bf714bb74112c9b047703b3ab1a41476c03c6062411d2695cc3b0b7a78b795870e00d3ebd3d99b6d524b47a0a18779deb26cead729e69aa084051 SHA512 82c7a4997a8e037c6ab4c51cfbbcca7c4a45fd0a2152e00ee0fc6b3424e54ff955dc52ea4adee373fce7c328ceaddf5b12d172cec5fd4979700c1c670f36f614
diff --git a/kde-plasma/kwrited/kwrited-5.23.4.ebuild b/kde-plasma/kwrited/kwrited-5.24.5.ebuild
index cbb84e809f75..7292d7ecfbba 100644
--- a/kde-plasma/kwrited/kwrited-5.23.4.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/kwrited/kwrited-5.23.5.ebuild b/kde-plasma/kwrited/kwrited-5.25.2.ebuild
index 13c82deab5e7..eb0242800003 100644
--- a/kde-plasma/kwrited/kwrited-5.23.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.25.2.ebuild
@@ -3,16 +3,16 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index aeb9ebc767bd..0b05eee488f2 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,2 +1,2 @@
-DIST layer-shell-qt-5.23.4.tar.xz 17764 BLAKE2B 3d5dc8041f5e464756afecfcf1aa81d5a4a3518c607111d4d6ee89b7ea1a065f7a81480be99895c0eb92a7486eb6559088ace2a0fb8b9a74d10a9f18ab6d23c6 SHA512 d605e057e578e5e756537b72bcea434d51c9e4d36952eb891580fb6ef8d132aa41d95ab7530893ca2d977b46172bb2d63febb7282d191c12e73455a69142b7b4
-DIST layer-shell-qt-5.23.5.tar.xz 17772 BLAKE2B e056eb5122bab70931139fc4b90573dce01e42fc50704c46006ebd81cc297c3d2668ad8b2c4273b4168f3b41efed92face67c37b03d449cebf334fb84402791d SHA512 d44ec72093bb1aa3fe4465a8843c78876c1055277779544e4501368b750a8c8c4d6a0ed5ba12883a8ccd71a6c494c0f738b98f22b6165499c9b5671d0d52f300
+DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc
+DIST layer-shell-qt-5.25.2.tar.xz 18336 BLAKE2B 1749a79e1fcca978a0f7d90e6e1f19bbcdebcbeb9d1be8b84efcc12bdbaac1d958d4d0451ca3e9b34d084507ffccd94ff6935a2f6f374131b409f4e3a82aeec5 SHA512 ec0d5aa2382e8da923204f9e53994b4c1db33dfbede481883bb6e249ad89c4a69d293683f943e47dd51b76026242fe736c817fddb0b80df9ea3c2b83a56959be
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
index df2ecbc776a9..3b6ca14f2ea1 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.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/layer-shell-qt/layer-shell-qt-5.23.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.2.ebuild
index f33c4c5e31be..935db61a1c7f 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.2.ebuild
@@ -3,15 +3,15 @@
EAPI=8
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
LICENSE="LGPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
@@ -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 fe573ef03ea4..75105fdb74ff 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
-DIST libkscreen-5.23.4.tar.xz 97936 BLAKE2B 39cf833170ded9e7a94f16593d66a1dfa7865d3cfe23b3de3196664ec9c95a4a0bfd412a269e2007857c275486fda657f33772a9086f48f42c20367f5c789ed4 SHA512 78eb13063f3a26a6ab7cc87862f1f475cdd3b3e5f591ce55146688a11678c768aa2632388582a9137b9d203c57d542d29ad7e6b0f620050ce70156891def0436
-DIST libkscreen-5.23.5.tar.xz 97940 BLAKE2B c2f449c00582ef8017c0cd388532ec969328b9c86f13456f952dea4381aa6179e1186595a320dd6ee9837d9df0d00b34e24c26790bf698f67c3df5f48a75cf4c SHA512 467555bfae1cb8d1948f395362fafe4c556abf8be1d47ee99cde0853533101f6b1332a7883ebae64005315593afd551190127d094fafe5b85703a1fa5e91504d
+DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370
+DIST libkscreen-5.25.2.tar.xz 99968 BLAKE2B ecbd2344c7ac47fc7fbdd82921afa674b4f49c45aa0e3bc71520fb9ccefe8a07318f4a24ab90cdefbd59e7de7afb040d3bf5ca572a42819c61bdffcaa717cdf3 SHA512 ce83139d401cdaecb23f83053e665bc9ab39c661b1849663c6a95de30a463571db45cc3c1ce8fba316c25ed8df22c13ef83d38e6bf92bc2e872aaac161da9988
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
index c42852b8140f..102411807edf 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
@@ -5,7 +5,7 @@ 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"
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE=""
# requires running session
@@ -25,13 +25,15 @@ RDEPEND="
dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
x11-libs/libxcb
"
DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.4.0
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+ dev-util/wayland-scanner
"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.25.2.ebuild
index 985acbfc30fb..99ab6d1853a3 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.25.2.ebuild
@@ -1,13 +1,13 @@
-# 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.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,13 +15,14 @@ DESCRIPTION="Plasma screen management library"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
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 c0051dbc97bf..83b041697c07 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST libksysguard-5.23.4.tar.xz 769308 BLAKE2B 05238556867dc054d4c9bd5eadf6c16db6ffdbb481c93a3efc4e83059da6eea73233723ba273a9e5702a2f00a669f8fd0ed54c4a44bdb8797bbc3bb453a71a84 SHA512 8a6c3f06e5f502e9d45fd3ff58fb1da41bd1581164c5054ce79cf2e34c2ece6df22c3b0ab6d33d74d37a97c36cfa076b3a2e459504ea3d3e48d12058aae48648
-DIST libksysguard-5.23.5.tar.xz 769012 BLAKE2B 6e819d8552f1cbfbc76cda3b29a69d6605716d26bc7a4b69f48aef6f7510e52d606ae7e7b3bfadd7383888b6e7740c5ba41407975a1570f4f2bc653290bf0a57 SHA512 11b1bae5ec8a0897086556f7f93c8dc8899b7ff7737f738366b50c3fe4b1590e486109e2eb71e76c3321fe3b2baa59fe8031219d2c8c53bb37d925df56c72b3a
+DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5
+DIST libksysguard-5.25.2.tar.xz 771300 BLAKE2B a57d186ee436e00b8941ff776c990d9f40012561b001331095e0355a3543efd25f4ae31c5b2d2d2eb268c9507825eddc8c7c4d03dc5c06c91b448ed90ae2d9bd SHA512 2bce6c82393c7d934323bed650a5d95ce00add6509577c404faaa1742ca7ab21d0bfad85c6a035aaf95ba34a21c96372ebac34c9643cce0660032b37fc1b3f4e
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
deleted file mode 100644
index f37fbf60bf81..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 7 Dec 2021 22:23:17 +0100
-Subject: [PATCH] Handle process parent changes in ProcessDataModel
-
-When the PPID of a process changes, it moves around in the model, changing the
-layout. This needs to be announced properly, otherwise users of the model get
-confused, leading to weird behaviour and crashes.
-
-The added code is pretty much a direct copy from ProcessModel.
-
-BUG: 446534
-
-
-(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7)
----
- processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp
-index 172ce7f..f776372 100644
---- a/processcore/process_data_model.cpp
-+++ b/processcore/process_data_model.cpp
-@@ -24,6 +24,8 @@ public:
- Private(ProcessDataModel *q);
- void beginInsertRow(KSysGuard::Process *parent);
- void endInsertRow();
-+ void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent);
-+ void endMoveProcess();
- void beginRemoveRow(KSysGuard::Process *process);
- void endRemoveRow();
-
-@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q)
- connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() {
- endInsertRow();
- });
-+ connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) {
-+ beginMoveProcess(process, new_parent);
-+ });
-+ connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() {
-+ endMoveProcess();
-+ });
- connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) {
- beginRemoveRow(process);
- });
-@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow()
- q->endRemoveRows();
- }
-
-+void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent)
-+{
-+ if (m_flatList)
-+ return; // We don't need to move processes when in simple mode
-+
-+ int current_row = process->parent()->children().indexOf(process);
-+ Q_ASSERT(current_row != -1);
-+ int new_row = new_parent->children().count();
-+ QModelIndex sourceParent = getQModelIndex(process->parent(), 0);
-+ QModelIndex destinationParent = getQModelIndex(new_parent, 0);
-+ q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row);
-+}
-+
-+void ProcessDataModel::Private::endMoveProcess()
-+{
-+ if (m_flatList)
-+ return; // We don't need to move processes when in simple mode
-+
-+ q->endMoveRows();
-+}
-+
- void ProcessDataModel::Private::update()
- {
- Processes::UpdateFlags flags;
---
-GitLab
-
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch
new file mode 100644
index 000000000000..bf81b8bf68eb
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch
@@ -0,0 +1,32 @@
+From 88722b18c92f3a688a69abef9022cbcdcb5163bb Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Fri, 29 Apr 2022 13:59:38 +0200
+Subject: [PATCH] Fall back to power average if input is not available
+
+Some power sensors don't expose a current value most notably amdgpu.
+For those fall back to the average reading if available.
+BUG:445920
+
+
+(cherry picked from commit 7758d202eed28169c031e099e408ea258469e408)
+---
+ systemstats/SensorsFeatureSensor.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/systemstats/SensorsFeatureSensor.cpp b/systemstats/SensorsFeatureSensor.cpp
+index 6c8bdb34..3555115f 100644
+--- a/systemstats/SensorsFeatureSensor.cpp
++++ b/systemstats/SensorsFeatureSensor.cpp
+@@ -95,6 +95,9 @@ makeSensorsFeatureSensor(const QString &id, const sensors_chip_name *const chipN
+ break;
+ case SENSORS_FEATURE_POWER:
+ valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_INPUT);
++ if (!valueFeature) {
++ valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_AVERAGE);
++ }
+ unit = UnitWatt;
+ maximum = getValueOfFirstExisting({SENSORS_SUBFEATURE_POWER_CRIT, SENSORS_SUBFEATURE_POWER_MAX});
+ break;
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch
new file mode 100644
index 000000000000..61b981734fa7
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch
@@ -0,0 +1,35 @@
+From b94b0e11f9c0f718f109f37dad8a889301f3a59a Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Mon, 9 May 2022 19:05:06 +0200
+Subject: [PATCH] Faces: Write preset faceproperties to the right location
+
+When loading presets we expect the faceproperties file to be located in
+"contents/config/" but when writing we are placing it in "contents/"
+which means that custom presets are not loaded properly.
+
+BUG: 450745
+
+
+(cherry picked from commit 05866a594198d8c76814d8cd4eb3e83cc9123c8d)
+---
+ faces/SensorFaceController.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp
+index d3daa87d..21fb2954 100644
+--- a/faces/SensorFaceController.cpp
++++ b/faces/SensorFaceController.cpp
+@@ -938,8 +938,8 @@ void SensorFaceController::savePreset()
+ cg.sync();
+
+ QDir subDir(dir.path());
+- subDir.mkdir(QStringLiteral("contents"));
+- KConfig faceConfig(subDir.path() % QStringLiteral("/contents/faceproperties"));
++ subDir.mkpath(QStringLiteral("contents/config"));
++ KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties"));
+
+ KConfigGroup configGroup(&faceConfig, "Config");
+ configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact));
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch
new file mode 100644
index 000000000000..35bf11ee6431
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch
@@ -0,0 +1,43 @@
+From 0d06f3fdda71e87d70a4ca8d45af6badb3ab4ee1 Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Mon, 9 May 2022 19:08:10 +0200
+Subject: [PATCH] Faces: Do not write resolved sensors to preset file
+
+The three sensor properties of FaceController contain the resolved
+sensors. This means we are not writing group regular expressions to face
+presets but are wiriting only the local sensors that were found for that
+group, pretty much bypassing why we have the groups in the first place.
+The unresolved sensors are only contained in the sensor configuration,
+so read them from there and write that to the preset faceproperties.
+
+
+(cherry picked from commit 1ea0671de11ea51aa2e181deafb70d8da588a2af)
+---
+ faces/SensorFaceController.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp
+index 21fb2954..632b7dd4 100644
+--- a/faces/SensorFaceController.cpp
++++ b/faces/SensorFaceController.cpp
+@@ -942,9 +942,14 @@ void SensorFaceController::savePreset()
+ KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties"));
+
+ KConfigGroup configGroup(&faceConfig, "Config");
+- configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact));
+- configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(highPrioritySensorIds()).toJson(QJsonDocument::Compact));
+- configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(lowPrioritySensorIds()).toJson(QJsonDocument::Compact));
++
++ auto sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("totalSensors"));
++ configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("highPrioritySensorIds"));
++ configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("lowPrioritySensorIds"));
++ configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact));
++ configGroup.writeEntry(QStringLiteral("chartFace"), faceId());
+
+ KConfigGroup colorsGroup(&faceConfig, "SensorColors");
+ d->colorsGroup.copyTo(&colorsGroup);
+--
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
deleted file mode 100644
index 86139aca748a..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 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
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="webengine X"
-
-COMMON_DEPEND="
- dev-libs/libnl:3
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kauth-${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/ki18n-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- net-libs/libpcap
- sys-apps/lm-sensors:=
- sys-libs/libcap
- sys-libs/zlib
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- x11-libs/libXres
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/ksysguard-5.21.90:5
- !<kde-plasma/plasma-workspace-5.18.80:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
- "${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package webengine Qt5WebChannel)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
index 413701ff90e8..664a0d856123 100644
--- a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-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_DESIGNERPLUGIN="true"
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -59,7 +59,11 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.18.80:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.22.80-no-detailed-mem-message.patch
+ "${FILESDIR}"/${P}-fix-missing-gpu-sensors.patch # KDE-bug 445920
+ "${FILESDIR}"/${P}-fix-missing-selfmade-presets-{1,2}.patch # KDE-bug 450745
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild
index 1c6d4a6ce86c..86a4ce117496 100644
--- a/kde-plasma/libksysguard/libksysguard-5.23.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild
@@ -5,8 +5,8 @@ EAPI=8
ECM_DESIGNERPLUGIN="true"
ECM_TEST="true"
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
LICENSE="LGPL-2+"
SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="webengine X"
COMMON_DEPEND="
@@ -26,10 +26,9 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kauth-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5[qml]
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 5a12397eaa43..667c2569dcaf 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105
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.23.4-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
index 73ad0d49376d..14acef8df3b4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.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}"/${PN}-5.23.3-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/libkworkspace/libkworkspace-5.23.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild
index b5d44b5c9ad9..1d79b179c681 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild
@@ -5,16 +5,16 @@ EAPI=8
ECM_TEST="true"
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Workspace library to interact with the Plasma session manager"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="
@@ -37,11 +37,6 @@ DEPEND="${RDEPEND}
S="${S}/${PN}"
-PATCHES=(
- # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
- "${FILESDIR}"/${PN}-5.23.3-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 0160020fbf28..21e6c0f24970 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
-DIST milou-5.23.4.tar.xz 47896 BLAKE2B 76a245f32a0fb8b1d8e6c737a7df594f73a7f420265f80abd6456b31722bb50518999bf7e1ab52ef6f0bea6474896095c7d86cccc07b5292ac86675478a12396 SHA512 84d814af00914acdd0738e331eb64200a40ed4474809bb995a08f0cf7aee57a1de74c887206bdec49e0059860fc07757b1d33f9d7f89c0c410171ad0bfe59a21
-DIST milou-5.23.5.tar.xz 47856 BLAKE2B bc62dda6051536785e459ea421db62b62290fb82dd30c7272b9a6ce39a0ed65ae2c8b1dc76e1be901b8edbb9c13a7c7956a415e902e25afe5810a95531bc3b99 SHA512 bd92f7838305e74e96855e582f7d47f10bd571a308f32d2bfc2620c9255c33f94016f5ed9c3dea4eb90e29062f7e72e5606fcef1aed2781c4f0f0a648ba26e23
+DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c
+DIST milou-5.25.2.tar.xz 48572 BLAKE2B 55d31e4197b9826ff5d1ac670292b72d519c6564510ddca8bb225d6389fff230deed813e8a9acf2befcab132e2237ecd50da954a6ce76e0b749e76bf3a4fe207 SHA512 a9f3a20d6dae3f81f31bc00ad0ae86cf94e8ce28bfcab63ecc50c3bede4b91544d0120c6c83bbd91ddc38770ffc1748b3be73973146e53b6d99c45f04161f14b
diff --git a/kde-plasma/milou/milou-5.23.4.ebuild b/kde-plasma/milou/milou-5.24.5.ebuild
index e747b36bbb89..f74c41e92e5c 100644
--- a/kde-plasma/milou/milou-5.23.4.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/milou/milou-5.23.5.ebuild b/kde-plasma/milou/milou-5.25.2.ebuild
index ad9d40fc213e..92c9742fe8ae 100644
--- a/kde-plasma/milou/milou-5.23.5.ebuild
+++ b/kde-plasma/milou/milou-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Dedicated search application built on top of Baloo"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
LICENSE="GPL-2 LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/oxygen-sounds/Manifest b/kde-plasma/oxygen-sounds/Manifest
new file mode 100644
index 000000000000..cba8db0f45d1
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/Manifest
@@ -0,0 +1 @@
+DIST oxygen-sounds-5.25.2.tar.xz 1896484 BLAKE2B 5a15aef31f3c6474ed119b8c1835a52bb1b410bf08b97fb039ec8df3ef07cc561286b53e172e923fea1340458c84997a3864d810d2245bfcbe0e5f33d1626ef5 SHA512 77df558ce50865ae8da824f1a9b43de1addfc0b9e62756cfb2324930c13bdc5cc3b97df1ee03671310259ca7e77126bf48cbae46876c068a7bd72abf85d78f68
diff --git a/kde-plasma/oxygen-sounds/metadata.xml b/kde-plasma/oxygen-sounds/metadata.xml
new file mode 100644
index 000000000000..d925f2439758
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild
new file mode 100644
index 000000000000..82e1ed8f26aa
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+QTMIN=5.15.4
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen sound theme for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="!<kde-plasma/oxygen-5.24.80"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 7a3671732941..d36d90d5a058 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-5.23.4.tar.xz 4610840 BLAKE2B 25851aafd7fb72169bf7d49b948d7f0bc28974e88dd0d93952c6fffe4a27f105a8050e7917119fa7502b2bf02d9d32e4e0910db56f61780f368656940c25f93b SHA512 2ddeb2c0770592508c5b7ad8b913790dfccb819450bd02a09bea4a1721cee9d4c2ebf8aba20a8db606e4bcaefc6fd24e05f4d7fb45a1e4571a3b5394a70b50b5
-DIST oxygen-5.23.5.tar.xz 4609300 BLAKE2B 296afb12a78cd2bc77d8634a7414ffbca96af19946bf508187c6ea246f610f59a7d09f8bcd488e4215aff362d1b1ce6232ab7c2ca22b76972319eca5fb678f5f SHA512 4909ac5dfc3c13a5a7110eda7e27c44b2f72e81aaf5e8b7c50d4e04955f569f0130695e125820626e51d7d5a783304d4b6d3eaa2e0f81c5e86ad7eb33aef3eb3
+DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2
+DIST oxygen-5.25.2.tar.xz 2723684 BLAKE2B 20a3de08356565dd57f567cc04f4678833bc8910a8a1d7dcc69336727c748e82d541b88d722e2dd02fa817e103bb56c6d3343014e0b48e3cd77a093a7e822a32 SHA512 a7dbd73034fe39260315debddfdbbc3e99a4519907372945f129604d4e8ae9d6643f10e53b1cd4af635609dfe774fdf809be492742b57864d636a6a08ea315db
diff --git a/kde-plasma/oxygen/oxygen-5.23.5.ebuild b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
index 4c93dea5996c..1f0f9efb675b 100644
--- a/kde-plasma/oxygen/oxygen-5.23.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="wayland"
RDEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.23.4.ebuild b/kde-plasma/oxygen/oxygen-5.25.2.ebuild
index 475d9fed008c..ae186f8c427a 100644
--- a/kde-plasma/oxygen/oxygen-5.23.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.25.2.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
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Oxygen visual style for the Plasma desktop"
@@ -13,10 +13,10 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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 0d15d843c4d7..dff7642e695d 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-browser-integration-5.23.4.tar.xz 219640 BLAKE2B bb0659cfeeaa542d3ae054d1d3ca89cea1ecd3d88af076f198b5eaea95aba4aa6e42a511af05b2b4e2e107680fb624030d7ce7ef3b136de5326e0ee210bb74ee SHA512 cd5b4f47081956f1bdde5ea9d79efa8ad38bcb21417ebcd12191f47215dd21f406772502787091b0342c70e052a9fbd652b4ad026a7bba0c7b7675ca137b03ef
-DIST plasma-browser-integration-5.23.5.tar.xz 219624 BLAKE2B 6ad39428b00fcd4c61aed8623a1824f3cf4868f21da8e515c558bdcf23d6b8e069c85046dafc4010fd27ccdea33f4f7141a7438f974b1242fe6275d93cced661 SHA512 bdd0017cb0da44e76b00a478bd573c73e2a425c52e41823ed45345ffb1ebd17aa8005e55ff5657e404dddb31cdb55875137336a464b10cfa468fbb72f918a713
+DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497
+DIST plasma-browser-integration-5.25.2.tar.xz 223220 BLAKE2B 190e34896cc726e613b768652a291626d27d24421b084b8f20706edd28a759fcb2f84f22ba97d153452902a2c544bd5fae1abaf94453e6741a7b81c32edc8b5f SHA512 06804d4c5e4cc1266c2318767c185c6fb014e8942938b7191f65e7f8d36415ffaabe08616435ff0a6496ccc28c7250438941a21ed8655741f1548ce1765f8ff0
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
index 6c78bbdef127..15e44d6aa3de 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.4.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-browser-integration/plasma-browser-integration-5.23.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild
index 6fe141c39dba..0262f123a5d7 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
LICENSE="GPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
@@ -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 a873ef5fb62e..223066121296 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
-DIST plasma-desktop-5.23.4.tar.xz 15796556 BLAKE2B 876d308272bfd395ba3006cf70aa3bd3fc4fead5000cddf49c6be0bdfc95bb171c4dcac23636341766318d0156c7d473b9a8f5f0e37a57ea4e73b4b224b85abc SHA512 afbf8d3f7ca755ec207cda5258329b4f77dc0b26cd735eeb67e266d0937e892dc63172822792ffc7053cd52b9a34253cd4dcd1d1f52b54dd8a80f4dfa31a9f08
-DIST plasma-desktop-5.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
+DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
+DIST plasma-desktop-5.25.2.tar.xz 6279760 BLAKE2B bc17e6dd7f472b1d07802015e20c4a727042179f45be29b2eff9da22e9b81a821d12a3398ef3f5b1dc9228f767112501911b72e6ef65d3a3d4d750949ce44172 SHA512 3459dec46338453f4fc4271753c44a91cf1924eb0eab26d64ebab5bd3070ed1ce5c18154dfae4b20f496ffa492cb3e329958c1f628f1871bac89cc30d049fde4
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.23.4-fix-panel-initial-sizing.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
deleted file mode 100644
index d77187409738..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9f19af95e9699420b057b6ff7e99968faf8948a3 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 3 Dec 2021 16:34:40 +0000
-Subject: [PATCH] containments/panel: Fix initial sizing
-
-Timers for anything that affect layouts are universally wrong.
-
-Ultimately this breaks layouts internal usage of QQmlParserStatus. For
-runtime changes layout internally most relayouting is buffered
-internally till the polish event which is once per frame.
-
-Removing this makes startup faster, less glitchy and more declarative.
-
-
-(cherry picked from commit b2fd1578a0063938a3eda8d8e41f14394b7635f7)
----
- containments/panel/contents/ui/main.qml | 34 ++++++-------------------
- 1 file changed, 8 insertions(+), 26 deletions(-)
-
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index 0a5477476..9b5656acf 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -154,14 +154,12 @@ function checkLastSpacer() {
-
- //BEGIN connections
- Component.onCompleted: {
-- currentLayout.isLayoutHorizontal = isHorizontal
- LayoutManager.plasmoid = plasmoid;
- LayoutManager.root = root;
- LayoutManager.layout = currentLayout;
- LayoutManager.lastSpacer = lastSpacer;
- LayoutManager.marginHighlights = [];
- LayoutManager.restore();
-- containmentSizeSyncTimer.restart();
-
- plasmoid.action("configure").visible = Qt.binding(function() {
- return !plasmoid.immutable;
-@@ -200,7 +198,6 @@ function checkLastSpacer() {
- event.accept(event.proposedAction);
- root.fixedWidth = 0;
- root.fixedHeight = 0;
-- containmentSizeSyncTimer.restart();
- }
-
-
-@@ -215,8 +212,6 @@ function checkLastSpacer() {
- }
-
- Plasmoid.onUserConfiguringChanged: {
-- containmentSizeSyncTimer.restart();
--
- if (plasmoid.immutable) {
- if (dragOverlay) {
- dragOverlay.destroy();
-@@ -245,11 +240,7 @@ function checkLastSpacer() {
- }
- }
-
-- Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
-- Containment.onEditModeChanged: containmentSizeSyncTimer.restart();
--
- onToolBoxChanged: {
-- containmentSizeSyncTimer.restart();
- if (startupTimer.running) {
- startupTimer.restart();
- }
-@@ -478,10 +469,16 @@ function checkLastSpacer() {
-
- GridLayout {
- id: currentLayout
-- property bool isLayoutHorizontal
-+ readonly property bool isLayoutHorizontal: root.isHorizontal
- rowSpacing: PlasmaCore.Units.smallSpacing
- columnSpacing: PlasmaCore.Units.smallSpacing
-
-+ x: (isLayoutHorizontal && root.toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? root.toolBox.width : 0;
-+ y: 0
-+
-+ width: root.width - (isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.width : 0)
-+ height: root.height - (!isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.height : 0)
-+
- Layout.preferredWidth: {
- var width = 0;
- for (var i = 0, length = currentLayout.children.length; i < length; ++i) {
-@@ -505,36 +502,21 @@ function checkLastSpacer() {
- rows: 1
- columns: 1
- //when horizontal layout top-to-bottom, this way it will obey our limit of one row and actually lay out left to right
-- flow: isHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+ flow: isLayoutHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
- layoutDirection: Qt.application.layoutDirection
- }
-
- onWidthChanged: {
-- containmentSizeSyncTimer.restart()
- if (startupTimer.running) {
- startupTimer.restart();
- }
- }
- onHeightChanged: {
-- containmentSizeSyncTimer.restart()
- if (startupTimer.running) {
- startupTimer.restart();
- }
- }
-
-- Timer {
-- id: containmentSizeSyncTimer
-- interval: 150
-- onTriggered: {
-- dndSpacer.parent = root;
-- currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? toolBox.width : 0;
-- currentLayout.y = 0
-- currentLayout.width = root.width - (isHorizontal && toolBox && plasmoid.editMode ? toolBox.width : 0)
-- currentLayout.height = root.height - (!isHorizontal && toolBox && plasmoid.editMode ? toolBox.height : 0)
-- currentLayout.isLayoutHorizontal = isHorizontal
-- }
-- }
--
- //FIXME: I don't see other ways at the moment a way to see when the UI is REALLY ready
- Timer {
- id: startupTimer
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
deleted file mode 100644
index 1c9a2b79e31e..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2131daa05195a2b55f593acf3d323cf4c2a89936 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 2 Dec 2021 20:13:46 -0700
-Subject: [PATCH] kcms/touchpad/applet: Make the popup close on click
-
-BUG: 445982
-FIXED-IN: 5.23.5
-(cherry picked from commit 4cb2de984ab79bc257af0135bf92ea7390d5617f)
----
- .../applet/qml/contents/ui/touchpad.qml | 23 +++++++++++--------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 3f5eb722f..106859c3a 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -56,20 +56,23 @@ Item {
- connectedSources: dataSource.sources
- }
-
-- Plasmoid.compactRepresentation: PlasmaCore.ToolTipArea {
-- id: toolTip
-+ Plasmoid.compactRepresentation: PlasmaCore.IconItem {
-+ implicitWidth: PlasmaCore.Units.iconSizes.small
-+ implicitHeight: PlasmaCore.Units.iconSizes.small
-
-- Layout.minimumWidth: PlasmaCore.Units.iconSizes.small
-- Layout.minimumHeight: Layout.minimumWidth
-+ source: plasmoid.icon
-+ active: parent.containsMouse
-
-- mainText: plasmoid.title
-- subText: plasmoid.toolTipSubText
-+ PlasmaCore.ToolTipArea {
-+ mainText: plasmoid.title
-+ subText: plasmoid.toolTipSubText
-+ }
-
-- PlasmaCore.IconItem {
-+ MouseArea {
- anchors.fill: parent
-- source: plasmoid.icon
-- active: parent.containsMouse
-- enabled: root.hasTouchpad
-+ onClicked: {
-+ plasmoid.expanded = !plasmoid.expanded;
-+ }
- }
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
deleted file mode 100644
index 07d741424005..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aadab772fb81ff3d97c8b5342a8a018f51b2ef60 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 3 Dec 2021 09:36:47 -0700
-Subject: [PATCH] kcms/touchpad/applet: Fix mousearea lookup
-
-(cherry picked from commit f4060c48b264a5054c2ffa795c208910d42bfd42)
----
- kcms/touchpad/applet/qml/contents/ui/touchpad.qml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 106859c3a..aa1034e59 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -61,7 +61,7 @@ Item {
- implicitHeight: PlasmaCore.Units.iconSizes.small
-
- source: plasmoid.icon
-- active: parent.containsMouse
-+ active: mousearea.containsMouse
-
- PlasmaCore.ToolTipArea {
- mainText: plasmoid.title
-@@ -69,6 +69,8 @@ Item {
- }
-
- MouseArea {
-+ id: mousearea
-+
- anchors.fill: parent
- onClicked: {
- plasmoid.expanded = !plasmoid.expanded;
---
-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.23.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index 7a3c7757294a..ae1f627cb572 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -5,7 +5,7 @@ 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"
@@ -17,8 +17,8 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+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,7 +115,6 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/setxkbmap
x11-misc/xdg-user-dirs
kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
"
BDEPEND="virtual/pkgconfig"
@@ -128,11 +125,6 @@ PATCHES=(
src_prepare() {
ecm_src_prepare
- if ! use policykit; then
- ecm_punt_kf_module 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.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild
index dcd98ea5397d..1dffe8ec99b9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild
@@ -1,13 +1,13 @@
-# 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.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org optfeature
@@ -17,8 +17,8 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+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,26 +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
- # 5.23 branch
- "${FILESDIR}"/${P}-fix-panel-initial-sizing.patch
- "${FILESDIR}"/${P}-fix-touchpad-applet-popup-close-on-click.patch # KDE-bug 445982
- "${FILESDIR}"/${P}-fix-touchpad-mousearea-lookup.patch
)
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 8e6cfffcbd93..fd4985e7cc0f 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-disks-5.23.4.tar.xz 87056 BLAKE2B 45f9b9530c0b3502dae2cb5e3e3ae61bde8221d4e37a98ccce6fe5bd482a5a06857fdedf35b64e0c4068eefc2e8d8a4a0956d66c2887430e041d4d93245a964e SHA512 282576a339c82538087988fb2ee8c24a2260c55d11248c6f156cf9e2fcc0de01690139a058f89eef87fda2e0db32dd6293efb250810af603efbdbd6143046262
-DIST plasma-disks-5.23.5.tar.xz 87068 BLAKE2B 4fbea5a057aac3abac145646858543fe312d61d3185c926240b8051d4ee3d14a59c64541c98da6eb9effcbf5d24c406204e0973db853ac59abba7dd267e14497 SHA512 d0b6742b89888765075625d00303635d2a889baecf9a07f3200b0531df54fb148ea4160d5d680ca0501e5d15082c3f41c5aca81a4bbe64b8265a21b85a37a056
+DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe
+DIST plasma-disks-5.25.2.tar.xz 90728 BLAKE2B 14118f0025b8891a2125224743f0312f6a906aecec2e2f85113f59096f498af1b85c62f98e4150f43eb2d6705c6b9324ffa9221e77f2e18d3f2397e7e99ba729 SHA512 6ef14ba066b35cf600aa4aaf4519af5309ffb9402f497a73333c953e17d3ad3e32fb9858a60a18bd955305208e0fd3d03bd66e6ac619789dc42edb3ff10ab09d
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.23.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
index 1d12faabf86e..857b4e21996c 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.23.4.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-disks/plasma-disks-5.23.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.25.2.ebuild
index 98d9a5662086..e96d87018b12 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.23.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.25.2.ebuild
@@ -4,8 +4,8 @@
EAPI=8
ECM_HANDBOOK="true"
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 1f7557e90f15..bf8f8421582c 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-firewall-5.23.4.tar.xz 344036 BLAKE2B f4ba093bb21680f76bbb7040b6bdb25c122d38574b1e117fb9966b860d8d68ca19725f2c8656bf187afdea609c1e302b03b876bb4f02d2fe3c8383eb5b626f35 SHA512 2628ce262138e5f7526556d788169e32bb143ca4f63b6dc2fee222ec1772835a6d311e24eb01de73c2fdff52319b74c857990acfe3e960f7025d2c05a3baeac5
-DIST plasma-firewall-5.23.5.tar.xz 344132 BLAKE2B 3277329f223f5b4afe33bcf663b8c9f999a8dda4cab593e04d57fb8b2d6d4d899f76f803ca6cc8e3ef718bbcb09f2cb6d24dbaa1c3abcbfa5e163dd791f066ca SHA512 c18b25ad85f57da80edfc03cd445d317162ad2f952fe7ecd09f43af274798acd965de0f8643a636bee74e3572f0ab66f3db876126009b9c98f486a1cfe0e386e
+DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1
+DIST plasma-firewall-5.25.2.tar.xz 355264 BLAKE2B c574fe5e528146758dd26e029852cd6ea0230e93e997f5eae7555d56997b02aae7bb3c540059d9631f65066921d4357baf8d5c07e3055aeaeed70a4ea5e4cacd SHA512 d462cc1aceed6b6c2aa2d88e7a213fec120e7dad6ea37b61031e38300600a688a1bd4ff0b0a979fe270b69723c891576ce490012975e5fffb55d65a0ca519750
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
index e3822b5cded5..5093bf4f5120 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.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-firewall/plasma-firewall-5.23.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.25.2.ebuild
index 5b21913225e9..64ef809a6ecf 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.23.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.25.2.ebuild
@@ -4,8 +4,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org python-single-r1
DESCRIPTION="Plasma frontend for Firewalld or UFW"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="firewalld +ufw"
REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
@@ -31,7 +31,6 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdeclarative-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
"
RDEPEND="${DEPEND}
${PYTHON_DEPS}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 22611197e64f..44409ea17cea 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-integration-5.23.4.tar.xz 83040 BLAKE2B f557318d1668188bab80194a2f24d34fc15ad1a61febe9c95533e284fdc5b692f52bb05c092ce90a6b3531a92165d075343a634d1ff4ba955765106dfe4bf496 SHA512 cdeb6ba8263baf4af6296ac7717c42f634001bf1c1c57fbadc6b04f7ebd1b8de537f8b495c0fabdcba9a6c33f67596c38a3175ed977b04b262ad4e0e5f267927
-DIST plasma-integration-5.23.5.tar.xz 83100 BLAKE2B b49c8a59dd18798f0f497bca2a739e0e1e580537032efd580ef7143d29a16a50c0ee94fd4166e36c04ee3a6f35c79ee45c2b768e0ad8c4792fcbb5acf79c5372 SHA512 38fa3fecc9aa3022e0bc33e5f27d149d9f28afd552e80b53ee99e895d449a696dba41a529a4490c372dbd940c02f22597a1748e2af5152b735bceb729c4df098
+DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348
+DIST plasma-integration-5.25.2.tar.xz 86096 BLAKE2B 0e24d17a4adccb80df9deb2fc7567a4bfea35feb6ee71e57fc65860b1a0b04b4b7bc3fac0bbef8ee4e2e591992879c56b676b943e415b3db32511bcb34118d63 SHA512 2f51a0cc2e64475eb0e506c05af89e5299f5fa5ecb63d825f79a445db0d0ca7101c5aac0c1fb3737045fc60d3599bb8600002ca06963d79ad30a113679dd5f01
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.23.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
index aa8851b74590..d598ad5a2941 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.23.4.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-integration/plasma-integration-5.23.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.25.2.ebuild
index 9ce7eeed804d..b4abee4133b4 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.23.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -13,16 +13,18 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
LICENSE="LGPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
# requires running kde environment
RESTRICT="test"
-DEPEND="
+COMMON_DEPEND="
+ dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5=[dbus]
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -34,7 +36,6 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -42,7 +43,13 @@ DEPEND="
x11-libs/libXcursor
x11-libs/libxcb
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.6.0
+"
+RDEPEND="${COMMON_DEPEND}
media-fonts/hack
media-fonts/noto
"
+BDEPEND="
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
+"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
index 48918ec47f20..28ee1d06a038 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.23.4.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
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.23.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.25.2.ebuild
index 9a3d27c702c5..76be986707c7 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.23.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.25.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
LICENSE="metapackage"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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 +sddm sdk +smart
@@ -31,14 +31,14 @@ RDEPEND="
>=kde-plasma/ksshaskpass-${PV}:${SLOT}
>=kde-plasma/ksystemstats-${PV}:${SLOT}
>=kde-plasma/kwayland-integration-${PV}:${SLOT}
- >=kde-plasma/kwayland-server-${PV}:${SLOT}
- >=kde-plasma/kwin-${PV}:${SLOT}
+ >=kde-plasma/kwin-${PV}:${SLOT}[lock]
>=kde-plasma/kwrited-${PV}:${SLOT}
>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
>=kde-plasma/libkscreen-${PV}:${SLOT}
>=kde-plasma/libksysguard-${PV}:${SLOT}
>=kde-plasma/milou-${PV}:${SLOT}
>=kde-plasma/oxygen-${PV}:${SLOT}
+ >=kde-plasma/oxygen-sounds-${PV}:${SLOT}
>=kde-plasma/plasma-desktop-${PV}:${SLOT}
>=kde-plasma/plasma-integration-${PV}:${SLOT}
>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 3c7226d629f3..84ab2d899b7a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-nm-5.23.4.tar.xz 924192 BLAKE2B 1aff84f461877bbae09c12011c39620a66cbb0f246fc44fbcd6dafd83889a5e9a0804ba650d30feed6f1ab280ab4bdcc02dda796ad3fe3d4e7c60fb9c194c735 SHA512 3bb656ea8345172c90b7c300ebeff42eb2d252d7750ec0bcc00e2b09e1529fd30c69cfe0fcc4f5cb852098126e4c70769e8f8d1ee5efefd8467e6962d4821572
-DIST plasma-nm-5.23.5.tar.xz 924156 BLAKE2B 5b52aa51a26296fe8599f9746ae1d989f0e0d73d69483881a6a18b81ff737adf9b0e3b968d3e1d0c4777d65612a4675bfc7816dfdd9f9bad23d27249fbaebd65 SHA512 ad28044d06aa8ff6798a0a36fd9b102b03d59859101c1175888dbe5db8f1864b74a6652a00e330658fa26c1215b208484cff4eda5f7a9859587614825c6379bd
+DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8
+DIST plasma-nm-5.25.2.tar.xz 935968 BLAKE2B ce344195a01c43e07dbcc3fa8c7ab0455737e51087bce2af8e60b53e883c3b2dca0878229889bb19a08c435732e79ac49e428d8b201011cbf978388f4dca799d SHA512 5025ac852b890f67f6c8c0da5e2c21a1fc20e25c21c22f9f1dedec09fa31cf7094d1048bf4c0a969d1208e977d48292786b8c04e65076bb03a62481c0a6f66e8
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.23.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
index 554f70c56423..65f17f90aad8 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.23.4.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-nm/plasma-nm-5.23.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild
index ebf9a4588804..2e82872e6502 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.23.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild
@@ -4,16 +4,16 @@
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma applet for NetworkManager"
LICENSE="GPL-2 LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="modemmanager openconnect teamd"
DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index e6377a7c81b3..3585f534cbe4 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-pa-5.23.4.tar.xz 131064 BLAKE2B 227264fb10e6ec800fd584814e2b83b7b07792cb87ee18a7adf4d437ad80bacf5d0e69c85739656b16a474d8c9f60d0e60829118df17d9dfc02618dda66e218e SHA512 8a45734716435f573b326b00c28e6ba9a3d9d365b3e3366a387941feb1beeed210f9f25cb4c10608db09f11157fe8abcae70741738f1d6ccc80d3c3933e13572
-DIST plasma-pa-5.23.5.tar.xz 130888 BLAKE2B f83a55cc2547ac4202c78e5c474d41f4c27dcd0ee9d901ae380c7ac57f36be077dbd384e05485898617798a3f30e2030b2399d4dbeb95a8b4ac1c88d36f26f46 SHA512 c0f14ff3cdd4947c555e1f0d2d4e68537d7a8464b0c0f2809791a20ce671017d3eea57a4e0ebd3790108e7474c6418e471f739b8e65f80e993611605f269a943
+DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1
+DIST plasma-pa-5.25.2.tar.xz 135356 BLAKE2B c1d451cbf3b35110ce424fb6fbc271f27351a7130e93c0502ce26fba2daf5082a812fde44d3bab8a7f01267b62c9b5dfbdd389b0620fffdd9598b8a26fa6d389 SHA512 f7f0dfc99def0221bac2cf74d62ee93ebded3c22f34896a4e074404efca4c559a141865f56ebf2164ee0a7e8862978084640ae520a3f90e438d0481103086586
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.23.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
index 15e9abfde55b..f61ca444d701 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.23.4.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.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.23.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild
index 566c821d04a9..136949386869 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.23.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild
@@ -4,15 +4,15 @@
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index dca3ca53cda5..0c5e2f93c050 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-sdk-5.23.4.tar.xz 276360 BLAKE2B 9b876c5bae76893c076003b6ceb834d26a287b4f11cf0bd2a45f0b8366556164c361b00a36414b202a51b0d20fd87e3e194e657fe7f0b72a10e45afc7385bf7c SHA512 af9485111ea0ddde5840a62c6b8592936298692b75dd7de59d4f214973d02d2cb330a6f419eefef64338052b5ea59fdf066c9ff66086342e70d64268beb4a0b2
-DIST plasma-sdk-5.23.5.tar.xz 276324 BLAKE2B 3fcd495144b8e4f9a8cde0e47ed817f20f2835fd000a9c323a1596e184abc77b3625cd9b611f326dfc3eb8fa3c534f0bd5be74e319b0be3c6700e0554908c2c2 SHA512 ab03ff2b10db3f73e88e856ef905f3b00dafd11fbbbc24f4ad0ae8596ea793eaa806cf30867a3a0a9abb9213b3cc221f2a9c8fc4d0f724f2840aa1bfe2d38f26
+DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8
+DIST plasma-sdk-5.25.2.tar.xz 263684 BLAKE2B 7ce338380c22a547137d8e614a51d748bf6b5dd87cddfebf2e559252763236cca567683f9147bd52cb67ed434487416196be2f0b5789d3ff242a3ac8b4dc94cd SHA512 a3c8fd3616e59242c04e8d02de900455914b51407eb47de40e0ddd9802c6993bffb44fae4944746ecdaf6de47432902184253f2ccc976a78f30b97d48d60631c
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.23.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
index 8c39ca97e09f..305df908068b 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.23.4.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-sdk/plasma-sdk-5.23.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild
index 8110a208dfcc..49e17c91c35e 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.23.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="optional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index b865a86aeed4..85ecb0a1b0e5 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-systemmonitor-5.23.4.tar.xz 144844 BLAKE2B fc0deda7053096218e28f734e27052439f3d1ad12e3e64b71848ad8711427c47c0c2126ab39cce75973a08ba6c43cc8e2266a1a662730e95d1244ac317c82d06 SHA512 45d90129628cca6d4b2837fee589b2ef93529983a35d6e0890058f9f106fc3abce3b7e9cf76ee8061ade0306885be308c083513208a55d047a92ee4687fd84e5
-DIST plasma-systemmonitor-5.23.5.tar.xz 144876 BLAKE2B f424f44b07807360b59718e7894eb95e9832865431f6a875b3c32309ba2ff078c4a40a27268ec756c5465b0fdff6c2856e3f545cb17c7af6edc92305ac5cb83a SHA512 12e723d79917a2410e174c33f3e63018cabcbfc9f6795f82206075b8573f8aeec47b4708151cddd0a2f2cfed67da4743475f00d46a59c0eee03cdedc15e7a657
+DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d
+DIST plasma-systemmonitor-5.25.2.tar.xz 156188 BLAKE2B be381e649431bead26e9d6337493b73ab5a337eead53759e06d070c9883b7b582b3c7f38d18563b37847a518411ce8fdbaea5d1ad116b22355185f519b302c3a SHA512 7aaa5af6b389aba6caa584d86435a2635d4c4439825a0d820b25e69607fa8d1a5141176d25dc2d980572e8544976fb73ca5f2c6e0ad7aa08429bad5f8473360d
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
deleted file mode 100644
index 9257c8b4250f..000000000000
--- a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b18f98fee76104d5be6b871dea330be32863ad27 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Tue, 23 Nov 2021 10:52:11 +0100
-Subject: [PATCH] Add comma separated filtering to ApplicationsTableView
-
-Instead of using ProcessSortFilterModel we can implement in
-the callback of the KSortFilterProxyModel.
-
-
-(cherry picked from commit 364bada0ad5befd560758bad11190b1fd7043b34)
----
- .../contents/ui/ApplicationsTableView.qml | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-index 3f3ed4f..1f2dd36 100644
---- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-+++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-@@ -96,6 +96,14 @@ Table.BaseTableView {
- }
- return true
- }
-+ filterRowCallback: function(row, parent) {
-+ if (filterString.length == 0) {
-+ return true
-+ }
-+ const name = sourceModel.data(sourceModel.index(row, filterKeyColumn, parent), filterRole).toLowerCase()
-+ const parts = filterString.toLowerCase().split(",").map(s => s.trim()).filter(s => s.length > 0)
-+ return parts.some(part => name.includes(part))
-+ }
-
- sortRole: "Value"
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
deleted file mode 100644
index 17505ee73146..000000000000
--- a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 50f6378144ed244b9c1cd3e325ecbe45dd7544d4 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Mon, 22 Nov 2021 12:15:14 +0100
-Subject: [PATCH] ApplicationsTable: Remove unneeded ProcessSortFilterModel
-
-ProcessSortFilterModel handles filtering pids and to which user a process
-belongs over a normal QSortFilterProxyModel. In doing so it also
-sets the filterKeyColumn to nameColumn in findColumns(). Note that the name
-of the name columns of the process and application table is different
-("name" and "appName"), so the filterKeyColumn is also set by ApplicationTableView.
-However this is racey depending on when the binding is evaluated.
-Since we don't need the extra features of the ProcessSortFilterModel we can use
-the existing SortFilterProxyModel in charge of filtering columns (something that
-the ProcessSortFilterModel also did) to also handle the row filtering.
-BUG:445544
-FIXED-IN:5.23.4
-
-
-(cherry picked from commit a96bc99a3650c3bf2e48ab1287dc779dbba87c51)
----
- .../contents/ui/ApplicationsTableView.qml | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-index 38915b3..3f3ed4f 100644
---- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-+++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
-@@ -32,7 +32,7 @@ Table.BaseTableView {
- property alias columnDisplay: displayModel.columnDisplay
- property alias sourceModel: appModel
-
-- property alias filterString: filterProxy.filterString
-+ property alias filterString: sortColumnFilter.filterString
-
- property var selectedApplications: {
- var result = []
-@@ -83,8 +83,9 @@ Table.BaseTableView {
- model: KItemModels.KSortFilterProxyModel {
- id: sortColumnFilter
-
-- sourceModel: filterProxy
--
-+ sourceModel: cacheModel
-+ filterKeyColumn: appModel.nameColumn
-+ filterCaseSensitivity: Qt.CaseInsensitive
- filterColumnCallback: function(column, parent) {
- // Note: This assumes displayModel column == appModel column
- // This may not always hold, but we get incorrect results if we try to
-@@ -99,13 +100,6 @@ Table.BaseTableView {
- sortRole: "Value"
- }
-
-- Table.ProcessSortFilterModel {
-- id: filterProxy
-- sourceModel: cacheModel
-- filterKeyColumn: appModel.nameColumn
-- filterCaseSensitivity: Qt.CaseInsensitive
-- }
--
- Table.ComponentCacheProxyModel {
- id: cacheModel
- sourceModel: displayModel
-@@ -184,7 +178,6 @@ Table.BaseTableView {
- Table.FirstCellDelegate {
- iconName: {
- var index = sortColumnFilter.mapToSource(sortColumnFilter.index(model.row, 0));
-- index = filterProxy.mapToSource(filterProxy.index(index.row, 0));
- index = appModel.index(index.row, appModel.iconColumn)
- return appModel.data(index)
- return ""
---
-GitLab
-
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
index 49d0f0c80879..ed93a083cd93 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
+KFMIN=5.90.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.2.ebuild
index 12fa84166ae2..f5a5a018f691 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.2.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
PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Monitor system sensors, process information and other system resources"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
@@ -40,9 +40,3 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/ksystemstats-${PVCUT}:5
"
-
-PATCHES=(
- # 5.23 branch, KDE-bug 445544
- "${FILESDIR}"/${P}-applications-remove-unneeded-ProcessSortFilterModel.patch
- "${FILESDIR}"/${P}-applications-add-comma-separated-filtering.patch
-)
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 6ec5652219c2..cfb8a2c682e0 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-thunderbolt-5.23.4.tar.xz 65120 BLAKE2B ba143215208b8e0afd2111f74bfeb1e38085906ce36119490cb8b56df739e0a1495ac81b463e0d89df1b2946ef099da3f2da11908b5665dce9a0efa888ee51a7 SHA512 c0180e46cf47da996a2c054c3a860824b13231cabdb6dd14c9885ee9948f432a78ba61d438daba791b7d22010c84663699a5f106293d8484c78ba88add3b7ace
-DIST plasma-thunderbolt-5.23.5.tar.xz 64968 BLAKE2B de989c3d65b7f806657ab9b6cf4df6e8c7c18dce28a3504961b7d5afe94b2effd4928438eb156d364c4f210fd5ac37eec3b3b1a770da33bb81767e3a17f21ba3 SHA512 019858b1060ec00140affcf8c64a78094767ce46224f5ab8507dd0e75dbb47183df6605fc1316863ef84bdef736bfc0ceb9b88dfdcafd0fb6c8d877ebed39b9f
+DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5
+DIST plasma-thunderbolt-5.25.2.tar.xz 67800 BLAKE2B 34ee0aa5338cf6259a3c20c45a6fc98910b481f3b4045b5577bdcbc740e3d5f0f9bf40944347dcceb71dd6fb4c0a061caef75a586d062231cfd8dab718d91daa SHA512 ef8ba3bf89f2e899c7cc0aeaa126e8e218024ed842e35e8893d7d8189738782618ba73d50e08b030d1392c8b2ec9640b27a7e4462670c92b3bcd8b37b59ba9ab
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
index 69f79eb27579..346585e6911a 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.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-thunderbolt/plasma-thunderbolt-5.23.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild
index 5819f29731c3..48406635f8c6 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 2ac995790648..6a0ed5ab0b93 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-vault-5.23.4.tar.xz 176244 BLAKE2B 5f6e62cf1cb291091448d70e97a68079ffc4b4203ad4b63b4fb272f3d58a7e1eeabf5b574f4ad16f00b328a2a011987dc8a58c022c7b8163333b1abe0be44ec4 SHA512 2d6eebe0e5a53fa741cc433ee8529fcffae1aedd2b91fbd8055dc093575e76c3aae85cd5f0f264a1aa26567b2511e8ec2c971511888341f00a8b4d0c7c79505d
-DIST plasma-vault-5.23.5.tar.xz 176288 BLAKE2B c024986a22134f710eee20cf168810f4ca5b08f97abe7788e758629e07021c3292a5dba7b68b2d3b6dd560c06ec2082fa0fde37675d1f6c9902016b169317f37 SHA512 740c727db761e5526567d388b4d3ad01dc0a398ce3c0346e212532fd43eaee2e90c9f9416d9809ed0ed4988cfd4e86714e8162c061f7c33442d422a9f46bfcdc
+DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2
+DIST plasma-vault-5.25.2.tar.xz 178364 BLAKE2B 8cb9a996284e1ea9fe3e1a70db7bfd842b132d41e2cbeb67175ddaf25ace6735c72ed7aa3a5f5cd4afddb0633b2e59c7a929e1cfe43a91e27aadebc91cdb32dd SHA512 d101719042a4adf6e0b96ab182635e83bf9a36e011196b825dce674a80aabe04c39ea9d9f7b177ed6e4ba36f79eff67104c1f1e055bc62579ce0104f5c0caf1d
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.23.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
index f723ef1f5db9..9cce0daf50a1 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.23.4.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-vault/plasma-vault-5.23.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild
index 91c3eaa9d1db..2b6339bbf300 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.23.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Plasma applet and services for creating encrypted vaults"
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
LICENSE="LGPL-3"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="networkmanager"
DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index feefa803413a..f3f1dc3cb73a 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-wallpapers-5.23.4.tar.xz 57049264 BLAKE2B 5f985c42100d04dad02d34885873085f4e3ea1432289362838f66b3bb277fdcadb6d625599158e63a83d5d53f791c26f380a6d783e61a893482221bd01d5e464 SHA512 15e7f3c8d74298c38a9af6e90f686bea4cdf62ab8e515f4b4feb98aaca6af072f4da9ed6c7113ffd1129ea4540a73871aaf4f9ad06d25ee8fcfd3aaff610d9e8
-DIST plasma-workspace-wallpapers-5.23.5.tar.xz 57049508 BLAKE2B cbf8b48e28536fbb56186cb91c0b171ceaa40c5fcfae916f625312da0d00fba36710420790d149f02e416d97df993e6287eef7de3dd278edd27a829344d450c4 SHA512 942baa01552bd8ca127ea00d25851f7f09bb87bf163bb83bcc5d8249fb684c02421f42fa943d4b1524787d4a3af23eb5ddd8cee09e2087a9aba2c3ee09b3f937
+DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873
+DIST plasma-workspace-wallpapers-5.25.2.tar.xz 70524788 BLAKE2B da26e4653cd7df05cbf2788a1af9dc7e8955e2445796402b362a9a7fe651488766535e2b51fdbe99c38ef82e0891fb2070665945e478a76518361288c2ec4870 SHA512 bcecdaeead5a6b0a31f5c31776932e5015b4ada0bf4930952593a553db5842063ce42be1d1553fc0e5f26def5442c85199651374839e9dc76104a599aa7ef236
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
index d776660bca12..862f306fb000 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.4.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-wallpapers/plasma-workspace-wallpapers-5.23.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.2.ebuild
index bceff041c2fa..3a5f3e5403a9 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 5a12397eaa43..667c2569dcaf 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
deleted file mode 100644
index 1153c9f006f1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
-From: ValdikSS ValdikSS <iam@valdikss.org.ru>
-Date: Sun, 5 Dec 2021 15:46:00 +0300
-Subject: [PATCH] Fix Klipper Actions content truncation
-
-Commit f9669af2 introduced a regression with Klipper Actions: it used
-truncated text as a source for the action, which resulted in truncated
-output.
-
-BUG: 444365
-
-
-(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
----
- klipper/urlgrabber.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
-index fb7c0d0a2..185a6a5d6 100644
---- a/klipper/urlgrabber.cpp
-+++ b/klipper/urlgrabber.cpp
-@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
- ClipCommand command = action->command(cmdIdx);
-
- if (command.isEnabled) {
-- QString text(m_myClipItem->text());
-+ QString text(m_myClipItem->mimeData()->text());
- if (m_stripWhiteSpace) {
- text = text.trimmed();
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
deleted file mode 100644
index 29640f8262e6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 08:26:45 +0000
-Subject: [PATCH] [klipper] Use full text for DBus return values
-
-In a recent commit HistoryItem::text() became the visual representation
-of the mimedata; often a truncated string.
-
-mimeData()->text() always returns the full value.
-
-BUG: 446441
-
-
-(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
----
- klipper/klipper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index b090a2409..3b12d1f95 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
- if (item) {
- do {
- if (i-- == 0) {
-- return item->text();
-+ return item->mimeData()->text();
- }
- item = history()->find(item->next_uuid());
- } while (item != history()->first());
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
deleted file mode 100644
index d46f33486785..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Wed, 8 Dec 2021 18:25:36 +0100
-Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
-
-BUG: 439797
-
-
-(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
----
- kcms/lookandfeel/kcm.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
-index 75ce19197..349761aad 100644
---- a/kcms/lookandfeel/kcm.cpp
-+++ b/kcms/lookandfeel/kcm.cpp
-@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
- if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
- removeItemFromModel();
- } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
-- removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ if (!entry.uninstalledFiles().isEmpty()) {
-+ removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ }
- KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
- pkg.setPath(entry.installedFiles().constFirst());
- addKPackageToModel(pkg);
---
-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/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
new file mode 100644
index 000000000000..e605473e3546
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
@@ -0,0 +1,37 @@
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 21 Feb 2022 12:24:56 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec5f0893..b022a20b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
+ )
+
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma
+ if(KF5DocTools_FOUND)
+ add_subdirectory(doc)
+ endif()
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
+--
+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.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
index e2c646f9117d..ff25b6a845ef 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-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="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,13 +126,12 @@ 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
@@ -142,18 +142,25 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/xrdb
x11-apps/xsetroot
!<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
- # 5.23 branch
- "${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
- "${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
- "${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
+ "${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() {
@@ -170,9 +177,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() {
@@ -187,8 +202,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.23.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.2.ebuild
index 0735907874df..fda548de9024 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.2.ebuild
@@ -3,11 +3,11 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
ECM_TEST="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,9 +15,9 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+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,21 +118,21 @@ 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
fontconfig? ( x11-libs/libXrender )
+ test? ( >=dev-libs/wayland-protocols-1.24 )
"
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
@@ -142,13 +143,17 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/xrdb
x11-apps/xsetroot
!<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.24.80-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
)
@@ -166,9 +171,15 @@ 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
}
src_configure() {
@@ -183,8 +194,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 fcf021f6a38a..ad3684f3a302 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST plymouth-kcm-5.23.4.tar.xz 39328 BLAKE2B 3716e19fe0e25e07c723d65e5ec313c4b194720bd4de025f290fb11ed3778fff5372f51c3c8557b3442673fa56062d1aae89a831d376689cfe001a0b47c6aa99 SHA512 1cc3f59758b0adc380101ce6bb01b7daee810b2e00884eb89c8c1e10ecd8134cc5356101c3d0e039297cd10c9c824491e036d2c120e36c7303fa2c4b8c03e32d
-DIST plymouth-kcm-5.23.5.tar.xz 39204 BLAKE2B 916a0710cf84d880ab33d803831adc23d4e9d333e0c42244927ce5a2db5e2160d2230abcbb5ae14f25431626585f830109fa0d2b755d2723f1920e2811cf86e8 SHA512 2ec975b3d725cc8ab76d263cbdbbe93cd7a53f267afcc180f5ea86ad36e2e201982147f051813c8dd3362dcea1491ffba44ce4ad018c29d90ff3532bcaf6b9f3
+DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8
+DIST plymouth-kcm-5.25.2.tar.xz 40012 BLAKE2B c1d8af32289dfa8ef50f74396f23d206dc05500c7b6cecc8af4e9933b7f5d5aacfdc30c91d0b625db24b44380e4b7fa05f76b583d64063e911df6efa6ded7ef6 SHA512 1c4a9a5c2f46744e9fee2e6ca0bd684640dd049b324a3f4bbe93b4c5eb3fe52a590c150e306f392ec4ef24f7f194456d2a91b7710ee1a6da6096b779a7105dd9
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
index 9da6c6887b60..d6268b4f5766 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.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/plymouth-kcm/plymouth-kcm-5.23.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.2.ebuild
index e2118886d242..c01658895a2c 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma control module for Plymouth"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 1e5250f31b84..d904bfd0e949 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.23.4.tar.xz 48124 BLAKE2B efbef00c5361880a45c665daa4ff657bb08242dc96c68dfc86fa52f33af3456c0a5d4f2d9de7e0ae9824ea8561cc39c4551f25b89d726dc3046dc60afc89dc1c SHA512 05f319b4f3a85216d6c29451816ae2e9ca4eb69fe817236a36b1cd482d39abed4a86493cff6c1437b31f862029b38db26015df9e1dd0ef86f23c4d4be8713969
-DIST polkit-kde-agent-1-5.23.5.tar.xz 48100 BLAKE2B d82d009cd2f94078851b51ca5e274d1ccb15a3ee6315ac0c84acf99453742cb5744c64d5a93d2f87bf8aa72bdd6cd7d0689c98c8633af7189268677e08d5c794 SHA512 21a2fdc91a3ed28b4e80a1cb14820eec732c0e923b166d1eafb3e1d5fda7f10548b3757af4dfb48eaf16c17cb7e3758394785665ced48c88bd4f8514a0c70daf
+DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93
+DIST polkit-kde-agent-1-5.25.2.tar.xz 48584 BLAKE2B 9f157ec0b0da1b265d7e933fdc083da8aca4c0b166ca6d72c626b2f20efdd0671be338b8e8d24b96a8a6097dd709feb9536b3984f5d3d570cf119266abb476ef SHA512 b55b845e01041e49892bc36ca76b50342a5c4210e6768c95e5af12bfea819ade774999ec54c7330679599b2e9335eb94be699f50d68b510327dcdc78e1e8c844
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
index 02fe5d2fae86..6d8dd7374950 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.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/polkit-kde-agent/polkit-kde-agent-5.23.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild
index 800bda65f28a..c09922bf9069 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
KDE_ORG_NAME="${PN}-1"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="PolKit agent module for KDE Plasma"
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 811d72388975..8b3d67a29f15 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
-DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
-DIST powerdevil-5.23.5.tar.xz 629528 BLAKE2B cb34fa1a7added039b5fdcd974fdb898a2e6bea0143abce4d0c99d140e1f24cde91fa008be6686fa9dc976411cd6813cc7d124e15247d6a618bf0b2ca1a4499d SHA512 906d4481afee63368d62200a51b3bdfc202c28a5336a135ea161a5389518c92ad66fc2a5f502089d9e189c0b3a9d9ae83c17bde03b2cba680f8954b73624787d
+DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15
+DIST powerdevil-5.25.2.tar.xz 636376 BLAKE2B 0d700e6172b3c91eb9e603acc3a7c0b107ed15e9221445c7aaf4106416619b505f7b11e0ea7c2c5c3a0a2df4716c35626b330572b5d5fd00aa6e77822ef7856b SHA512 6b6a49aaa702a5c482df708eaf8b07b3a7bf787503ab0c40a3d9f60f7a5bc57efb551b7606863804db9fb8791d1d56754fe37f367e48ae8e01ff879defa59edb
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
index 40e0884adb2a..f06590672c3f 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
@@ -4,7 +4,7 @@
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
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.2.ebuild
index 4b2632d141ec..f85798251353 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.25.2.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="Power management for KDE Plasma Shell"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="brightness-control caps +wireless"
DEPEND="
@@ -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
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 7e4eb18cadbe..af8ca26e950d 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST sddm-kcm-5.23.4.tar.xz 77624 BLAKE2B c083efe3ea881a4d06c283ee757d5b5dbbe16cb59e4ff59fb88d0b3afaf96ef9d964d9cc27ee356e3a2509f9e9fa75a3c2d2305b67fd795e6b22ebb3674889c6 SHA512 00a047d08cf71a0793f43cbbe9c8b23678fc1de99250f1a1f4cbe647010761cb68109e2a7ef852e935eb00793af155bade5eecfad4729cad788f597625060b2c
-DIST sddm-kcm-5.23.5.tar.xz 77840 BLAKE2B 671b2306afba05024b1123cb4e4a6bf500d90f75ba940ae04edb80074fe9f30d941137bef4b8c1c3d54440e9fd50d50caa1823fd2212e2be601e86463c7fbae1 SHA512 5690ba75ab476e1aecb831d65e806325669b36efc13d7481c390e6fdbe7b01e9f689b0fdd2742435e1ed35179cc2092df8434f9c14a09d4db85889ef0b514782
+DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15
+DIST sddm-kcm-5.25.2.tar.xz 81928 BLAKE2B c5e100eac9c6fa779141e00f7609fa33192c425e69cd9bf59d12400bb6ef350890af76c0c364005a44cc6ab5dc93b0860f54d4b047dad335dfda712c99cdab52 SHA512 189cd6c451b4c82792c298c4626db956d6a4c1b5b4653901de9bae8c2344ffbc9093ac399b36102536048f861c80aee01365a291ffcfe3cc5eca3f94ddf9512a
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
index ae336a6d350e..362db6a8c3c2 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.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/sddm-kcm/sddm-kcm-5.23.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild
index 4ab4376669d9..327a31ba6ed0 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.23.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit ecm kde.org
DESCRIPTION="KDE Plasma control module for SDDM"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index f3eafd102baa..2a59a8b9f491 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
-DIST systemsettings-5.23.4.tar.xz 203520 BLAKE2B 966a416850e578e567093c3abac8238f2812a50cde2579b90b32437bb79eb2a6dd879bc2b809ef2e9aa925206bfae0a40d7b9542c2164ad894b815acfd9fb941 SHA512 fa4713acd9167285e96783fbd453ee647a99127e45a64b556fd10396b8a27ebacaceedd413b8cf0fb1a7c4f950666c127dc08eb475411b30358d07cf5e558ee5
-DIST systemsettings-5.23.5.tar.xz 203604 BLAKE2B d220f22293561c14e57dd11160d51b19e971135fd55da1f47a54cdf3c356cffb01df706e6161c19d9d6cd0425167721a3b02851bbf29af26e698ec54c81cd403 SHA512 ce8b30d5cb9525572dc2e29b39e8a0098a3f6ff5bc6051240672978dd6867b1835a68c66c6d2335790de50164e632a988992cc46389d926c56ae6aba608589e4
+DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
+DIST systemsettings-5.25.2.tar.xz 207588 BLAKE2B 29c41074458ee5f809448bbe6e49a5623672c92a08ddf57448ae44dcaf199ad4a7797171450b48172b3536cf4f1ed95469d5ee355a619fab39e069678281b1d0 SHA512 16f1e7771ca3025193743126492bcebda5b61373f3ad434efa506ba540d1dd6d5681fc72c89c1a1829f5661831617ed6c9cdf2847dcc34df8d32d218ed99d36e
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.23.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
index f9f2df6ad964..3fd54a2ee7bc 100644
--- a/kde-plasma/systemsettings/systemsettings-5.23.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-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="optional"
-KFMIN=5.86.0
+KFMIN=5.90.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.2
inherit ecm kde.org optfeature
@@ -52,6 +52,11 @@ 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
diff --git a/kde-plasma/systemsettings/systemsettings-5.23.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild
index f6cd2a822ef4..9c2c438cbbef 100644
--- a/kde-plasma/systemsettings/systemsettings-5.23.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild
@@ -4,16 +4,16 @@
EAPI=8
ECM_HANDBOOK="optional"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
>=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
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 1915d3349208..e27c85f5e95b 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.23.4.tar.xz 89468 BLAKE2B 2bdee6d5bee56f61ed8e5592686f2087c9eade48a856d11cd102efaa4c61c4263f0a998c8a57ef74550e4a8b66c3cc04fd5467809b7fb742470ef25470eaf762 SHA512 9749eef9ae1b634e71660e9531eb05c6fffff68fd03eb69da8a7ae6471b6400c8b51795e15c841b2f744d6325fa70c74be5d4cbac5bfa05476e60a333302bb68
-DIST xdg-desktop-portal-kde-5.23.5.tar.xz 89520 BLAKE2B 6ec2b844f64c2e099120ec17e23c42db6b55f40fae4992c9a02cd815bc78337f76209c821980141d7bfd19135058caeefe313fa37ae236865d5f134af3750b47 SHA512 7481be6c3a5adb42e3a9b2c03533de9e956e188f3ce5edd349a65a8d65dd690f5292cdc8431dee71bee089ef8c5a30b5c18925e61658facf6dfed1d332bdaf6e
+DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401
+DIST xdg-desktop-portal-kde-5.25.2.tar.xz 103916 BLAKE2B ae4b405019529645e435456312da5353c0adb2d3ac60ade50216a9d980f0d8dce53a73f39ff96e84e3166b299bb50ec30e51f4ea2a865648dcc8ae9ef65197d1 SHA512 0bc27ec697c99fd467c66baf7c0fc4cd2233052eeb49da355793606423851b4b98c3597ddb66e5cb3827b9d231355cfeec4017e3f47a785111f53a9677ac12ec
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
new file mode 100644
index 000000000000..134f55c900b5
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
@@ -0,0 +1,107 @@
+From cd8275c722aa25dd22353121131c914d3ab3b438 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 28 May 2022 03:36:14 +0200
+Subject: [PATCH] screencast: When closing a session, only close the streams
+ from that session
+
+---
+ src/screencast.cpp | 11 ++++++++---
+ src/session.h | 12 ++++++++++++
+ src/waylandintegration.cpp | 5 +++++
+ src/waylandintegration.h | 1 +
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/screencast.cpp b/src/screencast.cpp
+index 5be6210..84cc4bd 100644
+--- a/src/screencast.cpp
++++ b/src/screencast.cpp
+@@ -68,8 +68,12 @@ uint ScreenCastPortal::CreateSession(const QDBusObjectPath &handle,
+ return 2;
+ }
+
+- connect(session, &Session::closed, []() {
+- WaylandIntegration::stopAllStreaming();
++ connect(session, &Session::closed, [session] {
++ auto screencastSession = qobject_cast<ScreenCastSession *>(session);
++ const auto streams = screencastSession->streams();
++ for (const WaylandIntegration::Stream &stream : streams) {
++ WaylandIntegration::stopStreaming(stream.nodeId);
++ }
+ });
+
+ connect(WaylandIntegration::waylandIntegration(), &WaylandIntegration::WaylandIntegration::streamingStopped, session, &Session::close);
+@@ -169,7 +173,8 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle,
+ return 2;
+ }
+
+- results.insert(QStringLiteral("streams"), QVariant::fromValue(streams));
++ session->setStreams(streams);
++ results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>(streams));
+
+ if (inhibitionsEnabled()) {
+ new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session);
+diff --git a/src/session.h b/src/session.h
+index a42222e..dd05680 100644
+--- a/src/session.h
++++ b/src/session.h
+@@ -14,6 +14,7 @@
+
+ #include "remotedesktop.h"
+ #include "screencast.h"
++#include "waylandintegration.h"
+
+ class Session : public QDBusVirtualObject
+ {
+@@ -62,10 +63,21 @@ public:
+ return SessionType::ScreenCast;
+ }
+
++ WaylandIntegration::Streams streams() const
++ {
++ return m_streams;
++ }
++ void setStreams(const WaylandIntegration::Streams &streams)
++ {
++ m_streams = streams;
++ }
++
+ private:
+ bool m_multipleSources;
+ ScreenCastPortal::CursorModes m_cursorMode;
+ ScreenCastPortal::SourceType m_types;
++
++ WaylandIntegration::Streams m_streams;
+ };
+
+ class RemoteDesktopSession : public ScreenCastSession
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index 9f5a177..e05f73a 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -89,6 +89,11 @@ void WaylandIntegration::stopAllStreaming()
+ globalWaylandIntegration->stopAllStreaming();
+ }
+
++void WaylandIntegration::stopStreaming(uint node)
++{
++ globalWaylandIntegration->stopStreaming(node);
++}
++
+ void WaylandIntegration::requestPointerButtonPress(quint32 linuxButton)
+ {
+ globalWaylandIntegration->requestPointerButtonPress(linuxButton);
+diff --git a/src/waylandintegration.h b/src/waylandintegration.h
+index b8e6a00..784ee12 100644
+--- a/src/waylandintegration.h
++++ b/src/waylandintegration.h
+@@ -131,6 +131,7 @@ void startStreamingInput();
+ Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+ Stream startStreamingWindow(const QMap<int, QVariant> &win);
+ void stopAllStreaming();
++void stopStreaming(uint node);
+
+ void requestPointerButtonPress(quint32 linuxButton);
+ void requestPointerButtonRelease(quint32 linuxButton);
+--
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch
new file mode 100644
index 000000000000..6aa94ccb7f69
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch
@@ -0,0 +1,358 @@
+From 3dbd366516c38d987025623feea18f79c15d72dd Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 30 May 2022 15:42:02 +0200
+Subject: [PATCH] Backport of 5f7fe7482ae3de6e5dabbd2712c283439b0eecac
+
+Since the codebases had diverged over time, I've backported it by hand
+using the same concepts as the forementioned fix, trying to minimise the
+delta with the latest released Plasma 5.24.
+---
+ src/remotedesktop.cpp | 12 ++------
+ src/screencast.cpp | 15 ++++++----
+ src/waylandintegration.cpp | 60 +++++++++++++++-----------------------
+ src/waylandintegration.h | 26 +++++++++++++++--
+ src/waylandintegration_p.h | 15 ++--------
+ 5 files changed, 61 insertions(+), 67 deletions(-)
+
+diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
+index f36def4..9282ff0 100644
+--- a/src/remotedesktop.cpp
++++ b/src/remotedesktop.cpp
+@@ -122,20 +122,14 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
+
+ if (remoteDesktopDialog->exec()) {
+ if (session->screenSharingEnabled()) {
+- if (!WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden)) {
++ auto stream = WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden);
++ if (!stream.isValid()) {
+ return 2;
+ }
+
+ WaylandIntegration::authenticate();
+
+- QVariant streams = WaylandIntegration::streams();
+-
+- if (!streams.isValid()) {
+- qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Pipewire stream is not ready to be streamed";
+- return 2;
+- }
+-
+- results.insert(QStringLiteral("streams"), streams);
++ results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>({stream}));
+ } else {
+ qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Only stream input";
+ WaylandIntegration::startStreamingInput();
+diff --git a/src/screencast.cpp b/src/screencast.cpp
+index 210bbbb..5be6210 100644
+--- a/src/screencast.cpp
++++ b/src/screencast.cpp
+@@ -147,26 +147,29 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle,
+
+ if (screenDialog->exec()) {
+ const auto selectedScreens = screenDialog->selectedScreens();
++ WaylandIntegration::Streams streams;
+ for (quint32 outputid : selectedScreens) {
+- if (!WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode()))) {
++ auto stream = WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode()));
++ if (!stream.isValid()) {
+ return 2;
+ }
++ streams << stream;
+ }
+ const auto selectedWindows = screenDialog->selectedWindows();
+ for (const auto &win : selectedWindows) {
+- if (!WaylandIntegration::startStreamingWindow(win)) {
++ auto stream = WaylandIntegration::startStreamingWindow(win);
++ if (!stream.isValid()) {
+ return 2;
+ }
++ streams << stream;
+ }
+
+- QVariant streams = WaylandIntegration::streams();
+-
+- if (!streams.isValid()) {
++ if (streams.isEmpty()) {
+ qCWarning(XdgDesktopPortalKdeScreenCast) << "Pipewire stream is not ready to be streamed";
+ return 2;
+ }
+
+- results.insert(QStringLiteral("streams"), streams);
++ results.insert(QStringLiteral("streams"), QVariant::fromValue(streams));
+
+ if (inhibitionsEnabled()) {
+ new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session);
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index 44d862a..9f5a177 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -43,7 +43,7 @@ Q_LOGGING_CATEGORY(XdgDesktopPortalKdeWaylandIntegration, "xdp-kde-wayland-integ
+
+ Q_GLOBAL_STATIC(WaylandIntegration::WaylandIntegrationPrivate, globalWaylandIntegration)
+
+-static QDebug operator<<(QDebug dbg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &c)
++static QDebug operator<<(QDebug dbg, const WaylandIntegration::Stream &c)
+ {
+ dbg.nospace() << "Stream(" << c.map << ", " << c.nodeId << ")";
+ return dbg.space();
+@@ -74,12 +74,12 @@ void WaylandIntegration::startStreamingInput()
+ globalWaylandIntegration->startStreamingInput();
+ }
+
+-bool WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
++WaylandIntegration::Stream WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
+ {
+ return globalWaylandIntegration->startStreamingOutput(outputName, mode);
+ }
+
+-bool WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win)
+ {
+ return globalWaylandIntegration->startStreamingWindow(win);
+ }
+@@ -124,11 +124,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::screens()
+ return globalWaylandIntegration->screens();
+ }
+
+-QVariant WaylandIntegration::streams()
+-{
+- return globalWaylandIntegration->streams();
+-}
+-
+ // Thank you kscreen
+ void WaylandIntegration::WaylandOutput::setOutputType(const QString &type)
+ {
+@@ -157,7 +152,9 @@ void WaylandIntegration::WaylandOutput::setOutputType(const QString &type)
+ }
+ }
+
+-const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::WaylandIntegrationPrivate::Stream &stream)
++namespace WaylandIntegration
++{
++const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream)
+ {
+ arg.beginStructure();
+ arg >> stream.nodeId;
+@@ -177,7 +174,7 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::Wa
+ return arg;
+ }
+
+-const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &stream)
++const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream)
+ {
+ arg.beginStructure();
+ arg << stream.nodeId;
+@@ -186,9 +183,7 @@ const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::Wa
+
+ return arg;
+ }
+-
+-Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Stream)
+-Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Streams)
++}
+
+ KWayland::Client::PlasmaWindowManagement *WaylandIntegration::plasmaWindowManagement()
+ {
+@@ -207,8 +202,8 @@ WaylandIntegration::WaylandIntegrationPrivate::WaylandIntegrationPrivate()
+ , m_fakeInput(nullptr)
+ , m_screencasting(nullptr)
+ {
+- qDBusRegisterMetaType<WaylandIntegrationPrivate::Stream>();
+- qDBusRegisterMetaType<WaylandIntegrationPrivate::Streams>();
++ qDBusRegisterMetaType<Stream>();
++ qDBusRegisterMetaType<Streams>();
+ }
+
+ WaylandIntegration::WaylandIntegrationPrivate::~WaylandIntegrationPrivate() = default;
+@@ -228,25 +223,25 @@ void WaylandIntegration::WaylandIntegrationPrivate::startStreamingInput()
+ m_streamInput = true;
+ }
+
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win)
+ {
+ auto uuid = win[KWayland::Client::PlasmaWindowModel::Uuid].toString();
+ return startStreaming(m_screencasting->createWindowStream(uuid, Screencasting::Hidden), {}, win);
+ }
+
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
+ {
+ auto output = m_outputMap.value(outputName).output();
+
+ return startStreaming(m_screencasting->createOutputStream(output.data(), mode), output, {});
+ }
+
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream,
+- QSharedPointer<KWayland::Client::Output> output,
+- const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream,
++ QSharedPointer<KWayland::Client::Output> output,
++ const QMap<int, QVariant> &win)
+ {
+ QEventLoop loop;
+- bool streamReady = false;
++ Stream ret;
+ connect(stream, &ScreencastingStream::failed, this, [&](const QString &error) {
+ qCWarning(XdgDesktopPortalKdeWaylandIntegration) << "failed to start streaming" << stream << error;
+
+@@ -255,30 +250,26 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+ notification->setText(error);
+ notification->setIconName(QStringLiteral("dialog-error"));
+ notification->sendEvent();
+-
+- streamReady = false;
+ loop.quit();
+ });
+ connect(stream, &ScreencastingStream::created, this, [&](uint32_t nodeid) {
+- Stream s;
+- s.stream = stream;
+- s.nodeId = nodeid;
++ ret.stream = stream;
++ ret.nodeId = nodeid;
+ if (output) {
+ m_streamedScreenPosition = output->globalPosition();
+- s.map = {
++ ret.map = {
+ {QLatin1String("size"), output->pixelSize()},
+ {QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Monitor)},
+ };
+ } else {
+- s.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}};
++ ret.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}};
+ }
+- m_streams.append(s);
++ m_streams.append(ret);
+ startStreamingInput();
+
+ connect(stream, &ScreencastingStream::closed, this, [this, nodeid] {
+ stopStreaming(nodeid);
+ });
+- streamReady = true;
+
+ auto item = new KStatusNotifierItem(stream);
+ item->setStandardActionsEnabled(false);
+@@ -303,10 +294,10 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+ QTimer::singleShot(3000, &loop, &QEventLoop::quit);
+ loop.exec();
+
+- return streamReady;
++ return ret;
+ }
+
+-void WaylandIntegration::WaylandIntegrationPrivate::Stream::close()
++void WaylandIntegration::Stream::close()
+ {
+ stream->deleteLater();
+ }
+@@ -390,11 +381,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::WaylandInte
+ return m_outputMap;
+ }
+
+-QVariant WaylandIntegration::WaylandIntegrationPrivate::streams()
+-{
+- return QVariant::fromValue<WaylandIntegrationPrivate::Streams>(m_streams);
+-}
+-
+ void WaylandIntegration::WaylandIntegrationPrivate::authenticate()
+ {
+ if (!m_waylandAuthenticationRequested) {
+diff --git a/src/waylandintegration.h b/src/waylandintegration.h
+index 04319c9..b8e6a00 100644
+--- a/src/waylandintegration.h
++++ b/src/waylandintegration.h
+@@ -9,6 +9,7 @@
+ #ifndef XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+ #define XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+
++#include <QDBusArgument>
+ #include <QObject>
+ #include <QPoint>
+ #include <QSize>
+@@ -28,6 +29,23 @@ class ScreencastingSource;
+
+ namespace WaylandIntegration
+ {
++
++struct Stream {
++ ScreencastingStream *stream = nullptr;
++ uint nodeId;
++ QVariantMap map;
++
++ bool isValid() const
++ {
++ return stream != nullptr;
++ }
++
++ void close();
++};
++typedef QVector<Stream> Streams;
++const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream);
++const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream);
++
+ class WaylandOutput
+ {
+ public:
+@@ -110,8 +128,8 @@ bool isStreamingEnabled();
+ bool isStreamingAvailable();
+
+ void startStreamingInput();
+-bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+-bool startStreamingWindow(const QMap<int, QVariant> &win);
++Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
++Stream startStreamingWindow(const QMap<int, QVariant> &win);
+ void stopAllStreaming();
+
+ void requestPointerButtonPress(quint32 linuxButton);
+@@ -123,7 +141,6 @@ void requestPointerAxisDiscrete(Qt::Orientation axis, qreal delta);
+ void requestKeyboardKeycode(int keycode, bool state);
+
+ QMap<quint32, WaylandOutput> screens();
+-QVariant streams();
+
+ void init();
+
+@@ -132,4 +149,7 @@ KWayland::Client::PlasmaWindowManagement *plasmaWindowManagement();
+ WaylandIntegration *waylandIntegration();
+ }
+
++Q_DECLARE_METATYPE(WaylandIntegration::Stream)
++Q_DECLARE_METATYPE(WaylandIntegration::Streams)
++
+ #endif // XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+diff --git a/src/waylandintegration_p.h b/src/waylandintegration_p.h
+index 220ad3d..e95f6a0 100644
+--- a/src/waylandintegration_p.h
++++ b/src/waylandintegration_p.h
+@@ -53,15 +53,6 @@ private:
+ KWayland::Client::PlasmaWindowManagement *m_windowManagement = nullptr;
+
+ public:
+- struct Stream {
+- ScreencastingStream *stream = nullptr;
+- uint nodeId;
+- QVariantMap map;
+-
+- void close();
+- };
+- typedef QVector<Stream> Streams;
+-
+ void authenticate();
+
+ bool isStreamingEnabled() const;
+@@ -69,9 +60,9 @@ public:
+
+ void startStreamingInput();
+
+- bool startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win);
+- bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+- bool startStreamingWindow(const QMap<int, QVariant> &win);
++ Stream startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win);
++ Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
++ Stream startStreamingWindow(const QMap<int, QVariant> &win);
+ void stopStreaming(uint32_t nodeid);
+ void stopAllStreaming();
+
+--
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch
new file mode 100644
index 000000000000..3c1284108b20
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch
@@ -0,0 +1,28 @@
+From d74e7dce1d333107760a8ae8d2bdd7521d31a09f Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 28 May 2022 03:37:14 +0200
+Subject: [PATCH] screencast: When we stop a stream, do it actively
+
+We were just forgetting about it.
+
+
+(cherry picked from commit aa531bde14a13521f99ae8e44d6e83bc8749d761)
+---
+ src/waylandintegration.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index b1b2d4d..44d862a 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -328,6 +328,7 @@ void WaylandIntegration::WaylandIntegrationPrivate::stopStreaming(uint32_t nodei
+ {
+ for (auto it = m_streams.begin(), itEnd = m_streams.end(); it != itEnd; ++it) {
+ if (it->nodeId == nodeid) {
++ it->close();
+ m_streams.erase(it);
+ break;
+ }
+--
+GitLab
+
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.23.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
index c226021bc7cd..0eb9b4578030 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.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,31 @@ 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"
+
+PATCHES=(
+ "${FILESDIR}/${P}-show-screenshare-notifier-more-prominently.patch" # KDE-bug 452980
+ "${FILESDIR}/${P}-screencast-stop-stream-actively.patch"
+ "${FILESDIR}/${P}-screencast-dont-provide-every-running-stream.patch"
+ "${FILESDIR}/${P}-screencast-close-only-streams-of-closing-session.patch"
+)
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.2.ebuild
index 8edf2c511e37..d7dbec1abe5c 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.2.ebuild
@@ -3,16 +3,16 @@
EAPI=8
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE=""
COMMON_DEPEND="
@@ -21,22 +21,26 @@ 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/kiconthemes-${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-libs/plasma-wayland-protocols-1.7.0
>=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
"
RDEPEND="${COMMON_DEPEND}
+ kde-misc/kio-fuse:5
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 5a12397eaa43..667c2569dcaf 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
+DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
new file mode 100644
index 000000000000..f6e8413e3763
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
@@ -0,0 +1,60 @@
+From a381c7441140e77208c0ed3a8dd45cb61197afd9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Sep 2020 22:34:28 +0200
+Subject: [PATCH] xembed-sni-proxy: Allow standalone build
+
+---
+ xembed-sni-proxy/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt
+index bcc583bfa..41d50d112 100644
+--- a/xembed-sni-proxy/CMakeLists.txt
++++ b/xembed-sni-proxy/CMakeLists.txt
+@@ -1,3 +1,35 @@
++project(xembed-sni-proxy)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_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.89")
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
++ 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(FeatureSummary)
++ include(ECMQtDeclareLoggingCategory)
++ include(ECMConfiguredInstall)
++
++ find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
++ find_package(X11 REQUIRED)
++ find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
++ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
++
++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++else()
++ set(PROJECT_VERSION "5.24.80")
++ set(PROJECT_VERSION_MAJOR 5)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_CAST_FROM_BYTEARRAY)
+@@ -64,3 +96,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+
+ ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+--
+2.34.1
+
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
index f60d32c6774b..4930f2576348 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.4.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
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild
index 80ccf7a7b4f5..a946c9694bb9 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild
@@ -4,17 +4,18 @@
EAPI=8
KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.86.0
+KFMIN=5.94.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
inherit cmake kde.org
DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+CMAKE_USE_DIR="${S}/${PN}"
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
DEPEND="
>=dev-qt/qtcore-${QTMIN}:5
@@ -31,13 +32,11 @@ RDEPEND="${DEPEND}
!kde-plasma/xembed-sni-proxy:0
"
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )
src_prepare() {
cmake_src_prepare
sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
- -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+ -i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
}