From 0b1f52439a5b860ce73f04f75077b870d02a00b1 Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Sun, 21 Jul 2019 01:37:15 -0500
Subject: desktop/icewm: Updated for version 1.4.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/icewm/icewm.SlackBuild | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'desktop/icewm/icewm.SlackBuild')

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
-- 
cgit v1.2.3