summaryrefslogtreecommitdiff
path: root/extra/conky
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-10-26 23:15:38 +0000
committerroot <root@rshg054.dnsready.net>2011-10-26 23:15:38 +0000
commit84fe155e2233db86fcc13134d8802ba1dab0ae83 (patch)
treeef0f4e11745d4bf9e45ee5fa553dd4b13d6c3407 /extra/conky
parentd03e905f54857600b3c36af9b221c34ccb11074f (diff)
Wed Oct 26 23:15:38 UTC 2011
Diffstat (limited to 'extra/conky')
-rw-r--r--extra/conky/PKGBUILD29
-rw-r--r--extra/conky/PKGBUILD.cmake47
2 files changed, 62 insertions, 14 deletions
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 6ae24ea26..f81d854d0 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z 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.1
-pkgrel=3
-pkgdesc='An advanced, highly configurable system monitor for X based on torsmo'
-arch=('i686' 'x86_64')
+pkgver=1.8.2git20111026
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
url='http://conky.sourceforge.net/'
-license=('custom')
-replaces=('torsmo')
-makedepends=('pkg-config')
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+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=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
- 'current-power.patch')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b')
-sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f'
- '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b')
+# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz
+
+replaces=('torsmo')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../current-power.patch # See FS#21984
+ sh autogen.sh
- ./configure \
+ CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--enable-ibm \
diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake
new file mode 100644
index 000000000..7f980868f
--- /dev/null
+++ b/extra/conky/PKGBUILD.cmake
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z 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.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+ cd "${srcdir}"
+
+ cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git
+ rm -fr build; mkdir build; cd build
+
+ cmake \
+ -D CMAKE_BUILD_TYPE:STRING="Release" \
+ -D MAINTAINER_MODE:BOOL=ON \
+ -D BUILD_CURL:BOOL=ON \
+ -D BUILD_IMLIB2:BOOL=ON \
+ -D BUILD_LUA_IMLIB2:BOOL=OFF \
+ -D BUILD_MYSQL:BOOL=OFF \
+ -D BUILD_RSS:BOOL=ON \
+ -D BUILD_WEATHER_METAR:BOOL=ON \
+ -D BUILD_WEATHER_XOAP:BOOL=ON \
+ -D BUILD_WLAN:BOOL=ON \
+ -D CMAKE_INSTALL_PREFIX:PATH=/usr \
+ ../conky
+
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}"
+}