Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.

[DragonGhost7 <DragonGhost7@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

There is an updated pull request by DragonGhost7 against master on the void-packages repository

https://github.com/DragonGhost7/void-packages conky
https://github.com/void-linux/void-packages/pull/40237

Conky: update to 1.15.0, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**



- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/40237.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-conky-40237.patch --]
[-- Type: text/x-diff, Size: 4512 bytes --]

From c41a9bc95f1d8f54a2f3285a33ecb82286574ee5 Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Sun, 30 Oct 2022 20:33:52 -0400
Subject: [PATCH 1/2] conky-cli: update to 1.15.0, adopt.

---
 srcpkgs/conky-cli/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 58279fa4dfb4..a3c7ba970a8c 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,24 +1,27 @@
 # Template file for 'conky-cli'
 # Keep in sync with 'conky'
 pkgname=conky-cli
-version=1.13.1
+version=1.15.0
 revision=1
+archs="~i686*"
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
 configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
- -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
- -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
- -DBUILD_DOCS=ON"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON
+ -DBUILD_XDBE=OFF -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF
+ -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON"
 hostmakedepends="libtool pkg-config docbook2x man-db"
 makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel
  ncurses-devel wireless_tools-devel"
 short_desc="Conky command line without X11"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 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=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
+distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
+https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
+checksum="bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"
@@ -35,4 +38,5 @@ post_install() {
 	mv ${DESTDIR}/usr/share/doc/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky-cli/convert.lua
 	vlicense COPYING
+	vman ../conky.1
 }

From 30dcaf315e54fc26f1cbd7599b6555691c166cec Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Sun, 30 Oct 2022 20:35:11 -0400
Subject: [PATCH 2/2] conky: update to 1.15.0, adopt.

---
 srcpkgs/conky/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..da2e3e2a3aa3 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,25 +1,28 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
+archs="~i686*"
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
 configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
  -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
  -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON
- -DBUILD_XSHAPE=ON -DBUILD_DOCS=ON"
+ -DBUILD_XSHAPE=ON"
 hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
 makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel
  libXinerama-devel libcurl-devel librsvg-devel lua53-devel ncurses-devel
  toluapp-devel wireless_tools-devel"
 short_desc="Lightweight system monitor for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 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=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
+distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
+https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
+checksum="bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
 
 post_install() {
 	vmkdir etc/conky
@@ -27,4 +30,5 @@ post_install() {
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
 	vlicense COPYING
+	vman ../conky.1
 }