diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-09 12:30:57 -0300 |
| commit | 3282ccb6286f172872d887baf49e623c51e0a157 (patch) | |
| tree | 73ddd891395a089f724fd9cbcb95c6a28e1ffcce /extra/conky | |
| parent | f22839d3ad483a975a0c5955964bf257c0a0af6b (diff) | |
| parent | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vbox-service.rc
community-testing/virtualbox/vboxdrv-reference.patch
core/cryptsetup/PKGBUILD
core/ed/PKGBUILD
core/module-init-tools/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'extra/conky')
| -rw-r--r-- | extra/conky/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index 4f1af6db7..f96f8c71b 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z bisson $ +# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z 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.2git20111026 +pkgver=1.8.2git20111107 pkgrel=1 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' @@ -16,7 +16,7 @@ makedepends=('pkg-config' '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=('735861b284ad4feb86a9febaf4e457a4fcc7b39b') +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 @@ -27,7 +27,7 @@ build() { sh autogen.sh - CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \ + CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --enable-ibm \ |