diff options
Diffstat (limited to 'desktop/dunst')
-rw-r--r-- | desktop/dunst/README | 2 | ||||
-rw-r--r-- | desktop/dunst/doinst.sh | 14 | ||||
-rw-r--r-- | desktop/dunst/dunst.SlackBuild | 38 | ||||
-rw-r--r-- | desktop/dunst/dunst.info | 10 |
4 files changed, 42 insertions, 22 deletions
diff --git a/desktop/dunst/README b/desktop/dunst/README index e6211b084e..4ccb5add33 100644 --- a/desktop/dunst/README +++ b/desktop/dunst/README @@ -7,5 +7,5 @@ we all love to customize to perfection. Configuration: -To customize dunst you have to copy /usr/share/dunst/dunstrc to +To customize dunst copy /etc/xdg/dunst/dunstrc to ~/.config/dunst/dunstrc and then modify it to your liking. diff --git a/desktop/dunst/doinst.sh b/desktop/dunst/doinst.sh new file mode 100644 index 0000000000..c3a0ab28b9 --- /dev/null +++ b/desktop/dunst/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/xdg/dunst/dunstrc.new diff --git a/desktop/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild index bf9a9f5acb..4ce590a46e 100644 --- a/desktop/dunst/dunst.SlackBuild +++ b/desktop/dunst/dunst.SlackBuild @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash -# Copyright (c) 2014-2016 Симонъ С. Болокановъ – Бдинъ, България +# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgarsociety.org> +# С. С. Болоканаръ, България # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,33 +21,33 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by Симонъ С. Болокановъ <sbolokanov@abv.bg> -# changelog: -# v1.0.0 - Simon Bolokanov -# v1.1.0 - revised for SBo - 09.10.2014 -# 15.3.2015 - main site is down, fixed download url. Made some script clean ups -# 3.4.2016 - don't clobber the config +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dunst -VERSION=${VERSION:-1.4.1} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; 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} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -64,7 +65,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM $PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . @@ -76,10 +77,14 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ make DESTDIR=$PKG \ + SYSCONFDIR=/etc/xdg \ PREFIX=/usr \ MANPREFIX=/usr/man \ all install +# Don't clobber config +mv -v $PKG/etc/xdg/dunst/dunstrc $PKG/etc/xdg/dunst/dunstrc.new + 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 @@ -87,12 +92,13 @@ 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 -pv $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG.md LICENSE \ +cp -a AUTHORS CHANGELOG.md LICENSE README.md RELEASE_NOTES \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -pv $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh 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/dunst/dunst.info b/desktop/dunst/dunst.info index c236fb4023..6f4d586078 100644 --- a/desktop/dunst/dunst.info +++ b/desktop/dunst/dunst.info @@ -1,10 +1,10 @@ PRGNAM="dunst" -VERSION="1.4.1" +VERSION="1.11.0" HOMEPAGE="https://dunst-project.org/" -DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.4.1/dunst-1.4.1.tar.gz" -MD5SUM="ea22e152ae40a1fc8e0e4da5b762ad20" +DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.11.0/dunst-1.11.0.tar.gz" +MD5SUM="0faf54c38db9efab32c302d122a55a13" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Симонъ С. Болокановъ" -EMAIL="sbolokanov@abv.bg" +MAINTAINER="S. S. Bolokanar" +EMAIL="bolokanar@bulgarsociety.org" |