update

3 files changed, 47 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e746b0942a2..227d8cf532b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,41 @@
+# Generated by mksrcinfo v8
+# Tue May 23 00:25:02 UTC 2017
 pkgbase = conky-lua
 	pkgdesc = Lightweight system monitor for X, with Lua support enabled
-	pkgver = 1.10.1
-	pkgrel = 7
+	pkgver = 1.10.6
+	pkgrel = 1
 	url = http://github.com/brndnmtthws/conky
 	arch = i686
 	arch = x86_64
 	license = BSD
 	license = GPL3
-	makedepends = docbook2x
-	makedepends = perl-xml-libxml
 	makedepends = cmake
-	makedepends = docbook-xsl
+	makedepends = docbook2x
 	makedepends = docbook-xml
+	makedepends = docbook-xsl
+	makedepends = librsvg
+	makedepends = libxinerama
+	makedepends = libxml2
+	makedepends = perl-xml-libxml
 	makedepends = perl-xml-libxml
-	depends = tolua++
 	depends = alsa-lib
-	depends = libxml2
+	depends = cairo
 	depends = curl
-	depends = wireless_tools
-	depends = libxft
 	depends = glib2
-	depends = libxdamage
 	depends = imlib2
+	depends = libxdamage
+	depends = libxft
+	depends = libxml2
 	depends = lua51
-	depends = cairo
-	provides = conky=1.10.1
+	depends = tolua++
+	depends = wireless_tools
+	provides = conky=1.10.6
 	conflicts = conky
-	replaces = torsmo
 	options = !emptydirs
 	backup = etc/conky/conky.conf
 	backup = etc/conky/conky_no_x11.conf
-	source = https://github.com/brndnmtthws/conky/archive/v1.10.1.tar.gz
-	sha1sums = 97b59ec1daf54126b30516e8663a9cf1f218d8ae
+	source = https://github.com/brndnmtthws/conky/archive/v1.10.6.tar.gz
+	sha1sums = 54cb3322dc3a969f1fda03383012c61d57261345
 
 pkgname = conky-lua
 
diff --git a/PKGBUILD b/PKGBUILD
index 57650ad1853f..436a2bda0771 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,40 @@
+# Maintainer: Bernhard Landauer <oberon@manjaro.org>
 # Maintainer: TidestManager1 < michaelpulliam1 (at) gmail (dot) com > 
+
 pkgname=conky-lua
 _pkgname=conky
-pkgver=1.10.1
-pkgrel=7
+pkgver=1.10.6
+pkgrel=1
 pkgdesc='Lightweight system monitor for X, with Lua support enabled'
 url='http://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL3')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
-makedepends=('docbook2x' 'perl-xml-libxml' 'cmake' 'docbook-xsl' 'docbook-xml' 'perl-xml-libxml')
-depends=('tolua++' 'alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua51' 'cairo')
-provides=('conky=1.10.1')
+makedepends=('cmake'
+    'docbook2x'
+    'docbook-xml'
+    'docbook-xsl'
+    'librsvg'
+    'libxinerama'
+    'libxml2'
+    'man-db'
+    'perl-xml-libxml')
+depends=('alsa-lib'
+    'cairo'
+    'curl'
+    'glib2'
+    'imlib2'
+    'libxdamage'
+    'libxft'
+    'libxml2'
+    'lua51'
+    'tolua++'
+    'wireless_tools')
+provides=("conky=$pkgver")
 conflicts=('conky')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
 source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz")
-sha1sums=('97b59ec1daf54126b30516e8663a9cf1f218d8ae')
- 
-replaces=('torsmo')
+sha1sums=('54cb3322dc3a969f1fda03383012c61d57261345')
  
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -35,10 +53,9 @@ build() {
         -D BUILD_WEATHER_METAR=ON \
         -D BUILD_WEATHER_XOAP=ON \
         -D BUILD_XDBE=ON \
-	-D BUILD_WLAN=ON \
+        -D BUILD_WLAN=ON \
         .
- 
- 
+
     make
 }
  
@@ -50,8 +67,3 @@ package() {
     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
 }
- 
-prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    patch -p1 -i ${startdir}/fix_build.patch
-}
diff --git a/fix_build.patch b/fix_build.patch
deleted file mode 100644
index d7d9c5ea6b43..000000000000
--- a/fix_build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- orig/cmake/ConkyPlatformChecks.cmake	2015-12-03 12:52:37.391221762 +0200
-+++ new/cmake/ConkyPlatformChecks.cmake	2015-12-03 12:53:30.102200472 +0200
-@@ -249,7 +249,7 @@
- 	endif(X11_FOUND)
- endif(BUILD_X11)
- 
--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)
- set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
- set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS})
- link_directories(${LUA_LIBRARY_DIRS})
-@@ -332,7 +332,7 @@
- 	find_library(XNVCtrl_LIB NAMES XNVCtrl)
- 	if(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB)
- 		set(XNVCtrl_FOUND true)
--		set(conky_libs ${conky_libs} ${XNVCtrl_LIB})
-+		set(conky_libs ${XNVCtrl_LIB} ${conky_libs})
- 		set(conky_includes ${conky_includes} ${XNVCtrl_INCLUDE_PATH})
- 	else(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB)
- 		message(FATAL_ERROR "Unable to find XNVCtrl library")
-@@ -365,11 +365,11 @@
- endif(WANT_LIBXML2)
- 
- if(WANT_TOLUA)
--	find_program(APP_TOLUA NAMES tolua++ tolua++5.1 tolua++-5.1)
-+	find_program(APP_TOLUA NAMES toluapp tolua++ tolua++5.1 tolua++-5.1)
- 	if(NOT APP_TOLUA)
- 		message(FATAL_ERROR "Unable to find program 'tolua++'")
- 	endif(NOT APP_TOLUA)
--	find_library(TOLUA_LIBS NAMES tolua++ tolua++5.1 tolua++-5.1)
-+	find_library(TOLUA_LIBS NAMES toluapp tolua++ tolua++5.1 tolua++-5.1)
- 	find_path(TOLUA_INCLUDE_PATH tolua++.h ${INCLUDE_SEARCH_PATH})
- 	if(TOLUA_INCLUDE_PATH AND TOLUA_LIBS)
- 		set(TOLUA_FOUND true)