desktop/nwg-shell: Updated for version 0.5.42.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 57 insertions, 54 deletions

diff --git a/desktop/nwg-shell/nwg-shell.SlackBuild b/desktop/nwg-shell/nwg-shell.SlackBuild
index ede7442710..0b55f05136 100644
--- a/desktop/nwg-shell/nwg-shell.SlackBuild
+++ b/desktop/nwg-shell/nwg-shell.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nwg-shell
-VERSION=${VERSION:-0.5.39}
+VERSION=${VERSION:-0.5.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/nwg-shell/nwg-shell.info b/desktop/nwg-shell/nwg-shell.info
index 157369c864..991d96f855 100644
--- a/desktop/nwg-shell/nwg-shell.info
+++ b/desktop/nwg-shell/nwg-shell.info
@@ -1,8 +1,8 @@
 PRGNAM="nwg-shell"
-VERSION="0.5.39"
+VERSION="0.5.42"
 HOMEPAGE="https://nwg-piotr.github.io/nwg-shell/"
-DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/archive/v0.5.39/nwg-shell-0.5.39.tar.gz"
-MD5SUM="df31b5e7989cd15eb0d9c2463b2f10f4"
+DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/archive/v0.5.42/nwg-shell-0.5.42.tar.gz"
+MD5SUM="61c64a54baa3746d27f51c3372609a84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="foot grim jq brightnessctl papirus-icon-theme slurp gtklock-playerctl-module gtklock-powerbar-module gtklock-userinfo-module swappy sway swayidle swaylock wl-clipboard azote gopsuinfo nwg-bar nwg-clipman nwg-dock nwg-menu nwg-look nwg-panel nwg-readme-browser nwg-shell-config nwg-shell-wallpapers nwg-wrapper nwg-displays python3-autotiling xdg-desktop-portal-wlr"
diff --git a/desktop/nwg-shell/slackware.diff b/desktop/nwg-shell/slackware.diff
index aed967c08c..764357a912 100644
--- a/desktop/nwg-shell/slackware.diff
+++ b/desktop/nwg-shell/slackware.diff
@@ -1,38 +1,38 @@
 diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py
---- a/nwg_shell/installer.py	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/installer.py	2024-04-23 08:06:15.320307748 -0400
+--- a/nwg_shell/installer.py	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/installer.py	2024-11-19 02:46:26.959294088 -0500
 @@ -173,7 +173,7 @@
          print("    This script installs/overwrites configs and style sheets       ")
          print("          for sway, Hyprland and nwg-shell components.             ")
-         print("  The only backup that will be made is the main sway config file.  ")
+         print("      The only backup that will be made are main config files.     ")
 -        print("   This script should be used on a fresh Arch Linux installation.  ")
 +        print("   This script should be used on a fresh Slackware installation.   ")
          print("            If you're running it on your existing setup,           ")
          print("                 you're doing it at your own risk.                 ")
          print("*******************************************************************")
-@@ -255,7 +255,7 @@
+@@ -262,7 +262,7 @@
                          break
  
              if "editor" not in s or not s["editor"]:
 -                for cmd in ["mousepad", "atom", "emacs", "gedit", "geany", "kate", "vim"]:
-+                for cmd in ["mousepad", "atom", "emacs", "gedit", "joe", "kate", "vim"]:
++                for cmd in ["mousepad", "atom", "emacs", "gedit", "geany", "joe", "kate", "vim"]:
                      if is_command(cmd):
                          s["editor"] = cmd
                          break
-@@ -307,8 +307,8 @@
+@@ -314,8 +314,8 @@
              else:
                  print("Your computer will now restart...")
                  time.sleep(3)
 -                if is_command("systemctl"):
 -                    subprocess.call("sudo systemctl reboot -f", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
 +                if is_command("loginctl"):
-+                    subprocess.call("sudo loginctl reboot", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
++                    subprocess.call("sudo loginctl reboot -f", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
                  else:
                      subprocess.call("sudo reboot", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
  
 diff -ur a/nwg_shell/main.py b/nwg_shell/main.py
---- a/nwg_shell/main.py	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/main.py	2024-04-23 08:06:35.004983477 -0400
+--- a/nwg_shell/main.py	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/main.py	2024-11-19 02:47:14.468542347 -0500
 @@ -10,7 +10,6 @@
      print("  nwg-shell-installer -a [-hypr] installs All configs from scratch; [-hypr] includes Hyprland configs")
      print("  nwg-shell-installer -w [-hypr] installs configs from scratch w/ no dialogs; [-hypr] includes Hyprland configs")
@@ -42,8 +42,8 @@ diff -ur a/nwg_shell/main.py b/nwg_shell/main.py
  
  
 diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot.ini
---- a/nwg_shell/skel/config/foot/foot.ini	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/foot/foot.ini	2024-04-23 08:06:57.188618092 -0400
+--- a/nwg_shell/skel/config/foot/foot.ini	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/foot/foot.ini	2024-11-19 02:48:10.603650315 -0500
 @@ -2,7 +2,7 @@
  
  # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
@@ -54,22 +54,25 @@ diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot
  # app-id=foot
  # title=foot
 diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr/hyprland.conf
---- a/nwg_shell/skel/config/hypr/hyprland.conf	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/hypr/hyprland.conf	2024-04-23 08:07:58.307611735 -0400
-@@ -17,8 +17,7 @@
+--- a/nwg_shell/skel/config/hypr/hyprland.conf	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/hypr/hyprland.conf	2024-11-19 02:55:43.024828972 -0500
+@@ -15,10 +15,9 @@
+ # Autostart. Feel free to add your own entries.
+ # Shell components will be started in the includes.conf file, which we include below.
  #
- exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+-exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
++exec = /usr/libexec/polkit-gnome-authentication-agent-1
  exec-once = ~/.azotebg-hyprland # Wallpaper
 -exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-+exec-once = dbus-update-activation-environment --all
++exec-once = dbus-update-activation-environment --all WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
  
  #
  # Include settings generated by nwg-shell-config
 diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-0 b/nwg_shell/skel/config/nwg-panel/hyprland-0
---- a/nwg_shell/skel/config/nwg-panel/hyprland-0	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-0	2024-04-23 08:14:52.432809425 -0400
-@@ -84,11 +84,11 @@
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-0	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-0	2024-11-19 03:01:48.864312339 -0500
+@@ -85,11 +85,11 @@
            },
            {
              "name": "Restart",
@@ -84,8 +87,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-0 b/nwg_shell/skel/config/nw
          ]
        },
 diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-1 b/nwg_shell/skel/config/nwg-panel/hyprland-1
---- a/nwg_shell/skel/config/nwg-panel/hyprland-1	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-1	2024-04-23 08:14:58.944702840 -0400
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-1	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-1	2024-11-19 03:02:22.167799792 -0500
 @@ -86,11 +86,11 @@
            },
            {
@@ -101,8 +104,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-1 b/nwg_shell/skel/config/nw
          ]
        },
 diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nwg-panel/hyprland-2
---- a/nwg_shell/skel/config/nwg-panel/hyprland-2	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-2	2024-04-23 08:15:06.752575048 -0400
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-2	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-2	2024-11-19 03:02:34.038616783 -0500
 @@ -83,11 +83,11 @@
            },
            {
@@ -129,8 +132,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nw
        "file-manager": "thunar",
        "height": 0,
 diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-3 b/nwg_shell/skel/config/nwg-panel/hyprland-3
---- a/nwg_shell/skel/config/nwg-panel/hyprland-3	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-3	2024-04-23 08:15:15.176437171 -0400
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-3	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-3	2024-11-19 03:02:42.375488159 -0500
 @@ -82,11 +82,11 @@
            },
            {
@@ -146,9 +149,9 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-3 b/nwg_shell/skel/config/nw
          ]
        },
 diff -ur a/nwg_shell/skel/config/nwg-panel/preset-0 b/nwg_shell/skel/config/nwg-panel/preset-0
---- a/nwg_shell/skel/config/nwg-panel/preset-0	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/preset-0	2024-04-23 08:15:23.410302403 -0400
-@@ -85,11 +85,11 @@
+--- a/nwg_shell/skel/config/nwg-panel/preset-0	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/preset-0	2024-11-19 03:02:53.846311061 -0500
+@@ -86,11 +86,11 @@
            },
            {
              "name": "Restart",
@@ -163,8 +166,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-0 b/nwg_shell/skel/config/nwg-
          ]
        },
 diff -ur a/nwg_shell/skel/config/nwg-panel/preset-1 b/nwg_shell/skel/config/nwg-panel/preset-1
---- a/nwg_shell/skel/config/nwg-panel/preset-1	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/preset-1	2024-04-23 08:15:31.000178183 -0400
+--- a/nwg_shell/skel/config/nwg-panel/preset-1	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/preset-1	2024-11-19 03:03:02.022184745 -0500
 @@ -87,11 +87,11 @@
            },
            {
@@ -180,8 +183,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-1 b/nwg_shell/skel/config/nwg-
          ]
        },
 diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg-panel/preset-2
---- a/nwg_shell/skel/config/nwg-panel/preset-2	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/preset-2	2024-04-23 08:15:38.024063224 -0400
+--- a/nwg_shell/skel/config/nwg-panel/preset-2	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/preset-2	2024-11-19 03:03:12.607021108 -0500
 @@ -99,11 +99,11 @@
            },
            {
@@ -208,8 +211,8 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg-
        "file-manager": "thunar",
        "height": 0,
 diff -ur a/nwg_shell/skel/config/nwg-panel/preset-3 b/nwg_shell/skel/config/nwg-panel/preset-3
---- a/nwg_shell/skel/config/nwg-panel/preset-3	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/nwg-panel/preset-3	2024-04-23 08:15:45.775936353 -0400
+--- a/nwg_shell/skel/config/nwg-panel/preset-3	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/nwg-panel/preset-3	2024-11-19 03:03:24.312839999 -0500
 @@ -83,11 +83,11 @@
            },
            {
@@ -225,20 +228,18 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-3 b/nwg_shell/skel/config/nwg-
          ]
        },
 diff -ur a/nwg_shell/skel/config/sway/autostart b/nwg_shell/skel/config/sway/autostart
---- a/nwg_shell/skel/config/sway/autostart	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/sway/autostart	2024-04-23 08:16:45.765954548 -0400
-@@ -6,8 +6,6 @@
- exec_always nwg-autotiling
- exec_always nwg-drawer -r -s preset-0.css -term foot -ft
+--- a/nwg_shell/skel/config/sway/autostart	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/sway/autostart	2024-11-19 03:05:11.403177026 -0500
+@@ -8,6 +8,5 @@
  exec_always nwg-panel -c preset-0 -s preset-0.css
--exec_always nwg-shell-check-updates
+ exec_always nwg-shell-check-updates
  exec nwg-look -a
 -exec nwg-update-indicator
  exec_always nwg-screenshot-applet
  exec_always nwg-shell-config -s
 diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config
---- a/nwg_shell/skel/config/sway/config	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/config/sway/config	2024-04-23 08:18:36.244146606 -0400
+--- a/nwg_shell/skel/config/sway/config	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/config/sway/config	2024-11-19 03:06:11.441240408 -0500
 @@ -36,10 +36,9 @@
  
  ###############     Autostart      ##################
@@ -253,8 +254,8 @@ diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config
  
  ### Turn off screen on lid closed
 diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/nwg-shell-config/settings
---- a/nwg_shell/skel/data/nwg-shell-config/settings	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/data/nwg-shell-config/settings	2024-04-23 08:20:04.961694894 -0400
+--- a/nwg_shell/skel/data/nwg-shell-config/settings	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/data/nwg-shell-config/settings	2024-11-19 03:08:21.127208541 -0500
 @@ -18,9 +18,9 @@
    "browser": "",
    "pb-exit": "nwg-dialog -p exit-sway -c \"swaymsg exit\"",
@@ -281,15 +282,16 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/n
    "gtklock-time-format": "%H:%M:%S",
    "gtklock-userinfo": false,
    "gtklock-userswitch-command": "",
-   "update-indicator-on": true,
+-  "update-indicator-on": true,
++  "update-indicator-on": false,
    "update-indicator-interval": 30,
 -  "update-command": "nwg-system-update"
 +  "update-command": ""
  }
 \ No newline at end of file
 diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland
---- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland	2024-04-18 20:06:36.000000000 -0400
-+++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland	2024-04-23 08:20:16.632503931 -0400
+--- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland	2024-11-18 18:12:12.000000000 -0500
++++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland	2024-11-19 03:08:48.893772162 -0500
 @@ -16,9 +16,9 @@
    "show-on-startup": false,
    "pb-exit": "nwg-dialog -p exit-hyprland -c \"hyprctl dispatch exit\"",
@@ -303,7 +305,7 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/sk
    "gen-use-settings": true,
    "gen-border_size": 1,
    "gen-no_border_on_floating": false,
-@@ -104,7 +104,7 @@
+@@ -100,7 +100,7 @@
    "lockscreen-custom-cmd": "",
    "lockscreen-timeout": 1200,
    "screenshot": true,
@@ -312,7 +314,7 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/sk
    "sleep-timeout": 1800,
    "resume-cmd": "",
    "before-sleep": "",
-@@ -129,13 +129,13 @@
+@@ -125,13 +125,13 @@
    "gtklock-logout-command": "swaymsg exit",
    "gtklock-playerctl": false,
    "gtklock-powerbar": false,
@@ -325,7 +327,8 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/sk
    "gtklock-time-format": "%H:%M:%S",
    "gtklock-userinfo": false,
    "gtklock-userswitch-command": "",
-   "update-indicator-on": true,
+-  "update-indicator-on": true,
++  "update-indicator-on": false,
    "update-indicator-interval": 30,
 -  "update-command": "nwg-system-update"
 +  "update-command": ""