diff options
Diffstat (limited to 'abs/extra')
| -rw-r--r-- | abs/extra/conky/PKGBUILD | 58 | ||||
| -rw-r--r-- | abs/extra/conky/current-power.patch | 12 |
2 files changed, 50 insertions, 20 deletions
diff --git a/abs/extra/conky/PKGBUILD b/abs/extra/conky/PKGBUILD index 0b27d0b..d542937 100644 --- a/abs/extra/conky/PKGBUILD +++ b/abs/extra/conky/PKGBUILD @@ -1,29 +1,47 @@ -# $Id: PKGBUILD 15346 2008-10-12 21:48:59Z giovanni $ -# Maintainer: James Rayner <james@archlinux.org> -# Contributor: MrGreen <mrgreen.linuxuser@gmail.com> +# $Id$ +# 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.0 -pkgrel=1 -pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo" +pkgver=1.8.1 +pkgrel=3 +pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' arch=('i686' 'x86_64') -url="http://conky.sourceforge.net/" +url='http://conky.sourceforge.net/' license=('custom') replaces=('torsmo') -depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2) +makedepends=('pkg-config') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') +backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'current-power.patch') + +sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f' + '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \ - --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/etc/xdg/ - mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/ - rmdir $startdir/pkg/usr/etc - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../current-power.patch # See FS#21984 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-ibm \ + --enable-curl \ + --enable-rss \ + --enable-weather-xoap \ + --enable-imlib2 \ + --disable-lua \ + --enable-wlan \ + + make } -md5sums=('494cbaf1108cfdb977fc80454d9b13e2') +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/extra/conky/current-power.patch b/abs/extra/conky/current-power.patch new file mode 100644 index 0000000..1e7cf5a --- /dev/null +++ b/abs/extra/conky/current-power.patch @@ -0,0 +1,12 @@ +diff -aur old/src/linux.c new/src/linux.c +--- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200 ++++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100 +@@ -1671,6 +1671,8 @@ + the tradition! */ + else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) + sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); ++ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) ++ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) + sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); + else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) |