diff options
| author | M.Dinslage <daedra1980@gmail.com> | 2016-08-19 22:16:53 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2016-08-19 23:22:27 +0100 |
| commit | fddada42bcbe153765882ba8952a2cd56c7181e7 (patch) | |
| tree | 2fc87ade46b513dd0812d674aec6b4ba75b93d0c | |
| parent | cc4cb1bd82d0c86ff2c261c73d08538bd483adea (diff) | |
system/conky: Updated for version 1.10.4.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | system/conky/conky.SlackBuild | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 6ee408952b9e8..aeb8735832fd6 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -24,12 +24,12 @@ PRGNAM=conky VERSION=${VERSION:-1.10.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,8 +43,8 @@ OUTPUT=${OUTPUT:-/tmp} # Pass AUDACIOUS=yes if you want to build audacious player support. AUDACIOUS=${AUDACIOUS:-"no"} -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" @@ -78,6 +78,9 @@ 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 MANDIR +sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt + mkdir -p build cd build cmake \ @@ -108,10 +111,6 @@ 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 -# Conky doesn't want to honor MANDIR. Move the man files manually -mkdir -p $PKG/usr/man/man1 -mv $PKG/usr/share/man/man1/conky.1 $PKG/usr/man/man1 -rm -r $PKG/usr/share 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 |