Date: Sunday, October 23, 2011 @ 20:40:26 Author: bisson Revision: 141102
switch to upstream git snapshot Added: conky/trunk/PKGBUILD.cmake Modified: conky/trunk/PKGBUILD Deleted: conky/trunk/current-power.patch ---------------------+ PKGBUILD | 27 ++++++++++++++------------- PKGBUILD.cmake | 47 +++++++++++++++++++++++++++++++++++++++++++++++ current-power.patch | 12 ------------ 3 files changed, 61 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-23 23:38:04 UTC (rev 141101) +++ PKGBUILD 2011-10-24 00:40:26 UTC (rev 141102) @@ -5,28 +5,29 @@ # Maintainer: Gaetan Bisson <bis...@archlinux.org> pkgname=conky -pkgver=1.8.1 -pkgrel=3 -pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' +pkgver=1.8.2git20111024 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' +url='http://conky.sourceforge.net/' +license=('BSD' 'GPL') arch=('i686' 'x86_64') -url='http://conky.sourceforge.net/' -license=('custom') -replaces=('torsmo') -makedepends=('pkg-config') +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=('490f5ffb431bffee71f7bf32f94cf611ae4f0646') -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 \ Added: PKGBUILD.cmake =================================================================== --- PKGBUILD.cmake (rev 0) +++ PKGBUILD.cmake 2011-10-24 00:40:26 UTC (rev 141102) @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: James Rayner <ja...@archlinux.org> +# Contributor: Partha Chowdhury <kira.lau...@gmail.com> +# Maintainer: Gaetan Bisson <bis...@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}" +} Deleted: current-power.patch =================================================================== --- current-power.patch 2011-10-23 23:38:04 UTC (rev 141101) +++ current-power.patch 2011-10-24 00:40:26 UTC (rev 141102) @@ -1,12 +0,0 @@ -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)
