From 16d5f6dece569175a9df44c1e80a74c06eee1679 Mon Sep 17 00:00:00 2001 From: Marcel Saegebarth Date: Mon, 19 Apr 2010 18:59:12 -0400 Subject: system/conky: Updated for version 1.8.0. --- system/conky/README | 10 ++++++++++ system/conky/conky.SlackBuild | 37 ++++++++++++++----------------------- system/conky/conky.info | 13 +++++++------ system/conky/slack-desc | 2 +- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/system/conky/README b/system/conky/README index 0ee0f7ef2e3b1..ad038cf7d529a 100644 --- a/system/conky/README +++ b/system/conky/README @@ -6,3 +6,13 @@ it's predecessor. Conky can display just about anything, either on your root desktop or in it's own window. Conky has many built-in objects, as well as the ability to execute programs and scripts, then display the output from stdout. + +For lua scripting engine support the required dependencies are: +lua, imlib2 and tolua++ + +All of the above requirements are available from slackbuilds.org + +To disable lua support run the build with +LUA=NO ./conky.SlackBuild + + diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 67a3aa98bf64c..afd5d0b02e32f 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -2,28 +2,11 @@ # Slackware build script for conky -# Copyright (c) 2008, Antonio Hernández Blas -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# 1.- Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Written by M.Dinslage contact: daedra1980@gmail.com PRGNAM=conky -VERSION=1.6.1 +VERSION=1.8.0 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,11 +29,18 @@ fi set -e +if [ "${LUA:-yes}" = "yes" ]; then + lua="--enable-lua --enable-lua-cairo --enable-imlib2 --enable-lua-imlib2" +else + lua="--disable-lua" +fi + + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -68,15 +58,16 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-shared=yes \ --enable-static=no \ + --enable-weather-xoap \ --enable-audacious=yes \ --enable-mpd=yes \ - --enable-smapi=yes \ --enable-rss=yes \ --enable-wlan=yes \ + $lua \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux -make +make make install-strip DESTDIR=$PKG ( cd $PKG/usr/man @@ -84,7 +75,7 @@ make install-strip DESTDIR=$PKG for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -# Don't clobber an existing config file +# Move existing config file mv $PKG/etc/conky/conky.conf $PKG/etc/conky/conky.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/conky/conky.info b/system/conky/conky.info index aecfc6ab61570..e629481628aee 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -1,10 +1,11 @@ PRGNAM="conky" -VERSION="1.6.1" +VERSION="1.8.0" HOMEPAGE="http://conky.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.6.1.tar.bz2" +DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.8.0.tar.bz2" DOWNLOAD_x86_64="" -MD5SUM="b2839f21cec18e5eaa338c7440a1ba28" +MD5SUM="494cbaf1108cfdb977fc80454d9b13e2" MD5SUM_x86_64="" -MAINTAINER="Antonio Hernández Blas" -EMAIL="hba.nihilismus@gmail.com" -APPROVED="Erik Hanson" +MAINTAINER="M.Dinslage" +EMAIL="daedra1980@gmail.com" +APPROVED="dsomero" + diff --git a/system/conky/slack-desc b/system/conky/slack-desc index ab02c19d57618..6013fb9cd02df 100644 --- a/system/conky/slack-desc +++ b/system/conky/slack-desc @@ -10,7 +10,7 @@ conky: conky (light-weight system monitor for X) conky: conky: Conky is a system monitor for X originally based on the torsmo code. conky: Since it's original conception, Conky has changed a fair bit from -conky: it'spredecessor. Conky can display just about anything, either on +conky: it's predecessor. Conky can display just about anything, either on conky: your root desktop or in it's own window. Conky has many built-in conky: objects, as well as the ability to execute programs and scripts, then conky: display the output from stdout. -- cgit v1.2.3