From 05efe6672ae73bc2ff3342e0a8295e754463a2a3 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 13 Aug 2019 19:16:19 +0200
Subject: [PATCH] conky: update to 1.11.4.

---
 srcpkgs/conky/patches/noreadme.patch | 35 +++++++++++++++++-----------
 srcpkgs/conky/template               |  6 ++---
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/conky/patches/noreadme.patch b/srcpkgs/conky/patches/noreadme.patch
index f9952ca4f0..14852b9758 100644
--- a/srcpkgs/conky/patches/noreadme.patch
+++ b/srcpkgs/conky/patches/noreadme.patch
@@ -1,14 +1,23 @@
---- cmake/Docbook.cmake.orig
+--- cmake/Docbook.cmake
 +++ cmake/Docbook.cmake
-@@ -74,11 +74,6 @@
- 			COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml
- 			COMMAND ${APP_DB2X_MANXML} --encoding=utf-8 ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
- 			COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
--			COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README
--			COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README
--			COMMAND ${APP_SED} -i "s/\\xE2//g" ${CMAKE_SOURCE_DIR}/README
--			COMMAND ${APP_SED} -i "s/\\x80//g" ${CMAKE_SOURCE_DIR}/README
--			COMMAND ${APP_SED} -i "s/\\x90/-/g" ${CMAKE_SOURCE_DIR}/README
- 			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml
- 			COMMENT "Proccessing man page for ${FIL}"
- 			)
+@@ -66,7 +66,6 @@
+       add_custom_command(
+         OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
+                ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1
+-               ${CMAKE_SOURCE_DIR}/README
+         COMMAND ${APP_XSLTPROC}
+                 ${CMAKE_SOURCE_DIR}/doc/docbook-xml/html/docbook.xsl
+                 ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml >
+@@ -82,12 +81,7 @@
+                 ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
+         COMMAND ${APP_MAN} -P '${APP_LESS} -is'
+                 ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 >
+-                ${CMAKE_SOURCE_DIR}/README
+         COMMAND ${APP_SED} -i'' -e 's/[[:cntrl:]]\\[[0-9]*m//g'
+-                ${CMAKE_SOURCE_DIR}/README
+-        COMMAND ${APP_SED} -i'' -e 's/\\xE2//g' ${CMAKE_SOURCE_DIR}/README
+-        COMMAND ${APP_SED} -i'' -e 's/\\x80//g' ${CMAKE_SOURCE_DIR}/README
+-        COMMAND ${APP_SED} -i'' -e 's/\\x90/-/g' ${CMAKE_SOURCE_DIR}/README
+         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml
+         COMMENT "Proccessing man page for ${FIL}")
+       add_custom_target(${FIL} ALL
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 72a0aac5b2..8f2dfaaf8b 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.11.1
+version=1.11.4
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -11,14 +11,14 @@ configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON
  -DBUILD_XSHAPE=ON"
 hostmakedepends="libtool pkg-config docbook2x man-db git toluapp"
 makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel
- libXinerama-devel libcurl-devel librsvg-devel lua51-devel toluapp-devel
+ libXinerama-devel libcurl-devel librsvg-devel lua-devel toluapp-devel
  wireless_tools-devel"
 short_desc="Lightweight system monitor for X"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=71fab859946cc2e67be46f2db53859c66369c5c87acf18fc8dfbd41b114f6d6e
+checksum=344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48
 
 do_install() {
 	make -C build DESTDIR=${DESTDIR} install