From be4dc30c4ee7f04daec40c33da22184e6f5857d8 Mon Sep 17 00:00:00 2001 From: Jay Lanagan Date: Thu, 1 Jun 2023 21:34:54 +0100 Subject: [PATCH] desktop/nwg-shell-config: Updated for version 0.5.0. Signed-off-by: bedlam Signed-off-by: Willy Sudiarto Raharjo --- desktop/nwg-shell-config/loginctl.patch | 108 ++++++++++++++++++ .../nwg-shell-config.SlackBuild | 8 +- .../nwg-shell-config/nwg-shell-config.info | 6 +- 3 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 desktop/nwg-shell-config/loginctl.patch diff --git a/desktop/nwg-shell-config/loginctl.patch b/desktop/nwg-shell-config/loginctl.patch new file mode 100644 index 0000000000..96d31097ec --- /dev/null +++ b/desktop/nwg-shell-config/loginctl.patch @@ -0,0 +1,108 @@ +--- a/nwg_shell_config/shell/custom-hyprland ++++ b/nwg_shell_config/shell/custom-hyprland +@@ -46,8 +46,8 @@ + "gtklock-userinfo-under-clock": false, + "gtklock-powerbar-show-labels": true, + "gtklock-powerbar-linked-buttons": false, +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-poweroff-command": "systemctl -i poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-poweroff-command": "loginctl poweroff", + "gtklock-playerctl-art-size": 64, + "gtklock-playerctl-position": "top-right", + "gtklock-playerctl-show-hidden": true + +--- a/nwg_shell_config/shell/custom ++++ b/nwg_shell_config/shell/custom +@@ -43,8 +43,8 @@ + "gtklock-userinfo-under-clock": false, + "gtklock-powerbar-show-labels": true, + "gtklock-powerbar-linked-buttons": false, +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-poweroff-command": "systemctl -i poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-poweroff-command": "loginctl poweroff", + "gtklock-playerctl-art-size": 64, + "gtklock-playerctl-position": "top-right", + "gtklock-playerctl-show-hidden": true + +--- a/nwg_shell_config/locker.py ++++ b/nwg_shell_config/locker.py +@@ -53,9 +53,9 @@ + "gtklock-logout-command": "swaymsg exit", + "gtklock-playerctl": False, + "gtklock-powerbar": False, +- "gtklock-poweroff-command": "systemctl -i poweroff", +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-suspend-command": "systemctl suspend", ++ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-suspend-command": "loginctl suspend", + "gtklock-time-format": "%H:%M:%S", + "gtklock-userinfo": False, + "gtklock-userswitch-command": "" + +--- a/nwg_shell_config/main_hyprland.py ++++ b/nwg_shell_config/main_hyprland.py +@@ -1026,9 +1026,9 @@ + "gtklock-logout-command": "swaymsg exit", + "gtklock-playerctl": False, + "gtklock-powerbar": False, +- "gtklock-poweroff-command": "systemctl -i poweroff", +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-suspend-command": "systemctl suspend", ++ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-suspend-command": "loginctl suspend", + "gtklock-time-format": "%H:%M:%S", + "gtklock-userinfo": False, + "gtklock-userswitch-command": "", + +--- a/nwg_shell_config/main_sway.py ++++ b/nwg_shell_config/main_sway.py +@@ -916,9 +916,9 @@ + "gtklock-logout-command": "swaymsg exit", + "gtklock-playerctl": False, + "gtklock-powerbar": False, +- "gtklock-poweroff-command": "systemctl -i poweroff", +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-suspend-command": "systemctl suspend", ++ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-suspend-command": "loginctl suspend", + "gtklock-time-format": "%H:%M:%S", + "gtklock-userinfo": False, + "gtklock-userswitch-command": "", + +--- a/nwg_shell_config/shell/settings-hyprland ++++ b/nwg_shell_config/shell/settings-hyprland +@@ -110,9 +110,9 @@ + "gtklock-logout-command": "swaymsg exit", + "gtklock-playerctl": false, + "gtklock-powerbar": false, +- "gtklock-poweroff-command": "systemctl -i poweroff", +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-suspend-command": "systemctl suspend", ++ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-suspend-command": "loginctl suspend", + "gtklock-time-format": "%H:%M:%S", + "gtklock-userinfo": false, + "gtklock-userswitch-command": "", + +--- a/nwg_shell_config/shell/settings ++++ b/nwg_shell_config/shell/settings +@@ -83,9 +83,9 @@ + "gtklock-logout-command": "swaymsg exit", + "gtklock-playerctl": false, + "gtklock-powerbar": false, +- "gtklock-poweroff-command": "systemctl -i poweroff", +- "gtklock-reboot-command": "systemctl reboot", +- "gtklock-suspend-command": "systemctl suspend", ++ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-reboot-command": "loginctl reboot", ++ "gtklock-suspend-command": "loginctl suspend", + "gtklock-time-format": "%H:%M:%S", + "gtklock-userinfo": false, + "gtklock-userswitch-command": "" + diff --git a/desktop/nwg-shell-config/nwg-shell-config.SlackBuild b/desktop/nwg-shell-config/nwg-shell-config.SlackBuild index 400bfd4ce7..6cf93badcb 100644 --- a/desktop/nwg-shell-config/nwg-shell-config.SlackBuild +++ b/desktop/nwg-shell-config/nwg-shell-config.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nwg-shell-config -VERSION=${VERSION:-0.4.20} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,10 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || tar xvf $CWD/v$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . + +# patches removing refs to systemctl & replaced w/ loginctl +patch -Np1 -i $CWD/loginctl.patch || exit 1 + find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ diff --git a/desktop/nwg-shell-config/nwg-shell-config.info b/desktop/nwg-shell-config/nwg-shell-config.info index 71372bd41b..1228397b24 100644 --- a/desktop/nwg-shell-config/nwg-shell-config.info +++ b/desktop/nwg-shell-config/nwg-shell-config.info @@ -1,9 +1,9 @@ PRGNAM="nwg-shell-config" -VERSION="0.4.20" +VERSION="0.5.0" HOMEPAGE="https://github.com/nwg-piotr/nwg-shell-config/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-shell-config/archive/v0.4.20/nwg-shell-config-0.4.20.tar.gz \ +DOWNLOAD="https://github.com/nwg-piotr/nwg-shell-config/archive/v0.5.0/nwg-shell-config-0.5.0.tar.gz \ https://slackware.lngn.net/pub/source/nwg-shell-config/Slackware_logo.svg" -MD5SUM="1649a44e3e149ddcb011f7132b149c96 \ +MD5SUM="4ba92391d5b584fc49c38ce27b35713d \ 275ee1d6ab047f12df0da19a4e99963d" DOWNLOAD_x86_64="" MD5SUM_x86_64=""