From 228f5ab3683081abdc9d74ddf253e711a5677bf2 Mon Sep 17 00:00:00 2001 From: Jay Lanagan <1995739+mac-a-r0ni@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:21:57 -0400 Subject: [PATCH] desktop/nwg-shell: Updated for version 0.5.37. Patch has been updated to remove unused configs. Signed-off-by: Willy Sudiarto Raharjo --- desktop/nwg-shell/nwg-shell.SlackBuild | 34 +++++++++++----------- desktop/nwg-shell/nwg-shell.info | 6 ++-- desktop/nwg-shell/slackware.diff | 40 +------------------------- 3 files changed, 21 insertions(+), 59 deletions(-) diff --git a/desktop/nwg-shell/nwg-shell.SlackBuild b/desktop/nwg-shell/nwg-shell.SlackBuild index d76f2153c1..42ee25ca58 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.36} +VERSION=${VERSION:-0.5.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,22 +50,22 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi +#if [ "$ARCH" = "i586" ]; then +# SLKCFLAGS="-O2 -march=i586 -mtune=i686" +# LIBDIRSUFFIX="" +#elif [ "$ARCH" = "i686" ]; then +# SLKCFLAGS="-O2 -march=i686 -mtune=i686" +# LIBDIRSUFFIX="" +#elif [ "$ARCH" = "x86_64" ]; then +# SLKCFLAGS="-O2 -fPIC" +# LIBDIRSUFFIX="64" +#elif [ "$ARCH" = "aarch64" ]; then +# SLKCFLAGS="-O2 -fPIC" +# LIBDIRSUFFIX="64" +#else +# SLKCFLAGS="-O2" +# LIBDIRSUFFIX="" +#fi set -e diff --git a/desktop/nwg-shell/nwg-shell.info b/desktop/nwg-shell/nwg-shell.info index e654f8e492..7d2d8a4c9e 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.36" +VERSION="0.5.37" HOMEPAGE="https://nwg-piotr.github.io/nwg-shell/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.36/nwg-shell-v0.5.36.tar.gz" -MD5SUM="09290f74163207d04a0494e22489f130" +DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.37/nwg-shell-v0.5.37.tar.gz" +MD5SUM="dc4c9beb9138855038975958786ff20d" 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 e5bdf83ece..aed967c08c 100644 --- a/desktop/nwg-shell/slackware.diff +++ b/desktop/nwg-shell/slackware.diff @@ -62,48 +62,10 @@ diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr 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 WAYLAND_DISPLAY XDG_CURRENT_DESKTOP ++exec-once = dbus-update-activation-environment --all # # Include settings generated by nwg-shell-config -diff -ur a/nwg_shell/skel/config/nwg-bar/bar.json b/nwg_shell/skel/config/nwg-bar/bar.json ---- a/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-18 20:06:36.000000000 -0400 -+++ b/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-23 08:13:11.595459991 -0400 -@@ -11,12 +11,12 @@ - }, - { - "label": "Reboot", -- "exec": "systemctl reboot", -+ "exec": "loginctl reboot", - "icon": "/usr/share/nwg-bar/images/system-reboot.svg" - }, - { - "label": "Shutdown", -- "exec": "systemctl -i poweroff", -+ "exec": "loginctl -i poweroff", - "icon": "/usr/share/nwg-bar/images/system-shutdown.svg" - } - ] -\ No newline at end of file -diff -ur a/nwg_shell/skel/config/nwg-bar/hyprland.json b/nwg_shell/skel/config/nwg-bar/hyprland.json ---- a/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-18 20:06:36.000000000 -0400 -+++ b/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-23 08:13:32.787113097 -0400 -@@ -11,12 +11,12 @@ - }, - { - "label": "_Reboot", -- "exec": "systemctl reboot", -+ "exec": "loginctl reboot", - "icon": "/usr/share/nwg-bar/images/system-reboot.svg" - }, - { - "label": "_Shutdown", -- "exec": "systemctl -i poweroff", -+ "exec": "loginctl -i poweroff", - "icon": "/usr/share/nwg-bar/images/system-shutdown.svg" - } - ] -\ No newline at end of file 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