Enable rsvg, cairo and imlib2 lua bindings; force lua 5.1

Lua 5.1 is required to enable the build of rsvg, cairo and imlib2
bindings. With newer versions there are linking errors.

2 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b3eb5c903de..4461bbc94f3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = conky-lua-nv
 	pkgdesc = An advanced system monitor for X based on torsmo with lua and nvidia enabled
 	pkgver = 1.10.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/brndnmtthws/conky
 	install = conky-lua-nv.install
 	arch = i686
@@ -22,7 +22,7 @@ pkgbase = conky-lua-nv
 	depends = glib2
 	depends = libxdamage
 	depends = imlib2
-	depends = lua
+	depends = lua51
 	optdepends = nvidia: for GT4xx and newer GPUs,
 	optdepends = nvidia-340xx: for G8x, G9x, GT2xx GPUS,
 	optdepends = nvidia-304xx: for GeForce 6/7 GPUs
@@ -35,12 +35,10 @@ pkgbase = conky-lua-nv
 	options = debug
 	source = https://github.com/brndnmtthws/conky/archive/v1.10.0.tar.gz
 	source = ascii.patch
-	source = lua53.patch
 	source = ipv6.patch
 	source = curl.patch
 	sha1sums = d5863420150150002947180d0ee96c9ef56c43b1
 	sha1sums = 96cdbc38e8706c8a3120601983df5c7265716128
-	sha1sums = a3a74542b6524e5663ad37aaba292b48e8bea3b1
 	sha1sums = a0899973483d0ad664b60e58b3ba899ba88712af
 	sha1sums = 1c066b439a1e7166d733fb710faa9bf08b81ce4c
 
diff --git a/PKGBUILD b/PKGBUILD
index ef20f29147e5..3aded0edcaf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=conky-lua-nv
 _pkgname=conky
 pkgver=1.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced system monitor for X based on torsmo with lua and nvidia enabled"
 arch=('i686' 'x86_64')
 url="https://github.com/brndnmtthws/conky"
@@ -16,19 +16,17 @@ license=('custom')
 replaces=('torsmo' 'conky')
 conflicts=('conky')
 provides=('conky' 'conky-lua')
-depends=('alsa-lib' 'libxml2' 'curl' 'cairo' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua' )
+depends=('alsa-lib' 'libxml2' 'curl' 'cairo' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua51' )
 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')
 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')
@@ -37,7 +35,6 @@ 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
 
@@ -46,6 +43,9 @@ prepare() {
   sed -i -e \
     's/set(conky_libs ${conky_libs} ${XNVCtrl_LIB})/set(conky_libs ${XNVCtrl_LIB} ${conky_libs})/' \
     ConkyPlatformChecks.cmake
+  sed -i -e \
+    's/pkg_search_module(LUA REQUIRED lua5.2 lua-5.2 lua>=5.1 lua5.1 lua-5.1)/pkg_search_module(LUA REQUIRED lua=5.1 lua5.1 lua-5.1)/' \
+    ConkyPlatformChecks.cmake
 }
 
 build() {
@@ -55,6 +55,9 @@ build() {
     -D CMAKE_BUILD_TYPE=Release \
     -D MAINTAINER_MODE=ON \
     -D BUILD_CURL=ON \
+    -D BUILD_LUA_RSVG=ON \
+    -D BUILD_LUA_CAIRO=ON \
+    -D BUILD_LUA_IMLIB2=ON \
     -D BUILD_IMLIB2=ON \
     -D BUILD_RSS=ON \
     -D BUILD_WEATHER_METAR=ON \