summaryrefslogtreecommitdiff
path: root/extra/conky
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
commit61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch)
tree6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/conky
parentca998b4c054452abed4e01be1d2b28fee0ca904f (diff)
parent5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/camlp5/PKGBUILD community/coq/PKGBUILD community/ldns/PKGBUILD community/luxrays/PKGBUILD community/luxrender/PKGBUILD community/nut/PKGBUILD community/root/PKGBUILD community/swi-prolog/PKGBUILD community/vtk/PKGBUILD community/wings3d/wings3d.sh core/sqlite3/PKGBUILD core/tzdata/PKGBUILD extra/cmus/PKGBUILD extra/dcron/PKGBUILD extra/farsight2/PKGBUILD extra/foomatic/PKGBUILD extra/fwbuilder/PKGBUILD extra/gnome-utils/PKGBUILD extra/ivtv-utils/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdesdk/PKGBUILD extra/koffice/PKGBUILD extra/libxfce4menu/PKGBUILD extra/openmpi/PKGBUILD extra/telepathy-butterfly/PKGBUILD extra/telepathy-farsight/PKGBUILD extra/telepathy-kde-presence-dataengine/PKGBUILD extra/telepathy-qt4/PKGBUILD extra/xfce-utils/PKGBUILD extra/xulrunner/PKGBUILD multilib/lib32-zlib/PKGBUILD staging/gimp-devel/gimp-devel.install testing/gtk3/PKGBUILD testing/php/PKGBUILD ~xihh/couchdb-git/couchdb.install ~xihh/couchdb-git/rc-script.patch ~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/conky')
-rw-r--r--extra/conky/PKGBUILD16
1 files changed, 6 insertions, 10 deletions
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index fa5098c03..bb4b7786b 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,32 +1,28 @@
-# $Id: PKGBUILD 150215 2012-02-15 03:04:18Z bisson $
+# $Id: PKGBUILD 158528 2012-05-03 23:54:02Z bisson $
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: James Rayner <james@archlinux.org>
# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=conky
-pkgver=1.8.2git20111107
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
pkgdesc='Lightweight system monitor for X'
url='http://conky.sourceforge.net/'
license=('BSD' 'GPL')
arch=('i686' 'x86_64' 'mips64el')
options=('!emptydirs')
-makedepends=('pkg-config' 'docbook2x')
+makedepends=('docbook2x')
depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c')
-
-# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
replaces=('torsmo')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sh autogen.sh
-
CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
--prefix=/usr \
--sysconfdir=/etc \