From 4f78942d46b2136e743576645ade2181c0668b3b Mon Sep 17 00:00:00 2001 From: Andrew Payne Date: Fri, 4 Sep 2020 20:35:23 +0700 Subject: desktop/spectrwm: Updated for version 3.4.1. Signed-off-by: Willy Sudiarto Raharjo --- desktop/spectrwm/spectrwm.SlackBuild | 94 +++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 43 deletions(-) (limited to 'desktop/spectrwm/spectrwm.SlackBuild') diff --git a/desktop/spectrwm/spectrwm.SlackBuild b/desktop/spectrwm/spectrwm.SlackBuild index eb50e37babaf..928c33931ffb 100644 --- a/desktop/spectrwm/spectrwm.SlackBuild +++ b/desktop/spectrwm/spectrwm.SlackBuild @@ -1,32 +1,29 @@ #!/bin/sh -# Copyright 2020 Andrew Payne, Boston MA +# Copyright 2020 Andrew Payne # Copyright (c) 2011-2015 LEVAI Daniel # All rights reserved. # -# * Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright notice -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spectrwm -VERSION=${VERSION:-3.3.0} -UPNAM=SPECTRWM_3_3_0 # changed to allow cd to proper folder +VERSION=${VERSION:-3.4.1} +SRCNAM=SPECTRWM_${VERSION//./_} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$UPNAM -tar xvf $CWD/$PRGNAM-$UPNAM.tar.gz || tar xvf $CWD/$UPNAM.tar.gz -cd $PRGNAM-$UPNAM +rm -rf $PRGNAM-$SRCNAM +tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz || tar xvf $CWD/$SRCNAM.tar.gz +cd $PRGNAM-$SRCNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -73,45 +70,56 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; cd linux - CFLAGS="$SLKCFLAGS" make \ +CFLAGS="$SLKCFLAGS" \ + make \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - MANDIR=/usr/man + MANDIR=/usr/man \ + DOCDIR=/usr/doc/spectrwm-${VERSION} + SYSCONFDIR=/etc \ + DATAROOTDIR=/usr \ + XSESSIONSDIR=/usr/share/applications \ + PKG_CONFIG=pkg-config \ make install \ PREFIX=/usr \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ MANDIR=/usr/man \ + DOCDIR=/usr/doc/spectrwm-${VERSION} \ + SYSCONFDIR=/etc \ + DATAROOTDIR=/usr \ + XSESSIONSDIR=/usr/share/applications \ + PKG_CONFIG=pkg-config \ DESTDIR=$PKG cd .. 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 +# Remove the symlink to scrotwm rm -f $PKG/usr/bin/scrotwm -# Compress the manpages -( cd $PKG/usr/man; find . -type f -exec gzip -9 {} \; ) +# Compress man pages +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples/keybindings -install -m0644 -oroot -groot initscreen.sh $CWD/examples/* \ - $PKG/usr/doc/$PRGNAM-$VERSION/examples/ -cp -a spectrwm.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/spectrwm_orig.conf -cp -a spectrwm_*.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/keybindings/ +# Put an extra copy of the default config with the other example files +cp -a \ + spectrwm.conf \ + $PKG/usr/doc/$PRGNAM-$VERSION/examples cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 0644 {} \; - -# install xinitrc script -mkdir -p $PKG/etc/X11/xinit -cat $CWD/xinitrc.$PRGNAM > $PKG/etc/X11/xinit/xinitrc.$PRGNAM -chmod 0755 $PKG/etc/X11/xinit/xinitrc.$PRGNAM - -# desktop integration -mkdir -m755 -p "${PKG}/usr/share/applications/" -cp -a linux/spectrwm.desktop "${PKG}/usr/share/applications/" +# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Install xinitrc script +mkdir -p $PKG/etc/X11/xinit +cat $CWD/xinitrc.$PRGNAM > $PKG/etc/X11/xinit/xinitrc.$PRGNAM.new +chmod 0755 $PKG/etc/X11/xinit/xinitrc.$PRGNAM.new + +# Make sure new config doesn't stomp the one in /etc +mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new + cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} -- cgit v1.2.3