diff options
author | M.Dinslage <daedra1980@gmail.com> | 2021-07-25 21:36:33 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2021-07-25 21:36:33 -0500 |
commit | f5226a274864d9d8193291809c1db20cc68fdfcb (patch) | |
tree | ce541044e40bbab94c5714471bbec34880fecf49 /system/conky/conky.SlackBuild | |
parent | 59c050638c28041bc8220aebbcfb94c7789744c4 (diff) |
system/conky: Updated for version 1.12.2.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/conky/conky.SlackBuild')
-rw-r--r-- | system/conky/conky.SlackBuild | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 938fe02f4676..daa6574a3ce9 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for conky -# Copyright 2016 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA +# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=conky -VERSION=${VERSION:-1.10.8} +VERSION=${VERSION:-1.12.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -97,9 +97,6 @@ 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 {} \; -# Fix for the newer gcc -patch -p1 < $CWD/conky-1.10.6-gcc7.patch - # fix MANDIR sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt @@ -111,8 +108,8 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \ - -DMAN_INSTALL_DIR=/usr/man \ -DMAINTAINER_MODE=ON \ + -DBUILD_DOCS=ON \ -DBUILD_XDBE=ON \ -DBUILD_AUDACIOUS=$audacious \ -DBUILD_NVIDIA=$nvidia \ @@ -120,17 +117,20 @@ cd build -DBUILD_WLAN=ON \ -DBUILD_RSS=ON \ -DBUILD_WEATHER_METAR=ON \ - -DBUILD_WEATHER_XOAP=ON \ + -DBUILD_PULSEAUDIO=ON \ -DBUILD_MPD=ON \ -DBUILD_IMLIB2=ON \ -DBUILD_LUA_CAIRO=ON \ -DBUILD_LUA_IMLIB2=ON \ -DCMAKE_BUILD_TYPE=Release .. - make VERBOSE=1 + make make install DESTDIR=$PKG cd .. +# Don't ship .a files: +find $PKG -type f -iname '*.a' -exec rm -rf {} \+ + 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 @@ -142,11 +142,21 @@ mkdir -p $PKG/etc/conky cp data/conky.conf $PKG/etc/conky/conky.conf.new cp data/conky_no_x11.conf $PKG/etc/conky/conky_no_x11.conf.new +# Vim and Nano syntax highlighting files +mkdir -p $PKG/usr/share/nano +mkdir -p $PKG/usr/share/vim/vimfiles/{syntax,ftdetect} +cp extras/vim/syntax/conkyrc.vim $PKG/usr/share/vim/vimfiles/syntax +cp extras/vim/ftdetect/conkyrc.vim $PKG/usr/share/vim/vimfiles/ftdetect +cp extras/nano/conky.nanorc $PKG/usr/share/nano/conky.nanorc + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog LICENSE.BSD README.md NEWS TODO \ +cp -a AUTHORS COPYING LICENSE.BSD README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# include copy of convert.lua script for old configs. +cat extras/convert.lua > $PKG/usr/doc/$PRGNAM-$VERSION/convert.lua + # Remove duplicate config files out of the docdir. rm -r $PKG/usr/doc/$PRGNAM-$VERSION/*.conf @@ -155,4 +165,4 @@ 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 +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
\ No newline at end of file |