From bd6ff8d439f656e50de1d6f7d43464bd5dcc3bab Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 14 Oct 2021 19:39:32 +0000 Subject: Thu Oct 14 19:39:32 UTC 2021 Huge thanks and congratulations to the KDE Community on the release of the Plasma 25th Anniversary Edition! kde/bluedevil-5.23.0-x86_64-1.txz: Upgraded. kde/breeze-5.23.0-x86_64-1.txz: Upgraded. kde/breeze-grub-5.23.0-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.23.0-x86_64-1.txz: Upgraded. kde/drkonqi-5.23.0-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.23.0-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.23.0-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.23.0-x86_64-1.txz: Upgraded. kde/kdecoration-5.23.0-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.23.0-x86_64-1.txz: Upgraded. kde/kgamma5-5.23.0-x86_64-1.txz: Upgraded. kde/khotkeys-5.23.0-x86_64-1.txz: Upgraded. kde/kinfocenter-5.23.0-x86_64-1.txz: Upgraded. kde/kmenuedit-5.23.0-x86_64-1.txz: Upgraded. kde/kscreen-5.23.0-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.23.0-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.23.0-x86_64-1.txz: Upgraded. kde/ksysguard-5.22.0-x86_64-2.txz: Removed. kde/ksystemstats-5.23.0-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.23.0-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.23.0-x86_64-1.txz: Upgraded. kde/kwayland-server-5.23.0-x86_64-1.txz: Upgraded. kde/kwin-5.23.0-x86_64-1.txz: Upgraded. kde/kwrited-5.23.0-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.23.0-x86_64-1.txz: Upgraded. kde/libkscreen-5.23.0-x86_64-1.txz: Upgraded. kde/libksysguard-5.23.0-x86_64-1.txz: Upgraded. kde/milou-5.23.0-x86_64-1.txz: Upgraded. kde/oxygen-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-disks-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-integration-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-nm-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-pa-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-vault-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.23.0-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.23.0-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.23.0-x86_64-1.txz: Upgraded. kde/powerdevil-5.23.0-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.23.0-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.23.0-x86_64-1.txz: Upgraded. kde/systemsettings-5.23.0-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.23.0-x86_64-1.txz: Upgraded. n/bluez-5.62-x86_64-1.txz: Upgraded. xfce/xfce4-whiskermenu-plugin-2.6.1-x86_64-1.txz: Upgraded. --- source/kde/kde/build/bluedevil | 2 +- source/kde/kde/build/breeze | 2 +- source/kde/kde/build/breeze-grub | 2 +- source/kde/kde/build/breeze-gtk | 2 +- source/kde/kde/build/drkonqi | 2 +- source/kde/kde/build/kactivitymanagerd | 2 +- source/kde/kde/build/kde-cli-tools | 2 +- source/kde/kde/build/kde-gtk-config | 2 +- source/kde/kde/build/kdecoration | 2 +- source/kde/kde/build/kdeplasma-addons | 2 +- source/kde/kde/build/kgamma5 | 2 +- source/kde/kde/build/khotkeys | 2 +- source/kde/kde/build/kinfocenter | 2 +- source/kde/kde/build/kmenuedit | 2 +- source/kde/kde/build/kscreen | 2 +- source/kde/kde/build/kscreenlocker | 2 +- source/kde/kde/build/ksshaskpass | 2 +- source/kde/kde/build/ksystemstats | 2 +- source/kde/kde/build/kwallet-pam | 2 +- source/kde/kde/build/kwayland-integration | 2 +- source/kde/kde/build/kwayland-server | 2 +- source/kde/kde/build/kwin | 2 +- source/kde/kde/build/kwrited | 2 +- source/kde/kde/build/layer-shell-qt | 2 +- source/kde/kde/build/libkscreen | 2 +- source/kde/kde/build/libksysguard | 2 +- source/kde/kde/build/milou | 2 +- source/kde/kde/build/oxygen | 2 +- source/kde/kde/build/plasma-browser-integration | 2 +- source/kde/kde/build/plasma-desktop | 2 +- source/kde/kde/build/plasma-disks | 2 +- source/kde/kde/build/plasma-firewall | 2 +- source/kde/kde/build/plasma-integration | 2 +- source/kde/kde/build/plasma-nm | 2 +- source/kde/kde/build/plasma-pa | 2 +- source/kde/kde/build/plasma-sdk | 2 +- source/kde/kde/build/plasma-systemmonitor | 2 +- source/kde/kde/build/plasma-vault | 2 +- source/kde/kde/build/plasma-workspace | 2 +- source/kde/kde/build/plasma-workspace-wallpapers | 2 +- source/kde/kde/build/polkit-kde-agent-1 | 2 +- source/kde/kde/build/powerdevil | 2 +- source/kde/kde/build/qqc2-breeze-style | 2 +- source/kde/kde/build/sddm-kcm | 2 +- source/kde/kde/build/systemsettings | 2 +- source/kde/kde/build/xdg-desktop-portal-kde | 2 +- source/kde/kde/modules/plasma | 2 +- source/kde/kde/patch/plasma-workspace.patch | 5 - ...-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | 30 --- .../patch/plasma-workspace/update-qml-files.patch | 278 --------------------- 50 files changed, 47 insertions(+), 360 deletions(-) delete mode 100644 source/kde/kde/patch/plasma-workspace.patch delete mode 100644 source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch delete mode 100644 source/kde/kde/patch/plasma-workspace/update-qml-files.patch (limited to 'source') diff --git a/source/kde/kde/build/bluedevil b/source/kde/kde/build/bluedevil index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/bluedevil +++ b/source/kde/kde/build/bluedevil @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/breeze b/source/kde/kde/build/breeze index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/breeze +++ b/source/kde/kde/build/breeze @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/breeze-grub b/source/kde/kde/build/breeze-grub index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/breeze-grub +++ b/source/kde/kde/build/breeze-grub @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/breeze-gtk b/source/kde/kde/build/breeze-gtk index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/breeze-gtk +++ b/source/kde/kde/build/breeze-gtk @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/drkonqi b/source/kde/kde/build/drkonqi index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/drkonqi +++ b/source/kde/kde/build/drkonqi @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kactivitymanagerd b/source/kde/kde/build/kactivitymanagerd index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kactivitymanagerd +++ b/source/kde/kde/build/kactivitymanagerd @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kde-cli-tools b/source/kde/kde/build/kde-cli-tools index 00750edc0..d00491fd7 100644 --- a/source/kde/kde/build/kde-cli-tools +++ b/source/kde/kde/build/kde-cli-tools @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/build/kde-gtk-config b/source/kde/kde/build/kde-gtk-config index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kde-gtk-config +++ b/source/kde/kde/build/kde-gtk-config @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kdecoration b/source/kde/kde/build/kdecoration index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kdecoration +++ b/source/kde/kde/build/kdecoration @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kdeplasma-addons b/source/kde/kde/build/kdeplasma-addons index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kdeplasma-addons +++ b/source/kde/kde/build/kdeplasma-addons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kgamma5 b/source/kde/kde/build/kgamma5 index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kgamma5 +++ b/source/kde/kde/build/kgamma5 @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/khotkeys b/source/kde/kde/build/khotkeys index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/khotkeys +++ b/source/kde/kde/build/khotkeys @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kinfocenter b/source/kde/kde/build/kinfocenter index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kinfocenter +++ b/source/kde/kde/build/kinfocenter @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kmenuedit b/source/kde/kde/build/kmenuedit index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kmenuedit +++ b/source/kde/kde/build/kmenuedit @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kscreen b/source/kde/kde/build/kscreen index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kscreen +++ b/source/kde/kde/build/kscreen @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kscreenlocker b/source/kde/kde/build/kscreenlocker index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kscreenlocker +++ b/source/kde/kde/build/kscreenlocker @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/ksshaskpass b/source/kde/kde/build/ksshaskpass index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/ksshaskpass +++ b/source/kde/kde/build/ksshaskpass @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/ksystemstats b/source/kde/kde/build/ksystemstats index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/ksystemstats +++ b/source/kde/kde/build/ksystemstats @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kwallet-pam b/source/kde/kde/build/kwallet-pam index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kwallet-pam +++ b/source/kde/kde/build/kwallet-pam @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kwayland-integration b/source/kde/kde/build/kwayland-integration index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kwayland-integration +++ b/source/kde/kde/build/kwayland-integration @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kwayland-server b/source/kde/kde/build/kwayland-server index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kwayland-server +++ b/source/kde/kde/build/kwayland-server @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kwin +++ b/source/kde/kde/build/kwin @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kwrited b/source/kde/kde/build/kwrited index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kwrited +++ b/source/kde/kde/build/kwrited @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/layer-shell-qt b/source/kde/kde/build/layer-shell-qt index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/layer-shell-qt +++ b/source/kde/kde/build/layer-shell-qt @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/libkscreen b/source/kde/kde/build/libkscreen index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/libkscreen +++ b/source/kde/kde/build/libkscreen @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/libksysguard b/source/kde/kde/build/libksysguard index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/libksysguard +++ b/source/kde/kde/build/libksysguard @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/milou b/source/kde/kde/build/milou index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/milou +++ b/source/kde/kde/build/milou @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/oxygen b/source/kde/kde/build/oxygen index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/oxygen +++ b/source/kde/kde/build/oxygen @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-browser-integration b/source/kde/kde/build/plasma-browser-integration index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-browser-integration +++ b/source/kde/kde/build/plasma-browser-integration @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-desktop b/source/kde/kde/build/plasma-desktop index 00750edc0..d00491fd7 100644 --- a/source/kde/kde/build/plasma-desktop +++ b/source/kde/kde/build/plasma-desktop @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/build/plasma-disks b/source/kde/kde/build/plasma-disks index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-disks +++ b/source/kde/kde/build/plasma-disks @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-firewall b/source/kde/kde/build/plasma-firewall index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-firewall +++ b/source/kde/kde/build/plasma-firewall @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-integration b/source/kde/kde/build/plasma-integration index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-integration +++ b/source/kde/kde/build/plasma-integration @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-nm b/source/kde/kde/build/plasma-nm index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-nm +++ b/source/kde/kde/build/plasma-nm @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-pa b/source/kde/kde/build/plasma-pa index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-pa +++ b/source/kde/kde/build/plasma-pa @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-sdk b/source/kde/kde/build/plasma-sdk index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-sdk +++ b/source/kde/kde/build/plasma-sdk @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-systemmonitor b/source/kde/kde/build/plasma-systemmonitor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-systemmonitor +++ b/source/kde/kde/build/plasma-systemmonitor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-vault b/source/kde/kde/build/plasma-vault index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-vault +++ b/source/kde/kde/build/plasma-vault @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index 00750edc0..d00491fd7 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/build/plasma-workspace-wallpapers b/source/kde/kde/build/plasma-workspace-wallpapers index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-workspace-wallpapers +++ b/source/kde/kde/build/plasma-workspace-wallpapers @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/polkit-kde-agent-1 b/source/kde/kde/build/polkit-kde-agent-1 index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/polkit-kde-agent-1 +++ b/source/kde/kde/build/polkit-kde-agent-1 @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/powerdevil b/source/kde/kde/build/powerdevil index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/powerdevil +++ b/source/kde/kde/build/powerdevil @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/qqc2-breeze-style b/source/kde/kde/build/qqc2-breeze-style index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/qqc2-breeze-style +++ b/source/kde/kde/build/qqc2-breeze-style @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/sddm-kcm b/source/kde/kde/build/sddm-kcm index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/sddm-kcm +++ b/source/kde/kde/build/sddm-kcm @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/systemsettings b/source/kde/kde/build/systemsettings index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/systemsettings +++ b/source/kde/kde/build/systemsettings @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/xdg-desktop-portal-kde b/source/kde/kde/build/xdg-desktop-portal-kde index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/xdg-desktop-portal-kde +++ b/source/kde/kde/build/xdg-desktop-portal-kde @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/modules/plasma b/source/kde/kde/modules/plasma index dbb93ef01..3700c9d2f 100644 --- a/source/kde/kde/modules/plasma +++ b/source/kde/kde/modules/plasma @@ -10,7 +10,7 @@ kwayland-server plasma-integration kinfocenter libksysguard -ksysguard +#ksysguard layer-shell-qt kscreenlocker kwin diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch deleted file mode 100644 index 4a298cf17..000000000 --- a/source/kde/kde/patch/plasma-workspace.patch +++ /dev/null @@ -1,5 +0,0 @@ -# Set GTK_BACKEND=x11 in a wayland session -# Works around missing window decorations and broken config file reading -cat $CWD/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -# Fix issue where USB storage devices are only detected once per session: -cat $CWD/patch/plasma-workspace/update-qml-files.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch deleted file mode 100644 index 8bd445da7..000000000 --- a/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3deadbfcdf776eb0c994bb4d719e601160943bfa Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 28 Aug 2019 15:09:49 +0200 -Subject: [PATCH] Set GTK_BACKEND=x11 in a wayland session - -Works around missing window decorations and broken config file reading ---- - startkde/startplasma-waylandsession.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6b3..5d0b3f65f 100644 ---- a/startkde/startplasma-waylandsession.cpp -+++ b/startkde/startplasma-waylandsession.cpp -@@ -45,6 +45,11 @@ int main(int /*argc*/, char** /*argv*/) - out << "startplasma-waylandsession: Starting up..."; - - if (qEnvironmentVariableIsSet("DISPLAY")) { -+ // GTK3 uses the wayland backend by default, but its implementation is not correct -+ // enough to work well here. Window decorations are missing, for instance. -+ if (!qEnvironmentVariableIsSet("GDK_BACKEND")) { -+ qputenv("GDK_BACKEND", "x11"); -+ } - setupX11(); - } else { - qWarning() << "running kwin without Xwayland support"; --- -2.22.0 - - diff --git a/source/kde/kde/patch/plasma-workspace/update-qml-files.patch b/source/kde/kde/patch/plasma-workspace/update-qml-files.patch deleted file mode 100644 index 54aad06cc..000000000 --- a/source/kde/kde/patch/plasma-workspace/update-qml-files.patch +++ /dev/null @@ -1,278 +0,0 @@ -diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/DeviceItem.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/DeviceItem.qml ---- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/DeviceItem.qml 2021-08-31 06:52:18.000000000 -0500 -+++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/DeviceItem.qml 2021-09-17 01:37:28.000000000 -0500 -@@ -1,24 +1,11 @@ - /* -- * Copyright 2011 Viranch Mehta -- * Copyright 2012 Jacopo De Simoi -- * Copyright 2016 Kai Uwe Broulik -- * Copyright 2020 Nate Graham -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU Library General Public License as -- * published by the Free Software Foundation; either version 2 or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- */ -+ SPDX-FileCopyrightText: 2011 Viranch Mehta -+ SPDX-FileCopyrightText: 2012 Jacopo De Simoi -+ SPDX-FileCopyrightText: 2016 Kai Uwe Broulik -+ SPDX-FileCopyrightText: 2020 Nate Graham -+ -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ - - import QtQuick 2.0 - import QtQuick.Controls 2.12 as QQC2 -@@ -44,7 +31,8 @@ - readonly property double totalSpace: sdSource.data[udi] && sdSource.data[udi]["Size"] ? sdSource.data[udi]["Size"] : -1.0 - property bool freeSpaceKnown: freeSpace > 0 && totalSpace > 0 - -- readonly property bool isRootVolume: sdSource.data[udi]["File Path"] ? sdSource.data[udi]["File Path"] == "/" : false -+ readonly property bool isRootVolume: sdSource.data[udi] && sdSource.data[udi]["File Path"] ? sdSource.data[udi]["File Path"] == "/" : false -+ readonly property bool isRemovable: sdSource.data[udi] && sdSource.data[udi]["Removable"] ? sdSource.data[udi]["Removable"] : false - - onOperationResultChanged: { - if (!popupIconTimer.running) { -@@ -73,6 +61,15 @@ - } - } - -+ Connections { -+ target: plasmoid.action("unmountAllDevices") -+ function onTriggered() { -+ if (model["Removable"] && isMounted) { -+ actionTriggered(); -+ } -+ } -+ } -+ - // this keeps the delegate around for 5 seconds after the device has been - // removed in case there was a message, such as "you can now safely remove this" - ListView.onRemove: { -@@ -123,7 +120,7 @@ - var operationName - var operation - var wasMounted = isMounted; -- if (!sdSource.data[udi].Removable || !isMounted) { -+ if (!isRemovable || !isMounted) { - service = hpSource.serviceForSource(udi); - operation = service.operationDescription('invokeAction'); - operation.predicate = "test-predicate-openinwindow.desktop"; -@@ -140,26 +137,23 @@ - - // When there's no better icon available, show a placeholder icon instead - // of nothing -- icon: sdSource.data[udi] == undefined ? "device-notifier" : sdSource.data[udi].Icon -+ icon: sdSource.data[udi] ? sdSource.data[udi].Icon : "device-notifier" - - iconEmblem: { -- if (sdSource.data[udi] != undefined) { -- if (deviceItem.hasMessage) { -- if (deviceItem.message.solidError === 0) { -- return "emblem-information" -- } else { -- return "emblem-error" -- } -- } else if (deviceItem.state == 0 && Emblems && Emblems[0]) { -- return Emblems[0] -+ if (deviceItem.hasMessage) { -+ if (deviceItem.message.solidError === 0) { -+ return "emblem-information" - } else { -- return "" -+ return "emblem-error" - } -+ } else if (deviceItem.state == 0 && Emblems && Emblems[0]) { -+ return Emblems[0] -+ } else { -+ return "" - } -- return "" - } - -- title: sdSource.data[udi] == undefined ? "" : sdSource.data[udi].Description -+ title: sdSource.data[udi] ? sdSource.data[udi].Description : "" - - subtitle: { - if (deviceItem.hasMessage) { -@@ -176,9 +170,9 @@ - } - return "" - } else if (deviceItem.state == 1) { -- return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing...") -+ return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing…") - } else { -- return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing...") -+ return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing…") - } - } - -@@ -196,15 +190,15 @@ - - defaultActionButtonAction: QQC2.Action { - icon.name: { -- if (!sdSource.data[udi].Removable) { -- return "document-open-folder" -- } else { -+ if (isRemovable) { - return isMounted ? "media-eject" : "document-open-folder" -+ } else { -+ return "document-open-folder" - } - } - text: { - // It's possible for the root volume to be on a removable disk -- if (!sdSource.data[udi].Removable || deviceItem.isRootVolume) { -+ if (!isRemovable || isRootVolume) { - return i18n("Open in File Manager") - } else { - var types = model["Device Types"]; -@@ -236,7 +230,7 @@ - if (modelData.predicate != "test-predicate-openinwindow.desktop") { - return true; - } -- return sdSource.data[udi].Removable && deviceItem.isMounted; -+ return deviceItem.isRemovable && deviceItem.isMounted; - } - onTriggered: { - var service = hpSource.serviceForSource(udi); -@@ -257,7 +251,7 @@ - icon.name: "media-mount" - - // Only show for unmounted removable devices -- enabled: sdSource.data[udi].Removable && !deviceItem.isMounted -+ enabled: deviceItem.isRemovable && !deviceItem.isMounted - - onTriggered: { - var service = sdSource.serviceForSource(udi); -diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/FullRepresentation.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/FullRepresentation.qml ---- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/FullRepresentation.qml 2021-08-31 06:52:18.000000000 -0500 -+++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/FullRepresentation.qml 2021-09-17 01:37:39.000000000 -0500 -@@ -1,26 +1,12 @@ - /* -- * Copyright 2011 Viranch Mehta -- * Copyright 2012 Jacopo De Simoi -- * Copyright 2014 David Edmundson -- * Copyright 2014 Marco Martin -- * Copyright 2020 Nate Graham -- * -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU Library General Public License as -- * published by the Free Software Foundation; either version 2 or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- */ -+ SPDX-FileCopyrightText: 2011 Viranch Mehta -+ SPDX-FileCopyrightText: 2012 Jacopo De Simoi -+ SPDX-FileCopyrightText: 2014 David Edmundson -+ SPDX-FileCopyrightText: 2014 Marco Martin -+ SPDX-FileCopyrightText: 2020 Nate Graham -+ -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ - - import QtQuick 2.2 - import QtQuick.Window 2.2 -@@ -149,7 +135,7 @@ - section { - property: "Type Description" - delegate: Item { -- height: childrenRect.height -+ height: Math.floor(childrenRect.height) - width: notifierDialog.width - PlasmaExtras.Heading { - level: 3 -diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/devicenotifier.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/devicenotifier.qml ---- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/devicenotifier.qml 2021-08-31 06:52:18.000000000 -0500 -+++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/devicenotifier.qml 2021-09-17 01:37:49.000000000 -0500 -@@ -1,24 +1,11 @@ - /* -- * Copyright 2011 Viranch Mehta -- * Copyright 2012 Jacopo De Simoi -- * Copyright 2014 David Edmundson -- * Copyright 2016 Kai Uwe Broulik -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU Library General Public License as -- * published by the Free Software Foundation; either version 2 or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- */ -+ SPDX-FileCopyrightText: 2011 Viranch Mehta -+ SPDX-FileCopyrightText: 2012 Jacopo De Simoi -+ SPDX-FileCopyrightText: 2014 David Edmundson -+ SPDX-FileCopyrightText: 2016 Kai Uwe Broulik -+ -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ - - import QtQuick 2.0 - import QtQuick.Layouts 1.1 -@@ -88,6 +75,7 @@ - onSourceAdded: { - disconnectSource(source); - connectSource(source); -+ sdSource.connectedSources = sources - } - onSourceRemoved: { - disconnectSource(source); -@@ -111,7 +99,6 @@ - PlasmaCore.DataSource { - id: sdSource - engine: "soliddevice" -- connectedSources: hpSource.sources - interval: 0 - property string last - onSourceAdded: { -@@ -235,6 +222,13 @@ - Plasmoid.status = PlasmaCore.Types.PassiveStatus; - } - -+ plasmoid.setAction("unmountAllDevices", i18n("Remove All"), "media-eject"); -+ plasmoid.action("unmountAllDevices").visible = Qt.binding(() => { -+ return devicenotifier.mountedRemovables > 1; -+ }); -+ -+ plasmoid.setActionSeparator("sep0"); -+ - plasmoid.setAction("showRemovableDevices", i18n("Removable Devices"), "drive-removable-media"); - devicenotifier.showRemovableDevicesAction = plasmoid.action("showRemovableDevices"); - devicenotifier.showRemovableDevicesAction.checkable = true; -@@ -264,7 +258,7 @@ - - if (devicenotifier.openAutomounterKcmAuthorized) { - plasmoid.removeAction("configure"); -- plasmoid.setAction("configure", i18nc("Open auto mounter kcm", "Configure Removable Devices..."), "configure") -+ plasmoid.setAction("configure", i18nc("Open auto mounter kcm", "Configure Removable Devices…"), "configure") - } - } - -- cgit v1.2.3