Fix toluapp issues

3 files changed, 36 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d83bb9d50ffc..af7819a627bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = conky19-lua-nv
 	pkgdesc = An advanced system monitor for X based on torsmo with lua and nvidia enabled
 	pkgver = 1.9.0
-	pkgrel = 8
+	pkgrel = 9
 	url = http://conky.sourceforge.net/
 	install = conky-lua-nv.install
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = pkgconfig
-	makedepends = tolua++
 	makedepends = libxnvctrl
 	makedepends = docbook2x
 	makedepends = docbook-xml
@@ -23,6 +22,7 @@ pkgbase = conky19-lua-nv
 	depends = libxdamage
 	depends = imlib2
 	depends = lua51
+	depends = tolua++
 	optdepends = nvidia: for GT4xx and newer GPUs,
 	optdepends = nvidia-340xx: for G8x, G9x, GT2xx GPUS,
 	optdepends = nvidia-304xx: for GeForce 6/7 GPUs
@@ -34,7 +34,9 @@ pkgbase = conky19-lua-nv
 	backup = etc/conky/conky.conf
 	backup = etc/conky/conky_no_x11.conf
 	source = https://github.com/brndnmtthws/conky/archive/1.9.0.tar.gz
+	source = fix_build.patch
 	md5sums = b13f2c7d52e18d94bfbfcd5157406db7
+	md5sums = 1cdccf70c8e4acb691a0dab785d5f6fc
 
 pkgname = conky19-lua-nv
 
diff --git a/PKGBUILD b/PKGBUILD
index 238f20c6adb2..294956e6a926 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=conky19-lua-nv
 _pkgname=conky
 pkgver=1.9.0
-pkgrel=8
+pkgrel=9
 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,20 +16,27 @@ 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=('pkgconfig' 'tolua++' 'libxnvctrl' 'docbook2x' 'docbook-xml' 'docbook-xsl')
+depends=('alsa-lib' 'libxml2' 'curl' 'cairo' 'wireless_tools' 'libxft' 'glib2'
+         'libxdamage' 'imlib2' 'lua51' 'tolua++')
+makedepends=('pkgconfig' 'libxnvctrl' 'docbook2x' '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=(https://github.com/brndnmtthws/${_pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('b13f2c7d52e18d94bfbfcd5157406db7')
+source=("https://github.com/brndnmtthws/${_pkgname}/archive/${pkgver}.tar.gz"
+        'fix_build.patch')
+md5sums=('b13f2c7d52e18d94bfbfcd5157406db7'
+         '1cdccf70c8e4acb691a0dab785d5f6fc')
 install="conky-lua-nv.install"
 
-build() {
+prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}
-
   sed -i '/#include <curl\/types.h>/d' ${srcdir}/${_pkgname}-${pkgver}/src/ccurl_thread.c
+  patch -p1 -i ../fix_build.patch
+}
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
   ./autogen.sh
   LUA51_LIBS='-llua5.1 -lm' LUA51_CFLAGS='-I/usr/include/lua5.1' \
   LUA_LIBS='-llua5.1 -lm' LUA_CFLAGS="-I/usr/include/lua5.1" \
diff --git a/fix_build.patch b/fix_build.patch
new file mode 100644
index 000000000000..b9e455327b6f
--- /dev/null
+++ b/fix_build.patch
@@ -0,0 +1,18 @@
+--- orig/configure.ac.in	2012-05-04 00:35:33.000000000 +0300
++++ new/configure.ac.in	2015-12-05 12:11:35.769923821 +0200
+@@ -513,12 +513,12 @@
+ 				AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
+ 			fi
+ 		fi
+-		AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1 tolua++-5.1], no)
++		AC_CHECK_PROGS(toluapp, [toluapp tolua++ tolua++5.1 tolua++-5.1], no)
+ 		if test x$toluapp = xno; then
+-			AC_MSG_ERROR([tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
++			AC_MSG_ERROR([toluapp, tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
+ 		else
+ 			AC_SEARCH_LIBS(tolua_error,
+-						   [tolua++-5.1 tolua++ tolua++5.1],
++						   [toluapp tolua++-5.1 tolua++ tolua++5.1],
+ 						   [
+ 							AC_SUBST(tolua_LIBS, "${LIBS}")
+ 							AC_SUBST(tolua_CFLAGS, "${CFLAGS}")