diff options
Diffstat (limited to 'desktop/herbstluftwm')
-rw-r--r-- | desktop/herbstluftwm/README | 6 | ||||
-rw-r--r-- | desktop/herbstluftwm/herbstluftwm.SlackBuild | 41 | ||||
-rw-r--r-- | desktop/herbstluftwm/herbstluftwm.info | 6 | ||||
-rw-r--r-- | desktop/herbstluftwm/slack-desc | 2 |
4 files changed, 36 insertions, 19 deletions
diff --git a/desktop/herbstluftwm/README b/desktop/herbstluftwm/README index 09e6642dbb..2701a10375 100644 --- a/desktop/herbstluftwm/README +++ b/desktop/herbstluftwm/README @@ -5,6 +5,6 @@ monitor displays exactly one tag at a time. Configuration is achieved through bash scripting in the file ~/.config/herbstluftwm/autostart. An example autostart file is located -in /etc/xdg/herbstluftwm/ along with example scripts for use with the WM. -Additional examples are available at http://www.herbstluftwm.org/ along -with detailed documentation. +in /etc/xdg/herbstluftwm/ along with example scripts for use with the +WM. Additional examples are available at https://www.herbstluftwm.org/ +along with detailed documentation. diff --git a/desktop/herbstluftwm/herbstluftwm.SlackBuild b/desktop/herbstluftwm/herbstluftwm.SlackBuild index 4481ee16a6..192a0fb9eb 100644 --- a/desktop/herbstluftwm/herbstluftwm.SlackBuild +++ b/desktop/herbstluftwm/herbstluftwm.SlackBuild @@ -1,10 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for herbstluftwm -# Written by Ian D. Brunton <iandbrunton@gmail.com> - -# Copyright 2019 Johannes Schoepfer, Germany +# Written by Ian D. Brunton +# Copyright 2019 - 2022 Johannes Schoepfer, Germany # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -23,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=herbstluftwm -VERSION=${VERSION:-0.7.1} +VERSION=${VERSION:-0.9.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +38,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -70,15 +76,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# make -make PREFIX=/usr MANDIR=/usr/man DOCDIR=/usr/doc/$PRGNAM-$VERSION || exit 1 -make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man DOCDIR=/usr/doc/$PRGNAM-$VERSION +# set man and doc location +sed -i \ + -e "s;\${DATADIR}/man;/usr/man;" \ + -e "s;\${DATADIR}/doc/$PRGNAM;/usr/doc/$PRGNAM-$VERSION;" \ + CMakeLists.txt + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. -# strip: 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 manpages: 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 @@ -97,4 +114,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/herbstluftwm/herbstluftwm.info b/desktop/herbstluftwm/herbstluftwm.info index 06ff1b7da4..ab0dc541b9 100644 --- a/desktop/herbstluftwm/herbstluftwm.info +++ b/desktop/herbstluftwm/herbstluftwm.info @@ -1,8 +1,8 @@ PRGNAM="herbstluftwm" -VERSION="0.7.1" +VERSION="0.9.5" HOMEPAGE="https://herbstluftwm.org" -DOWNLOAD="https://herbstluftwm.org/tarballs/herbstluftwm-0.7.1.tar.gz" -MD5SUM="7f091559503d11a6da9e5371ab3df3f6" +DOWNLOAD="https://herbstluftwm.org/tarballs/herbstluftwm-0.9.5.tar.gz" +MD5SUM="d62c066ea25dceef34a936fe8b4e5783" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/herbstluftwm/slack-desc b/desktop/herbstluftwm/slack-desc index 0718c928cf..0ab44916f7 100644 --- a/desktop/herbstluftwm/slack-desc +++ b/desktop/herbstluftwm/slack-desc @@ -13,7 +13,7 @@ herbstluftwm: Glib. Layout is based on splitting frames into sub-frames, simila herbstluftwm: to i3/musca. Tags/workspaces can be removed or added at run-time. herbstluftwm: Configuration is written in bash script. herbstluftwm: -herbstluftwm: homepage: https://herbstluftwm.org +herbstluftwm: Homepage: https://herbstluftwm.org herbstluftwm: herbstluftwm: herbstluftwm: |