desktop/icewm: Updated for version 1.4.2.

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

8 files changed, 63 insertions, 33 deletions

diff --git a/desktop/icewm/README b/desktop/icewm/README
index 4e57a51d09..6a766518ff 100644
--- a/desktop/icewm/README
+++ b/desktop/icewm/README
@@ -1,2 +1,5 @@
 IceWM is a window manager for the X Window System.  The goal of IceWM 
 is speed, simplicity, and not getting in the user's way.
+
+Many users will need to have a polkit authentication agent invoked 
+at X startup - see /usr/share/icewm/startup for suggestions.
diff --git a/desktop/icewm/config/icewm-sleep b/desktop/icewm/config/icewm-sleep
new file mode 100644
index 0000000000..21ff523ab6
--- /dev/null
+++ b/desktop/icewm/config/icewm-sleep
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# This is used for Slackware 14.2
+/usr/bin/dbus-send \
+  --system \
+  --print-reply \
+  --dest="org.freedesktop.UPower" \
+  /org/freedesktop/UPower \
+  org.freedesktop.UPower.Suspend 2>/dev/null
+
+# This will be needed instead in Slackware 15.0
+#/usr/bin/dbus-send \
+#  --system \
+#  --print-reply \
+#  --dest="org.freedesktop.ConsoleKit" \
+#  /org/freedesktop/ConsoleKit/Manager \
+#  org.freedesktop.ConsoleKit.Manager.Suspend \
+#  boolean:true
diff --git a/desktop/icewm/config/shutdown b/desktop/icewm/config/shutdown
new file mode 100644
index 0000000000..e4fa7d5fcc
--- /dev/null
+++ b/desktop/icewm/config/shutdown
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# /usr/share/icewm/shutdown
+# This script is used to execute additional commands at icewm session exit
+
+# killall xscreensaver
+# killall nm-applet
+# killall polkit-gnome-authentication-agent-1
+
diff --git a/desktop/icewm/config/startup b/desktop/icewm/config/startup
new file mode 100644
index 0000000000..3974421601
--- /dev/null
+++ b/desktop/icewm/config/startup
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# /usr/share/icewm/startup
+# This script is used to execute additional commands at icewm startup
+# The "sleep 1" is necessary if you will be starting anything with a tray icon
+
+# sleep 1
+# /usr/libexec/polkit-gnome-authentication-agent-1 &
+# /usr/bin/nm-applet &
+# /usr/bin/xscreensaver -nosplash &
+
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 72b3d9a899..a3ea0d5dde 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=icewm
-VERSION=${VERSION:-1.3.12}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,16 +69,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Since we put the html files in $docdir/html/, let's fix the integrated help:
-patch -p1 < $CWD/patches/icewm-1.3.x-fix_htmldir.diff
-
 # Set some sane keyboard shortcut defaults
 patch -p1 < $CWD/patches/icewm-keys.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --with-x \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
@@ -86,18 +82,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-cfgdir=/etc/$PRGNAM \
   --with-libdir=/usr/share/$PRGNAM \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-corefonts \
-  --enable-guievents \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  --enable-corefonts
 
-make htmldir=/usr/doc/$PRGNAM-$VERSION/html VERBOSE=1
-make install htmldir=/usr/doc/$PRGNAM-$VERSION/html DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 gzip -9 $PKG/usr/man/man1/*.1
 
+# Include some extra configs
+mkdir -p $PKG/usr/share/icewm
+cp $CWD/config/* $PKG/usr/share/icewm
+chmod 0755 $PKG/usr/share/icewm/startup
+chmod 0755 $PKG/usr/share/icewm/shutdown
+cp $CWD/config/icewm-sleep $PKG/usr/bin
+chmod 0755 $PKG/usr/bin/icewm-sleep
+
 # Add xinitrc for xwmconfig(1)
 mkdir -p $PKG/etc/X11/xinit
 cat $CWD/xinitrc.icewm > $PKG/etc/X11/xinit/xinitrc.icewm.new
@@ -109,10 +112,8 @@ cat $CWD/icewm.desktop > $PKG/usr/share/xsessions/icewm.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a \
-  AUTHORS COMPLIANCE COPYING ChangeLog INSTALL* NEWS README THANKS TODO VERSION \
+  AUTHORS COMPLIANCE COPYING ChangeLog INSTALL* NEWS README.md THANKS TODO VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/doc/$PRGNAM-$VERSION/*.html $PKG/usr/doc/$PRGNAM-$VERSION/*.sgml \
-   $PKG/usr/doc/$PRGNAM-$VERSION/html/
 cat $CWD/icewm.SlackBuild > $PKG/usr/doc/icewm-$VERSION/icewm.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info
index ac849519be..c95595424c 100644
--- a/desktop/icewm/icewm.info
+++ b/desktop/icewm/icewm.info
@@ -1,8 +1,8 @@
 PRGNAM="icewm"
-VERSION="1.3.12"
+VERSION="1.4.2"
 HOMEPAGE="https://github.com/bbidulock/icewm"
-DOWNLOAD="https://github.com/bbidulock/icewm/releases/download/1.3.12/icewm-1.3.12.tar.bz2"
-MD5SUM="3e3b8904d53998c0f46414722d86457c"
+DOWNLOAD="https://github.com/bbidulock/icewm/releases/download/1.4.2/icewm-1.4.2.tar.bz2"
+MD5SUM="3e7c3a95e7f8518346267f48a11966cd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff b/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff
deleted file mode 100644
index ee0cb69be9..0000000000
--- a/desktop/icewm/patches/icewm-1.3.x-fix_htmldir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur icewm-1.3.12.orig/configure icewm-1.3.12/configure
---- icewm-1.3.12.orig/configure	2015-12-16 19:10:37.000000000 -0600
-+++ icewm-1.3.12/configure	2016-01-03 16:51:39.034717138 -0600
-@@ -24013,7 +24013,7 @@
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define ICEHELPIDX "${DOCDIR}/icewm.html"
-+#define ICEHELPIDX "${DOCDIR}/html/icewm.html"
- _ACEOF
- 
- 
diff --git a/desktop/icewm/patches/icewm-keys.patch b/desktop/icewm/patches/icewm-keys.patch
index c9ad1584f7..23fb9ff89e 100644
--- a/desktop/icewm/patches/icewm-keys.patch
+++ b/desktop/icewm/patches/icewm-keys.patch
@@ -1,14 +1,14 @@
-diff -Nur icewm-1.3.12.orig/lib/keys.in icewm-1.3.12/lib/keys.in
---- icewm-1.3.12.orig/lib/keys.in	2015-09-13 16:29:28.000000000 -0500
-+++ icewm-1.3.12/lib/keys.in	2016-01-03 16:28:55.332001195 -0600
+diff -Nur icewm-1.4.2.orig/lib/keys.in icewm-1.4.2/lib/keys.in
+--- icewm-1.4.2.orig/lib/keys.in	2017-07-30 03:53:35.524267864 -0500
++++ icewm-1.4.2/lib/keys.in	2019-07-21 00:54:04.355694881 -0500
 @@ -20,8 +20,8 @@
  # advanced function keys by watching the output of the xev command whilest
  # pressing those keys and map those symbols by using xmodmap.
  
 -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 "XF86Standby"			/bin/sh -c "{ pm-suspend; } ||:"
-+key "XF86Sleep"				/bin/sh -c "{ pm-suspend; } ||:"
++key "XF86Standby"			/bin/sh -c "{ /usr/bin/icewm-sleep; } ||:"
++key "XF86Sleep"				/bin/sh -c "{ /usr/bin/icewm-sleep; } ||:"
  key "XF86AudioLowerVolume"		amixer sset PCM 5%-
  key "XF86AudioRaiseVolume"		amixer sset PCM 5%+
  key "XF86AudioMute"			amixer sset PCM 0%