1 files changed, 38 insertions, 57 deletions
diff --git a/desktop/wmmon/wmmon.SlackBuild b/desktop/wmmon/wmmon.SlackBuild
index 3de7dccf8128..fa162e867c7c 100644
--- a/desktop/wmmon/wmmon.SlackBuild
+++ b/desktop/wmmon/wmmon.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191211 bkw: Update for v1.4. Script can no longer build the old version.
+# - add libdockapp dep
+# - get rid of patches (no longer needed)
+# - add icon (to go with upstream's new .desktop file)
+# - s/clock/window in man page, also document -c option
+
 # 20170224 bkw:
 # - BUILD=2
 # - install /etc/wmmonrc as a proper .new config
@@ -15,31 +21,9 @@
 #   from trying to "upgrade" to 1.2b1.
 # - actually mention windowmaker in the README (derp!)
 
-# Notes about versions:
-
-# The version number is from Debian. I don't know why they called it 1.1,
-# because:
-#   $ wmmon -v
-#   WMMon version 1.2.b2
-# Since I'm using their tarball, I'll stick with their version numbering.
-
-# http://www.dockapps.net/wmmon has a wmmon-1.2b1 release, which looks
-# like a higher version number than we use for VERSION here. However
-# it's really older (missing some options/bugfixes) and this is obvious
-# if you look at the output of wmmon -v (1.2.b1 < 1.2.b2).
-
-# I could package up a newer git commit (there are commits from 2015),
-# but they add complexity (a new libdockapp.so library, as a separate
-# source tree, which wmmon would require as a dependency) and don't fix
-# any bugs or add any features beyond what we've got here. Plus, we've
-# got the same version Debian uses, and Fedora uses effectively the
-# same version too (they include a commit "Remove trailing whitespace"
-# that doesn't change the actual code). Gentoo uses 1.2b1, but I'm not
-# using them for a role model :)
-
 PRGNAM=wmmon
-VERSION=${VERSION:-1.1+20131205}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,13 +41,10 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIR="-L/usr/lib"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIR="-L/usr/lib"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIR="-L/usr/lib64"
 fi
 
 set -e
@@ -71,43 +52,43 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM.app
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# need this for -current, it doesn't hurt anything on 14.1.
-# patch snarfed from Debian:
-patch -p1 < $CWD/patches/gcc5.diff
-
-# This patch is necessary because the $#!%^#$^ wmmonrc file parser doesn't
-# fully support comments: they are allowed, but a commented-out (but
-# otherwise valid) config directive is still processed as though it
-# weren't commented out! Ack!
-patch -p1 < $CWD/patches/rc_file_parser.diff
-
-# The man page refers to "the clock" (probably copied from wmclock docs),
-# change to "the window".
-patch -p1 < $CWD/patches/manpage_window_not_clock.diff
-
-cd $PRGNAM
-  sed -i -e "s/-O2/$SLKCFLAGS/" Makefile
-  make LIBDIR="$LIBDIR"
-  strip $PRGNAM
-  mkdir -p $PKG/usr/bin
-  install -m0755 -o root -g root $PRGNAM $PKG/usr/bin
-  mkdir -p $PKG/usr/man/man1
-  gzip -9c $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-cd -
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Man page taken from Debian, slightly corrected, and -c option added.
+cat $CWD/$PRGNAM.1 > $PRGNAM.1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+make
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man1/*.1
 
 mkdir -p $PKG/etc
 cat $CWD/wmmonrc > $PKG/etc/wmmonrc.new
 
+# Icon created from wmmon-master.xpm + some overlaid text. If you
+# think it's ugly, you're right: PLEASE send me a nicer looking one.
+# I never claimed to be a graphic designer.
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Make .desktop reference the icon.
+echo 'Icon=/usr/share/pixmaps/wmmon.png' >> \
+     $PKG/usr/share/applications/$PRGNAM.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a BUGS CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild