diff --git a/desktop/herbstluftwm/herbstluftwm.SlackBuild b/desktop/herbstluftwm/herbstluftwm.SlackBuild index 17a70ae61c..9303d2d32e 100644 --- a/desktop/herbstluftwm/herbstluftwm.SlackBuild +++ b/desktop/herbstluftwm/herbstluftwm.SlackBuild @@ -2,9 +2,8 @@ # Slackware build script for herbstluftwm -# Written by Ian D. Brunton - -# 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: @@ -26,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=herbstluftwm -VERSION=${VERSION:-0.7.2} +VERSION=${VERSION:-0.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,8 +76,22 @@ 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 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 .. 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 diff --git a/desktop/herbstluftwm/herbstluftwm.info b/desktop/herbstluftwm/herbstluftwm.info index 064c98458e..43283b331c 100644 --- a/desktop/herbstluftwm/herbstluftwm.info +++ b/desktop/herbstluftwm/herbstluftwm.info @@ -1,8 +1,8 @@ PRGNAM="herbstluftwm" -VERSION="0.7.2" +VERSION="0.9.4" HOMEPAGE="https://herbstluftwm.org" -DOWNLOAD="https://herbstluftwm.org/tarballs/herbstluftwm-0.7.2.tar.gz" -MD5SUM="eccbb5d0b1836071f0b24da851ac4d8e" +DOWNLOAD="https://herbstluftwm.org/tarballs/herbstluftwm-0.9.4.tar.gz" +MD5SUM="41f5a543d1401953a4ed9900354c99d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""