summaryrefslogtreecommitdiffstats
path: root/desktop/icewm/icewm.SlackBuild
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2016-01-03 17:14:14 -0600
committer Robby Workman <rworkman@slackbuilds.org>2016-01-10 21:36:31 -0600
commite3cee0ccd7e3341c9e5464d740fe2afeff39d8f4 (patch)
tree11a6fc3aa3e2c0f7a129218f9e85ee16d4f42145 /desktop/icewm/icewm.SlackBuild
parentde47a0f89562601b6b7fc4b6c110c58af606ebb8 (diff)
downloadslackbuilds-e3cee0ccd7e3341c9e5464d740fe2afeff39d8f4.tar.gz
slackbuilds-e3cee0ccd7e3341c9e5464d740fe2afeff39d8f4.tar.xz
desktop/icewm: Updated for version 1.3.12 (new upstream)
Thanks to _gin on LQ for the heads-up on this. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/icewm/icewm.SlackBuild')
-rw-r--r--desktop/icewm/icewm.SlackBuild53
1 files changed, 15 insertions, 38 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild
index 63de462721..72b3d9a899 100644
--- a/desktop/icewm/icewm.SlackBuild
+++ b/desktop/icewm/icewm.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for icewm
-# Copyright 2006-2014 Robby Workman Northport, Alabama, USA
+# Copyright 2006-2015 Robby Workman Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=icewm
-VERSION=${VERSION:-1.3.7}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.12}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,32 +69,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Explicitly link fontconfig
-patch -p1 < $CWD/patches/explicitly-link-fontconfig.diff
-
# Since we put the html files in $docdir/html/, let's fix the integrated help:
-patch -p1 < $CWD/patches/icewm-1.3.x-fix_html_docdir.diff
-
-# Fix thermal information handling (Gentoo Bug #452730 by Dag Bakke)
-patch -p1 < $CWD/patches/icewm-1.3.7-thermal.patch
-
-# Fix icon size in menu (thanks to Fedora via Gentoo, iiuc)
-patch -p1 < $CWD/patches/icewm-1.3.7-menuiconsize.patch
+patch -p1 < $CWD/patches/icewm-1.3.x-fix_htmldir.diff
-# Set some sane keyboard shortcut defaults (thanks, Fedora)
+# Set some sane keyboard shortcut defaults
patch -p1 < $CWD/patches/icewm-keys.patch
-# /proc/acpi is deprecated and may not be present
-patch -p1 < $CWD/patches/no_proc_acpi.patch
-
-# Allow use of deprecated functions without causing build failure
-patch -p1 < $CWD/patches/use_ICEWM_deprecated.patch
-
-# Unknown origin of these patches ; forwarded by a user
-patch -p0 < $CWD/patches/acpustatus_read_cpuinfo_cur_freq.patch
-patch -p1 < $CWD/patches/aapm_power.patch
-patch -p1 < $CWD/patches/wmclient.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -104,20 +84,19 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--sysconfdir=/etc \
--with-cfgdir=/etc/$PRGNAM \
- --docdir=/usr/doc \
- --with-docdir=/usr/doc \
+ --with-libdir=/usr/share/$PRGNAM \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-corefonts \
+ --enable-guievents \
--build=$ARCH-slackware-linux
-make VERBOSE=1
-make install DESTDIR=$PKG
+make htmldir=/usr/doc/$PRGNAM-$VERSION/html VERBOSE=1
+make install htmldir=/usr/doc/$PRGNAM-$VERSION/html 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
-# Add man page
-mkdir -p $PKG/usr/man/man1
-gzip -9c doc/icewm.1.man > $PKG/usr/man/man1/icewm.1.gz
+gzip -9 $PKG/usr/man/man1/*.1
# Add xinitrc for xwmconfig(1)
mkdir -p $PKG/etc/X11/xinit
@@ -130,12 +109,10 @@ cat $CWD/icewm.desktop > $PKG/usr/share/xsessions/icewm.desktop
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
cp -a \
- AUTHORS BUGS CHANGES COPYING INSTALL PLATFORMS README* TODO VERSION \
+ AUTHORS COMPLIANCE COPYING ChangeLog INSTALL* NEWS README THANKS TODO VERSION \
$PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
-# Add a menu generator for xdg menus to docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/contrib
-cat $CWD/icewm-xdg-menu > $PKG/usr/doc/$PRGNAM-$VERSION/contrib/icewm-xdg-menu
+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