Update to v1.10

1 files changed, 44 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a223605e25af..e2afaa92791c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=conky-lua-nv
 _pkgname=conky
-pkgver=1.9.0
-pkgrel=7
+pkgver=1.10.0
+pkgrel=3
 pkgdesc="An advanced system monitor for X based on torsmo with lua and nvidia enabled"
 arch=('i686' 'x86_64')
 url="http://conky.sourceforge.net/"
@@ -16,34 +16,55 @@ license=('custom')
 replaces=('torsmo' 'conky')
 conflicts=('conky')
 provides=('conky' 'conky-lua')
-depends=('alsa-lib' 'libxml2' 'curl' 'cairo' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua51' )
-makedepends=('docbook2x' 'libxnvctrl' 'tolua++' 'perl-xml-libxml')
+depends=('alsa-lib' 'libxml2' 'curl' 'cairo' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua' )
+makedepends=('docbook2x' 'libxnvctrl' 'tolua++' 'perl-xml-libxml' 'docbook-xml' 'docbook-xsl')
 optdepends=('nvidia: for GT4xx and newer GPUs',
   'nvidia-340xx: for G8x, G9x, GT2xx GPUS',
   'nvidia-304xx: for GeForce 6/7 GPUs')
-backup=(etc/conky/conky.conf etc/conky/conky_no_x11.conf)
-source=(http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
-      md5sums=('d3de615f43aadc98d555e05ad9e902c2')
-install="conky-lua-nv.install"
+source=(https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz
+        ascii.patch
+        lua53.patch
+        ipv6.patch
+        curl.patch)
+sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
+          '96cdbc38e8706c8a3120601983df5c7265716128'
+          'a3a74542b6524e5663ad37aaba292b48e8bea3b1'
+          'a0899973483d0ad664b60e58b3ba899ba88712af'
+          '1c066b439a1e7166d733fb710faa9bf08b81ce4c')
+options=('!strip' 'debug')
+install=('conky-lua-nv.install')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  patch -p1 -i ../ascii.patch
+  patch -p1 -i ../lua53.patch
+  patch -p1 -i ../ipv6.patch
+  patch -p1 -i ../curl.patch
+
+  cd cmake
+  # -lXext must come *after* -lXNVCtrl
+  sed -i -e \
+    's/set(conky_libs ${conky_libs} ${XNVCtrl_LIB})/set(conky_libs ${XNVCtrl_LIB} ${conky_libs})/' \
+    ConkyPlatformChecks.cmake
+}
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
-  LUA51_LIBS='-llua5.1 -lm' LUA51_CFLAGS='-I/usr/include/lua5.1' \
-  LUA_LIBS='-llua5.1 -lm' LUA_CFLAGS="-I/usr/include/lua5.1" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-wlan \
-              --enable-curl \
-              --enable-rss \
-              --enable-ibm \
-              --enable-imlib2 \
-              --enable-lua \
-              --enable-lua-cairo \
-              --enable-lua-imlib2 \
-              --enable-ibm \
-              --enable-weather-xoap \
-              --enable-nvidia
+  cmake \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D MAINTAINER_MODE=ON \
+    -D BUILD_CURL=ON \
+    -D BUILD_IMLIB2=ON \
+    -D BUILD_RSS=ON \
+    -D BUILD_WEATHER_METAR=ON \
+    -D BUILD_WEATHER_XOAP=ON \
+    -D BUILD_WLAN=ON \
+    -D BUILD_NVIDIA=ON \
+    -D BUILD_XDBE=ON \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    .
+
   make
 }