desktop/icewm: Updated for version 1.6.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

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

4 files changed, 42 insertions, 42 deletions

diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index ddcfa3b0f5..cde8702d8d 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for icewm
 
-# Copyright 2006-2019  Robby Workman  Northport, Alabama, USA
+# Copyright 2006-2020  Robby Workman  Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icewm
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-1.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index 46e2750188..396edc52fd 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -1,8 +1,8 @@
 PRGNAM="icewm"
-VERSION="1.5.5"
+VERSION="1.6.6"
 HOMEPAGE="https://ice-wm.org/"
-DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/1.5.5/icewm-1.5.5.tar.xz"
-MD5SUM="6eba94a7935a0531d2c14eeb1426aeef"
+DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/1.6.6/icewm-1.6.6.tar.lz"
+MD5SUM="45e772e781a0d71d998367f8f5d8c9b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/patches/tweak-default-configs.diff b/desktop/icewm/patches/tweak-default-configs.diff
index bd8c10132d..4c51139db0 100644
--- a/desktop/icewm/patches/tweak-default-configs.diff
+++ b/desktop/icewm/patches/tweak-default-configs.diff
@@ -1,41 +1,41 @@
-diff -Nur icewm-1.5.5.orig/lib/keys.in icewm-1.5.5/lib/keys.in
---- icewm-1.5.5.orig/lib/keys.in	2019-06-06 17:42:00.019998596 -0500
-+++ icewm-1.5.5/lib/keys.in	2019-07-27 17:42:43.139090310 -0500
-@@ -13,8 +13,8 @@
- key "Alt+Ctrl+b"			xdg-open about:blank
- key "Alt+Ctrl+s"			xdg-open https://www.google.com
+diff -Nur icewm-1.6.6.orig/lib/keys.in icewm-1.6.6/lib/keys.in
+--- icewm-1.6.6.orig/lib/keys.in	2020-05-29 11:47:00.000000000 -0500
++++ icewm-1.6.6/lib/keys.in	2020-05-30 00:37:31.279645822 -0500
+@@ -12,8 +12,8 @@
+ key "Alt+Ctrl+b"            xdg-open about:blank
+ key "Alt+Ctrl+s"            xdg-open https://www.google.com
  
--key "Super+KP_Subtract"			amixer sset Master 5%-
--key "Super+KP_Add"			amixer sset Master 5%+
-+key "Super+KP_Subtract"			pamixer -d 5
-+key "Super+KP_Add"			pamixer -i 5
+-key "Super+KP_Subtract"     amixer sset Master 5%-
+-key "Super+KP_Add"          amixer sset Master 5%+
++key "Super+KP_Subtract"     pamixer -d 5
++key "Super+KP_Add"          pamixer -i 5
  
  # "Multimedia key" bindings for Xorg. Gather the keycodes of your
  # advanced function keys by watching the output of the xev command whilest
-@@ -23,11 +23,11 @@
+@@ -22,11 +22,11 @@
  # Note: some of them might have unwanted side effects through concurrency with
  # other listeners like systemd for the suspend key events
  #
--# key "XF86Standby"			/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
--# key "XF86Sleep"				/bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
--key "XF86AudioLowerVolume"		amixer sset Master 5%-
--key "XF86AudioRaiseVolume"		amixer sset Master 5%+
--key "XF86AudioMute"			amixer sset Master toggle
-+# key "XF86Standby"			/bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
-+# key "XF86Sleep"				/bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
-+key "XF86AudioLowerVolume"		pamixer -d 5
-+key "XF86AudioRaiseVolume"		pamixer -i 5
-+key "XF86AudioMute"			pamixer -t
- key "XF86HomePage"			xdg-open about:blank
- key "XF86Search"			xdg-open https://www.google.com
- key "XF86Eject"				eject
-diff -Nur icewm-1.5.5.orig/src/default.h icewm-1.5.5/src/default.h
---- icewm-1.5.5.orig/src/default.h	2019-06-06 17:42:00.043999061 -0500
-+++ icewm-1.5.5/src/default.h	2019-07-27 17:36:10.134553913 -0500
+-# key "XF86Standby"         /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+-# key "XF86Sleep"           /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:"
+-key "XF86AudioLowerVolume"  amixer sset Master 5%-
+-key "XF86AudioRaiseVolume"  amixer sset Master 5%+
+-key "XF86AudioMute"         amixer sset Master toggle
++# key "XF86Standby"         /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
++# key "XF86Sleep"           /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
++key "XF86AudioLowerVolume"  pamixer -d 5
++key "XF86AudioRaiseVolume"  pamixer -i 5
++key "XF86AudioMute"         pamixer -t
+ key "XF86HomePage"          xdg-open about:blank
+ key "XF86Search"            xdg-open https://www.google.com
+ key "XF86Eject"             eject
+diff -Nur icewm-1.6.6.orig/src/default.h icewm-1.6.6/src/default.h
+--- icewm-1.6.6.orig/src/default.h	2020-05-29 11:47:00.000000000 -0500
++++ icewm-1.6.6/src/default.h	2020-05-30 00:38:53.408234561 -0500
 @@ -184,9 +184,9 @@
+ XSV(const char *, logoutCommand,                0)
  XSV(const char *, logoutCancelCommand,          0)
  #if defined(__linux__)
- // use shell code since those are wrapped through shell in YWindowManager::execAfterFork
 -XSV(const char *, shutdownCommand,              "test -e /run/systemd/system && systemctl poweroff")
 -XSV(const char *, rebootCommand,                "test -e /run/systemd/system && systemctl reboot")
 -XSV(const char *, suspendCommand,               "test -e /run/systemd/system && systemctl suspend")
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index 18d62cfa72..f4ca6237ec 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -11,19 +11,19 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 [ -f $userresources ] && /usr/bin/xrdb -merge $userresources
 [ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
 
-# Create default user directory & populate it if it does not already exist
-if [ ! -d $HOME/.icewm ]; then
-  mkdir $HOME/.icewm
-  for FILE in keys menu preferences toolbar winoptions;
-    do cat /usr/share/icewm/$FILE > $HOME/.icewm/$FILE;
-  done
-fi
+# Create default user directory & populate it if needed
+mkdir -p ${HOME}/.icewm
+for FILE in keys menu preferences shutdown startup toolbar winoptions ; do 
+  if [ ! -e ${HOME}/.icewm/${FILE} ]; then
+    cat /usr/share/icewm/${FILE} > ${HOME}/.icewm/${FILE} ;
+  fi
+done
 
 # Start IceWM
 icewmbg &
 icewmtray &
 
-if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
   ck-launch-session dbus-launch --exit-with-session icewm-session
 else
   exec icewm-session