Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Conky: update to 1.15.0, adopt.
@ 2022-10-31  1:14 DragonGhost7
  2022-10-31  1:41 ` [PR PATCH] [Updated] " DragonGhost7
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-10-31  1:14 UTC (permalink / raw)
  To: ml

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

There is a new 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: 3600 bytes --]

From 954fbde00d855cd24b35a183764fc88c156e285f 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 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 58279fa4dfb4..b314200761f0 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'conky-cli'
 # Keep in sync with 'conky'
 pkgname=conky-cli
-version=1.13.1
+version=1.15.0
 revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
@@ -10,15 +10,16 @@ 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"
-hostmakedepends="libtool pkg-config docbook2x man-db"
+hostmakedepends="python3 python3-yaml python3-Jinja2 libtool
+ pkg-config docbook2x man-db"
 makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel
- ncurses-devel wireless_tools-devel"
+ ncurses-devel wireless_tools-devel pandoc"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"

From b2d4de1b819d4946b0efb4ed8934a995035adcb1 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 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..073c5a1fa355 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,7 +1,7 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -10,16 +10,17 @@ configure_args="-DMAINTAINER_MODE=ON -DRELEASE=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"
-hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
+hostmakedepends="python3 python3-yaml python3-Jinja2
+ 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"
+ toluapp-devel wireless_tools-devel pandoc"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
 
 post_install() {
 	vmkdir etc/conky

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
@ 2022-10-31  1:41 ` DragonGhost7
  2022-10-31  2:30 ` DragonGhost7
                   ` (20 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-10-31  1:41 UTC (permalink / raw)
  To: ml

[-- 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: 3888 bytes --]

From fe5d0320650afae28fea32f1de06df021c10fb6c 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 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 58279fa4dfb4..7880ffebbd55 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'conky-cli'
 # Keep in sync with 'conky'
 pkgname=conky-cli
-version=1.13.1
+version=1.15.0
 revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
@@ -10,15 +10,23 @@ 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"
-hostmakedepends="libtool pkg-config docbook2x man-db"
+hostmakedepends="python3 python3-yaml python3-Jinja2 libtool
+ pkg-config docbook2x man-db $(vopt_if man pandoc)"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
+esac
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"

From ef35abcda3dc57672725e12179b3bfc5a1cf2431 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 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..295d9250e867 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,7 +1,7 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -10,16 +10,24 @@ configure_args="-DMAINTAINER_MODE=ON -DRELEASE=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"
-hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
+hostmakedepends="python3 python3-yaml python3-Jinja2
+ libtool pkg-config docbook2x man-db toluapp $(vopt_if man pandoc)"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
+esac
 
 post_install() {
 	vmkdir etc/conky

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
  2022-10-31  1:41 ` [PR PATCH] [Updated] " DragonGhost7
@ 2022-10-31  2:30 ` DragonGhost7
  2022-11-04 18:38 ` [PR REVIEW] " paper42
                   ` (19 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-10-31  2:30 UTC (permalink / raw)
  To: ml

[-- 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: 4038 bytes --]

From 3cdc78d1ce66a0de436a903864143b1f3354b7f9 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 | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 58279fa4dfb4..2c35f8028be7 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,8 +1,9 @@
 # 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"
@@ -10,15 +11,23 @@ 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"
-hostmakedepends="libtool pkg-config docbook2x man-db"
+hostmakedepends="python3 python3-yaml python3-Jinja2 libtool
+ pkg-config docbook2x man-db $(vopt_if man pandoc)"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
+esac
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"

From 34e8177e4ef9ab7b687ac86d056af682c1a638ba 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 | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..9af8f196f953 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,8 +1,9 @@
 # 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
@@ -10,16 +11,24 @@ configure_args="-DMAINTAINER_MODE=ON -DRELEASE=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"
-hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
+hostmakedepends="python3 python3-yaml python3-Jinja2
+ libtool pkg-config docbook2x man-db toluapp $(vopt_if man pandoc)"
 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
+checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
+esac
 
 post_install() {
 	vmkdir etc/conky

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
  2022-10-31  1:41 ` [PR PATCH] [Updated] " DragonGhost7
  2022-10-31  2:30 ` DragonGhost7
@ 2022-11-04 18:38 ` paper42
  2022-11-04 21:20 ` DragonGhost7
                   ` (18 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-11-04 18:38 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014346152

Comment:
or we could get the prebuilt manpage from `https://github.com/brndnmtthws/conky/releases/download/v1.15.0/conky.1.gz`

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (2 preceding siblings ...)
  2022-11-04 18:38 ` [PR REVIEW] " paper42
@ 2022-11-04 21:20 ` DragonGhost7
  2022-11-05  4:37 ` [PR PATCH] [Updated] " DragonGhost7
                   ` (17 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-04 21:20 UTC (permalink / raw)
  To: ml

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

New review comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014474927

Comment:
Not building the man pages is a good idea, but originally i imagine there were 2 templates because they have different configure_args. But that can be fitted into one, just like vim, so there should be no problem there.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (3 preceding siblings ...)
  2022-11-04 21:20 ` DragonGhost7
@ 2022-11-05  4:37 ` DragonGhost7
  2022-11-05  4:37 ` DragonGhost7
                   ` (16 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-05  4:37 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (4 preceding siblings ...)
  2022-11-05  4:37 ` [PR PATCH] [Updated] " DragonGhost7
@ 2022-11-05  4:37 ` DragonGhost7
  2022-11-05  4:37 ` DragonGhost7
                   ` (15 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-05  4:37 UTC (permalink / raw)
  To: ml

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

New comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1304403011

Comment:
Update: I pulling the man pages is no problem, but since conky is built using cmake, configuring it and building 2 different packages by hand is incredibly difficult and results in incredibly long/complicated/not working templates. I believe it will be better to keep them as 2 different templates.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (5 preceding siblings ...)
  2022-11-05  4:37 ` DragonGhost7
@ 2022-11-05  4:37 ` DragonGhost7
  2022-11-05 17:50 ` [PR REVIEW] " paper42
                   ` (14 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-05  4:37 UTC (permalink / raw)
  To: ml

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

New comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1304403011

Comment:
Update: Pulling the man pages is no problem, but since conky is built using cmake, configuring it and building 2 different packages by hand is incredibly difficult and results in incredibly long/complicated/not working templates. I believe it will be better to keep them as 2 different templates.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (6 preceding siblings ...)
  2022-11-05  4:37 ` DragonGhost7
@ 2022-11-05 17:50 ` paper42
  2022-11-05 17:50 ` paper42
                   ` (13 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-11-05 17:50 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014670801

Comment:
why?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (7 preceding siblings ...)
  2022-11-05 17:50 ` [PR REVIEW] " paper42
@ 2022-11-05 17:50 ` paper42
  2022-11-05 17:50 ` paper42
                   ` (12 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-11-05 17:50 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014671068

Comment:
```suggestion
 https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
```

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (8 preceding siblings ...)
  2022-11-05 17:50 ` paper42
@ 2022-11-05 17:50 ` paper42
  2022-11-05 18:10 ` DragonGhost7
                   ` (11 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-11-05 17:50 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014670865

Comment:
we should use create_wrksrc=yes to make sure everything is in one directory that gets cleaned after the build

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (9 preceding siblings ...)
  2022-11-05 17:50 ` paper42
@ 2022-11-05 18:10 ` DragonGhost7
  2022-11-05 18:31 ` paper42
                   ` (10 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-05 18:10 UTC (permalink / raw)
  To: ml

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

New review comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014673405

Comment:
Because it uses long instead if int_32 and so it doesn't pass tests on 32 bit platforms.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (10 preceding siblings ...)
  2022-11-05 18:10 ` DragonGhost7
@ 2022-11-05 18:31 ` paper42
  2022-11-05 19:19 ` DragonGhost7
                   ` (9 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: paper42 @ 2022-11-05 18:31 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014675767

Comment:
Is that new in this release? Can we patch it? Do they know about it? Does that also apply to other 32bit archs? Starting to ignore an entire arch is not really nice.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR REVIEW] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (11 preceding siblings ...)
  2022-11-05 18:31 ` paper42
@ 2022-11-05 19:19 ` DragonGhost7
  2022-11-22  2:43 ` [PR PATCH] [Updated] " DragonGhost7
                   ` (8 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-05 19:19 UTC (permalink / raw)
  To: ml

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

New review comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#discussion_r1014696363

Comment:
The part that fails, the gradient test respectively gradienth have been added just 23 days ago, so that is a very recent addition. It is not present in 1140 that version should build with no patch for 32 bit systems too (I think, I didn't build it yet)

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (12 preceding siblings ...)
  2022-11-05 19:19 ` DragonGhost7
@ 2022-11-22  2:43 ` DragonGhost7
  2022-11-22  4:54 ` DragonGhost7
                   ` (7 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  2:43 UTC (permalink / raw)
  To: ml

[-- 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: 6811 bytes --]

From 11f0366168742dd5b777479557f879abd853675b Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.14.0, merge with conky-cli, adopt.

---
 srcpkgs/conky-cli          |  1 +
 srcpkgs/conky-cli/template | 37 ------------------
 srcpkgs/conky-cli/update   |  2 -
 srcpkgs/conky/template     | 80 +++++++++++++++++++++++++++++++++-----
 4 files changed, 71 insertions(+), 49 deletions(-)
 create mode 120000 srcpkgs/conky-cli
 delete mode 100644 srcpkgs/conky-cli/template
 delete mode 100644 srcpkgs/conky-cli/update

diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-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"
-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>"
-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
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
-	sed -i -e '1iinclude(CheckIncludeFile)' \
-		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
-		cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
-	vmkdir etc/conky
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
-	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
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..a4891c6d9e3a 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,90 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.14.0
 revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
 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"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=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="36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
 
-post_install() {
+post_extract() {
+	cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+	sed -i -e '1iinclude(CheckIncludeFile)' \
+		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
+		${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+	cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cd ${pkgname}-${version}
+	mkdir -p build; cd build
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} ${configure_args} ${_x11_args} ..
+
+	cd ${wrksrc}/${pkgname}-cli-${version}
+	mkdir -p build; cd build
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} ${configure_args} ${_no_x11_args} ..
+}
+
+do_build() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} test
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} test
+}
+
+do_install() {
+	cd ${pkgname}-${version}/build
+	DESTDIR=${DESTDIR} ninja ${make_install_args} install
 	vmkdir etc/conky
 	mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
-	vlicense COPYING
+	vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+	vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+	short_desc="Conky command line without X11"
+	provides="conky-${version}_${revision}"
+	conflicts="conky>=0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-cli-${version}/build
+		DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+		vmkdir etc/conky
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+		rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+		vlicense ${wrksrc}/${pkgname}-cli-${version}/COPYING
+		vman ${wrksrc}/conky.1
+	}
 }

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (13 preceding siblings ...)
  2022-11-22  2:43 ` [PR PATCH] [Updated] " DragonGhost7
@ 2022-11-22  4:54 ` DragonGhost7
  2022-11-22  5:46 ` DragonGhost7
                   ` (6 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  4:54 UTC (permalink / raw)
  To: ml

[-- 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: 10135 bytes --]

From 629f66567310c9b503349d41b60373ef6c467042 Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.14.0, merge with conky-cli, adopt.

---
 srcpkgs/conky-cli          |   1 +
 srcpkgs/conky-cli/template |  37 --------
 srcpkgs/conky-cli/update   |   2 -
 srcpkgs/conky/template     | 176 ++++++++++++++++++++++++++++++++++---
 4 files changed, 167 insertions(+), 49 deletions(-)
 create mode 120000 srcpkgs/conky-cli
 delete mode 100644 srcpkgs/conky-cli/template
 delete mode 100644 srcpkgs/conky-cli/update

diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-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"
-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>"
-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
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
-	sed -i -e '1iinclude(CheckIncludeFile)' \
-		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
-		cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
-	vmkdir etc/conky
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
-	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
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..5ab1b1d8bd42 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,186 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.14.0
 revision=1
+create_wrksrc=yes
 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"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=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/v1.15.0/conky.1.gz"
+checksum="36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
 
-post_install() {
+post_extract() {
+	cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+	sed -i -e '1iinclude(CheckIncludeFile)' \
+		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
+		${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+	cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cd ${pkgname}-${version}
+	mkdir -p build; cd build
+
+	# if [ -z "$CHROOT_READY" ]; then
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		# cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake"
+	fi
+
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args}  -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake ${configure_args} ${_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+
+	cd ${wrksrc}/${pkgname}-cli-${version}
+	mkdir -p build; cd build
+
+	# if [ -z "$CHROOT_READY" ]; then
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		# cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-cli-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake"
+	fi
+
+
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-cli-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake ${configure_args} ${_no_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+}
+
+do_build() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} test
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} test
+}
+
+do_install() {
+	cd ${pkgname}-${version}/build
+	DESTDIR=${DESTDIR} ninja ${make_install_args} install
 	vmkdir etc/conky
 	mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
-	vlicense COPYING
+	vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+	vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+	short_desc="Conky command line without X11"
+	provides="conky-${version}_${revision}"
+	conflicts="conky>=0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}/build
+		DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+		vmkdir etc/conky
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+		rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+		vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+		vman ${wrksrc}/conky.1
+	}
 }

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (14 preceding siblings ...)
  2022-11-22  4:54 ` DragonGhost7
@ 2022-11-22  5:46 ` DragonGhost7
  2022-11-22  5:51 ` DragonGhost7
                   ` (5 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  5:46 UTC (permalink / raw)
  To: ml

[-- 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: 9843 bytes --]

From c87a6398c54f43a751f9e07897a667da287b2d40 Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.15.0, merge with conky-cli, adopt.

---
 srcpkgs/conky-cli          |   1 +
 srcpkgs/conky-cli/template |  37 --------
 srcpkgs/conky-cli/update   |   2 -
 srcpkgs/conky/template     | 174 ++++++++++++++++++++++++++++++++++---
 4 files changed, 165 insertions(+), 49 deletions(-)
 create mode 120000 srcpkgs/conky-cli
 delete mode 100644 srcpkgs/conky-cli/template
 delete mode 100644 srcpkgs/conky-cli/update

diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-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"
-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>"
-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
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
-	sed -i -e '1iinclude(CheckIncludeFile)' \
-		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
-		cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
-	vmkdir etc/conky
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
-	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
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..a1e6f632e114 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,184 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
+create_wrksrc=yes
 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"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=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"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
 
-post_install() {
+post_extract() {
+	cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+	sed -i -e '1iinclude(CheckIncludeFile)' \
+		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
+		${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+	cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cd ${pkgname}-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args}  -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+
+	cd ${wrksrc}/${pkgname}-cli-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-cli-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_no_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+}
+
+do_build() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} test
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} test
+}
+
+do_install() {
+	cd ${pkgname}-${version}/build
+	DESTDIR=${DESTDIR} ninja ${make_install_args} install
 	vmkdir etc/conky
 	mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
-	vlicense COPYING
+	vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+	vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+	short_desc="Conky command line without X11"
+	provides="conky-${version}_${revision}"
+	conflicts="conky>=0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}/build
+		DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+		vmkdir etc/conky
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+		rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+		vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+		vman ${wrksrc}/conky.1
+	}
 }

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (15 preceding siblings ...)
  2022-11-22  5:46 ` DragonGhost7
@ 2022-11-22  5:51 ` DragonGhost7
  2022-11-22  5:53 ` DragonGhost7
                   ` (4 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  5:51 UTC (permalink / raw)
  To: ml

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

New comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1323122563

Comment:
Both packages put inside a single template, its messy but  its basically the do_configure settings for cross compiling for cmake.

v1.14.0 compiles correctly and passes all the tests just fine, v1.15.0 fails for i686 because of improper variable types in the newest addition.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (16 preceding siblings ...)
  2022-11-22  5:51 ` DragonGhost7
@ 2022-11-22  5:53 ` DragonGhost7
  2022-11-22  6:03 ` DragonGhost7
                   ` (3 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  5:53 UTC (permalink / raw)
  To: ml

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

New comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1323122563

Comment:
Both packages put inside a single template, its messy but  its basically the do_configure settings for cross compiling for cmake.

v1.14.0 compiles correctly and passes all the tests just fine, v1.15.0 fails for i686 because of improper variable types in the newest version.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (17 preceding siblings ...)
  2022-11-22  5:53 ` DragonGhost7
@ 2022-11-22  6:03 ` DragonGhost7
  2022-11-23  1:21 ` [PR PATCH] [Updated] " DragonGhost7
                   ` (2 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-22  6:03 UTC (permalink / raw)
  To: ml

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

New comment by DragonGhost7 on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1323122563

Comment:
Both packages put inside a single template, its messy but  its basically the do_configure settings for cross compiling for cmake.

v1.14.0 compiles correctly and passes all the tests just fine, v1.15.0 fails for i686 because of improper variable types in the newest version.

For now, i can't find an upstream fix for that, so do you think we should restrict the package to only non-i686 platforms, or instead of bumping it to v1.15.0 we do v1.14.0 instead?

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (18 preceding siblings ...)
  2022-11-22  6:03 ` DragonGhost7
@ 2022-11-23  1:21 ` DragonGhost7
  2023-02-21  2:02 ` github-actions
  2023-03-07  2:07 ` [PR PATCH] [Closed]: " github-actions
  21 siblings, 0 replies; 23+ messages in thread
From: DragonGhost7 @ 2022-11-23  1:21 UTC (permalink / raw)
  To: ml

[-- 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: 9859 bytes --]

From 306a33d327590dbcac69cff37655e25aefc114d3 Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.15.0, merge with conky-cli, adopt.

---
 srcpkgs/conky-cli          |   1 +
 srcpkgs/conky-cli/template |  37 --------
 srcpkgs/conky-cli/update   |   2 -
 srcpkgs/conky/template     | 175 ++++++++++++++++++++++++++++++++++---
 4 files changed, 166 insertions(+), 49 deletions(-)
 create mode 120000 srcpkgs/conky-cli
 delete mode 100644 srcpkgs/conky-cli/template
 delete mode 100644 srcpkgs/conky-cli/update

diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-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"
-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>"
-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
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
-	sed -i -e '1iinclude(CheckIncludeFile)' \
-		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
-		cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
-	vmkdir etc/conky
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
-	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
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..82c8f04386c6 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,185 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
+archs="~i686*"
+create_wrksrc=yes
 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"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=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"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
 
-post_install() {
+post_extract() {
+	cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+	sed -i -e '1iinclude(CheckIncludeFile)' \
+		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
+		${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+	cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cd ${pkgname}-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args}  -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+
+	cd ${wrksrc}/${pkgname}-cli-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-cli-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_no_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+}
+
+do_build() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} test
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} test
+}
+
+do_install() {
+	cd ${pkgname}-${version}/build
+	DESTDIR=${DESTDIR} ninja ${make_install_args} install
 	vmkdir etc/conky
 	mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
-	vlicense COPYING
+	vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+	vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+	short_desc="Conky command line without X11"
+	provides="conky-${version}_${revision}"
+	conflicts="conky>=0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}/build
+		DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+		vmkdir etc/conky
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+		rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+		vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+		vman ${wrksrc}/conky.1
+	}
 }

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (19 preceding siblings ...)
  2022-11-23  1:21 ` [PR PATCH] [Updated] " DragonGhost7
@ 2023-02-21  2:02 ` github-actions
  2023-03-07  2:07 ` [PR PATCH] [Closed]: " github-actions
  21 siblings, 0 replies; 23+ messages in thread
From: github-actions @ 2023-02-21  2:02 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/40237#issuecomment-1437758267

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: [PR PATCH] [Closed]: Conky: update to 1.15.0, adopt.
  2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
                   ` (20 preceding siblings ...)
  2023-02-21  2:02 ` github-actions
@ 2023-03-07  2:07 ` github-actions
  21 siblings, 0 replies; 23+ messages in thread
From: github-actions @ 2023-03-07  2:07 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

Conky: update to 1.15.0, adopt.
https://github.com/void-linux/void-packages/pull/40237

Description:
<!-- 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)



^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2023-03-07  2:07 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-31  1:14 [PR PATCH] Conky: update to 1.15.0, adopt DragonGhost7
2022-10-31  1:41 ` [PR PATCH] [Updated] " DragonGhost7
2022-10-31  2:30 ` DragonGhost7
2022-11-04 18:38 ` [PR REVIEW] " paper42
2022-11-04 21:20 ` DragonGhost7
2022-11-05  4:37 ` [PR PATCH] [Updated] " DragonGhost7
2022-11-05  4:37 ` DragonGhost7
2022-11-05  4:37 ` DragonGhost7
2022-11-05 17:50 ` [PR REVIEW] " paper42
2022-11-05 17:50 ` paper42
2022-11-05 17:50 ` paper42
2022-11-05 18:10 ` DragonGhost7
2022-11-05 18:31 ` paper42
2022-11-05 19:19 ` DragonGhost7
2022-11-22  2:43 ` [PR PATCH] [Updated] " DragonGhost7
2022-11-22  4:54 ` DragonGhost7
2022-11-22  5:46 ` DragonGhost7
2022-11-22  5:51 ` DragonGhost7
2022-11-22  5:53 ` DragonGhost7
2022-11-22  6:03 ` DragonGhost7
2022-11-23  1:21 ` [PR PATCH] [Updated] " DragonGhost7
2023-02-21  2:02 ` github-actions
2023-03-07  2:07 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).