Update to 1.10.0

1 files changed, 32 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ed24cb0c9e8c..14c6bae4297f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,41 +5,53 @@
 
 _pkgname=conky
 pkgname=conky-cli
-pkgver=1.9.0
-pkgrel=4
-pkgdesc="Conky command line, without X11 dependencies"
+pkgver=1.10.0
+pkgrel=1
+pkgdesc="Lightweight system monitor for X, without X11 dependencies"
 url="http://conky.sourceforge.net/"
 license=('BSD' 'GPL')
 arch=('i686' 'x86_64')
 provides=('conky')
 conflicts=('conky')
-depends=('ncurses' 'wireless_tools')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db')
+depends=('curl' 'lua' 'wireless_tools' 'libxml2')
+source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz"
+        'ascii.patch'
+        'lua53.patch')
+md5sums=('cdc0298e5f257829d574ae8114170d9b'
+         'd5b765cb7400d2fdca88b6c86aa8eec1'
+         '44cdadfe92266e99698e5424b7c6e265')
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars
+	patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
+}
 
 build() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  ./configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --disable-lua --disable-x11 \
-      --disable-double-buffer \
-      --disable-xdamage \
-      --disable-own-window \
-      --disable-xft \
-      --disable-hddtemp \
-      --disable-portmon \
-      --enable-wlan \
-      --enable-weather-xoap \
+	cmake \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D MAINTAINER_MODE=ON \
+        -D BUILD_HDDTEMP=OFF \
+        -D BUILD_PORT_MONITORS=OFF \
+		-D BUILD_WEATHER_METAR=ON \
+		-D BUILD_WEATHER_XOAP=ON \
+        -D BUILD_X11=OFF \
+        -D BUILD_XDAMAGE=OFF \
+        -D BUILD_XFT=OFF \
+		-D BUILD_WLAN=ON \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		.
 
-  make
+	make
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
 	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
 }
-md5sums=('1c8e715a2784d4d799f5fc0213e76d0f')