[PR PATCH] conky: update to 1.21.8. closes #50564

[PR PATCH] conky: update to 1.21.8. closes #50564

[zlice]

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

There is a new pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.21.8. closes #50564
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

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

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

From efccdb40b7e58f00a78af2483582c75aa0b415a0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 5 Nov 2024 15:05:00 -0500
Subject: [PATCH] conky: update to 1.21.8. closes #50564

---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..bd692a73625ec5 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.21.8
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="f90ce9ba999197ad62b8b1224e412c52e9e0231fb46a64ba7b868c2e989959ec
+ 839780aac7e332c585c5d23467d3c950ca9b9a21310bb4d831289dbd67b10692"
 
 post_extract() {
 	mv conky-*/* .

Re: conky: update to 1.21.8. closes #50564

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2458057850

Comment:
closes line should go in the body of the commit

Re: [PR PATCH] [Updated] conky: update to 1.21.8. closes #50564

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.21.8. closes #50564
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

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

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

From 8f7018ca47830f908c5f3001bc3421eeecb562b0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 5 Nov 2024 15:05:00 -0500
Subject: [PATCH] conky: update to 1.21.8

closes #50564
---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..bd692a73625ec5 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.21.8
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="f90ce9ba999197ad62b8b1224e412c52e9e0231fb46a64ba7b868c2e989959ec
+ 839780aac7e332c585c5d23467d3c950ca9b9a21310bb4d831289dbd67b10692"
 
 post_extract() {
 	mv conky-*/* .

Re: [PR PATCH] [Updated] conky: update to 1.21.8.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.21.8. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From cdff64193d6b4cc08d3b1295349ee5e0b7bc2110 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.21.9

closes #50564
---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..708cd74e41c59b 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.21.9
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="cebbfb298d21bd535d6d9dcbfac3079721146d62a01f368410df62cb7886813f
+ 45d52359c4a90236d9aa280f175d5f98c7a9e01ae6883bd944f98be9898f62dc"
 
 post_extract() {
 	mv conky-*/* .

Re: conky: update to 1.21.8.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2553888547

Comment:
cannot fetch on my box...wget to get the sha's works fine

`=> ERROR: conky-1.21.8_1: cannot find v1.21.9.tar.gz, use 'xbps-src fetch' first.`

Re: conky: update to 1.21.8.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2553888547

Comment:
cannot fetch on my box...wget to get the sha's works fine

`=> ERROR: conky-1.21.9_1: cannot find v1.21.9.tar.gz, use 'xbps-src fetch' first.`

Re: conky: update to 1.21.8.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2553888547

Comment:
cannot fetch on my box...wget to get the sha's works fine

`=> ERROR: conky-1.21.9_1: cannot find v1.21.9.tar.gz, use 'xbps-src fetch' first.`

and ofc `fetch` just exits silently like nothings wrong. but there's not hostdir/sources/conky dir or files

Re: conky: update to 1.21.9.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2553888547

Comment:
update: dirty builddir blocks fetch

cannot fetch on my box...wget to get the sha's works fine

`=> ERROR: conky-1.21.9_1: cannot find v1.21.9.tar.gz, use 'xbps-src fetch' first.`

and ofc `fetch` just exits silently like nothings wrong. but there's not hostdir/sources/conky dir or files

Re: [PR PATCH] [Updated] conky: update to 1.21.9.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.21.9. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From a8338a102f31b703d066ffa85639f07e4a6eefd7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.21.9

closes #50564
---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..708cd74e41c59b 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.21.9
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="cebbfb298d21bd535d6d9dcbfac3079721146d62a01f368410df62cb7886813f
+ 45d52359c4a90236d9aa280f175d5f98c7a9e01ae6883bd944f98be9898f62dc"
 
 post_extract() {
 	mv conky-*/* .

Re: [PR PATCH] [Updated] conky: update to 1.21.9.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.21.9. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From 44f6cad6741958eee9cf4db37a9e14f8ce65a2d0 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.22.0

closes #50564
---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..708cd74e41c59b 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.21.9
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="cebbfb298d21bd535d6d9dcbfac3079721146d62a01f368410df62cb7886813f
+ 45d52359c4a90236d9aa280f175d5f98c7a9e01ae6883bd944f98be9898f62dc"
 
 post_extract() {
 	mv conky-*/* .

Re: [PR PATCH] [Updated] conky: update to 1.22.0.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.22.0. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From d366f34af42d118bbd9549913290efeed0d62516 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.22.0

closes #50564
---
 srcpkgs/conky/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..c14bf6256f8659 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.22.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,8 +19,8 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959
+ 4e2f31b09deb60f289f74d9e7f75e2e987ee0c5d400fc4cbf4ef2b60fe457295"
 
 post_extract() {
 	mv conky-*/* .

Re: [PR PATCH] [Updated] conky: update to 1.22.0.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.22.0. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From d9d0f5e0170e43c7c11b3e7aee75301d37160961 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.22.0

closes #50564
---
 srcpkgs/conky/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..b19160b94379be 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.22.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,11 +19,16 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959
+ 4e2f31b09deb60f289f74d9e7f75e2e987ee0c5d400fc4cbf4ef2b60fe457295"
 
 post_extract() {
 	mv conky-*/* .
+	case "${XBPS_TARGET_MACHINE}" in
+		aarch64*|arm*) # some tests are in 'build()' now, 'make_check' does nothing
+		echo "" > cmake/CatchAddTests.cmake
+		;;
+	esac
 }
 
 post_configure() { # conky-cli

Re: conky: update to 1.22.0.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2571362477

Comment:
Failing during `build` because `test-conky` being ran.

This is because `cmake/CatchAddTests.cmake` was changed and is not only building `tests/test-conky` but running during build. Trying to configure with `-DBUILD_TESTS=OFF` does not seem to fix the problem (see below).

```
[112/114] Building CXX object tests/CMakeFiles/Catch2.dir/catch2/catch_amalgamated.cpp.o
[113/114] Linking CXX static library tests/libCatch2.a
[114/114] Linking CXX executable tests/test-conky
FAILED: tests/test-conky tests/test-conky-b12d07c_tests.cmake /builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake 
: && /builddir/.xbps-conky/wrappers/aarch64-linux-musl-c++ -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-musl/usr/include -ffile-prefix-map=/builddir/conky-1.22.0/build=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-musl/usr/lib tests/CMakeFiles/test-conky.dir/test-common.cc.o tests/CMakeFiles/test-conky.dir/test-algebra.cc.o tests/CMakeFiles/test-conky.dir/test-colours.cc.o tests/CMakeFiles/test-conky.dir/test-conky.cc.o tests/CMakeFiles/test-conky.dir/test-core.cc.o tests/CMakeFiles/test-conky.dir/test-diskio.cc.o tests/CMakeFiles/test-conky.dir/test-fs.cc.o tests/CMakeFiles/test-conky.dir/test-gradient.cc.o tests/CMakeFiles/test-conky.dir/test-graph.cc.o tests/CMakeFiles/test-conky.dir/test-linux.cc.o -o tests/test-conky  tests/libCatch2.a  src/libconky_core.a  -lm  -lcurses  /usr/aarch64-linux-musl/usr/lib/libiw.so  /usr/aarch64-linux-musl/usr/lib/libX11.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libxcb.so  -L/usr/aarch64-linux-musl/usr/lib64  -lImlib2  /usr/aarch64-linux-musl/usr/lib64/libcurl.so  /usr/aarch64-linux-musl/usr/lib64/libxml2.so  3rdparty/toluapp/libtoluapp.a  /usr/aarch64-linux-musl/usr/lib/liblua5.3.so  /usr/aarch64-linux-musl/usr/lib/libm.a  3rdparty/Vc/libVc.a  src/libtcp-portmon.a && cd /builddir/conky-1.22.0/build/tests && /usr/libexec/xbps-src/bin/cmake -D TEST_TARGET=test-conky -D TEST_EXECUTABLE=/builddir/conky-1.22.0/build/tests/test-conky -D TEST_EXECUTOR= -D TEST_WORKING_DIR=/builddir/conky-1.22.0/build/tests -D TEST_SPEC= -D TEST_EXTRA_ARGS= -D "TEST_PROPERTIES=SKIP_RETURN_CODE;4" -D TEST_PREFIX= -D TEST_SUFFIX= -D TEST_LIST=test-conky_TESTS -D TEST_REPORTER= -D TEST_OUTPUT_DIR= -D TEST_OUTPUT_PREFIX= -D TEST_OUTPUT_SUFFIX= -D TEST_DL_PATHS= -D TEST_DL_FRAMEWORK_PATHS= -D CTEST_FILE=/builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake -P /builddir/conky-1.22.0/cmake/CatchAddTests.cmake
CMake Error at /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:85 (message):
  Error running test executable
  '/builddir/conky-1.22.0/build/tests/test-conky':

    Result: Unknown system error -8
    Output: 

Call Stack (most recent call first):
  /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:190 (catch_discover_tests_impl)
```

Re: conky: update to 1.22.0.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2571362477

Comment:
Failing during `build` because of `test-conky` being ran.

This is because `cmake/CatchAddTests.cmake` was changed and is not only building `tests/test-conky` but running during build. Trying to configure with `-DBUILD_TESTS=OFF` does not seem to fix the problem (see below).

```
[112/114] Building CXX object tests/CMakeFiles/Catch2.dir/catch2/catch_amalgamated.cpp.o
[113/114] Linking CXX static library tests/libCatch2.a
[114/114] Linking CXX executable tests/test-conky
FAILED: tests/test-conky tests/test-conky-b12d07c_tests.cmake /builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake 
: && /builddir/.xbps-conky/wrappers/aarch64-linux-musl-c++ -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-musl/usr/include -ffile-prefix-map=/builddir/conky-1.22.0/build=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-musl/usr/lib tests/CMakeFiles/test-conky.dir/test-common.cc.o tests/CMakeFiles/test-conky.dir/test-algebra.cc.o tests/CMakeFiles/test-conky.dir/test-colours.cc.o tests/CMakeFiles/test-conky.dir/test-conky.cc.o tests/CMakeFiles/test-conky.dir/test-core.cc.o tests/CMakeFiles/test-conky.dir/test-diskio.cc.o tests/CMakeFiles/test-conky.dir/test-fs.cc.o tests/CMakeFiles/test-conky.dir/test-gradient.cc.o tests/CMakeFiles/test-conky.dir/test-graph.cc.o tests/CMakeFiles/test-conky.dir/test-linux.cc.o -o tests/test-conky  tests/libCatch2.a  src/libconky_core.a  -lm  -lcurses  /usr/aarch64-linux-musl/usr/lib/libiw.so  /usr/aarch64-linux-musl/usr/lib/libX11.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libxcb.so  -L/usr/aarch64-linux-musl/usr/lib64  -lImlib2  /usr/aarch64-linux-musl/usr/lib64/libcurl.so  /usr/aarch64-linux-musl/usr/lib64/libxml2.so  3rdparty/toluapp/libtoluapp.a  /usr/aarch64-linux-musl/usr/lib/liblua5.3.so  /usr/aarch64-linux-musl/usr/lib/libm.a  3rdparty/Vc/libVc.a  src/libtcp-portmon.a && cd /builddir/conky-1.22.0/build/tests && /usr/libexec/xbps-src/bin/cmake -D TEST_TARGET=test-conky -D TEST_EXECUTABLE=/builddir/conky-1.22.0/build/tests/test-conky -D TEST_EXECUTOR= -D TEST_WORKING_DIR=/builddir/conky-1.22.0/build/tests -D TEST_SPEC= -D TEST_EXTRA_ARGS= -D "TEST_PROPERTIES=SKIP_RETURN_CODE;4" -D TEST_PREFIX= -D TEST_SUFFIX= -D TEST_LIST=test-conky_TESTS -D TEST_REPORTER= -D TEST_OUTPUT_DIR= -D TEST_OUTPUT_PREFIX= -D TEST_OUTPUT_SUFFIX= -D TEST_DL_PATHS= -D TEST_DL_FRAMEWORK_PATHS= -D CTEST_FILE=/builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake -P /builddir/conky-1.22.0/cmake/CatchAddTests.cmake
CMake Error at /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:85 (message):
  Error running test executable
  '/builddir/conky-1.22.0/build/tests/test-conky':

    Result: Unknown system error -8
    Output: 

Call Stack (most recent call first):
  /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:190 (catch_discover_tests_impl)
```

Re: conky: update to 1.22.0.

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#issuecomment-2571362477

Comment:
Failing during `build` because of `test-conky` being ran.

This is because `cmake/CatchAddTests.cmake` was changed and is not only building `tests/test-conky` but running during build. Trying to configure with `-DBUILD_TESTS=OFF` does not seem to fix the problem.

```
[112/114] Building CXX object tests/CMakeFiles/Catch2.dir/catch2/catch_amalgamated.cpp.o
[113/114] Linking CXX static library tests/libCatch2.a
[114/114] Linking CXX executable tests/test-conky
FAILED: tests/test-conky tests/test-conky-b12d07c_tests.cmake /builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake 
: && /builddir/.xbps-conky/wrappers/aarch64-linux-musl-c++ -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-musl/usr/include -ffile-prefix-map=/builddir/conky-1.22.0/build=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-musl/usr/lib tests/CMakeFiles/test-conky.dir/test-common.cc.o tests/CMakeFiles/test-conky.dir/test-algebra.cc.o tests/CMakeFiles/test-conky.dir/test-colours.cc.o tests/CMakeFiles/test-conky.dir/test-conky.cc.o tests/CMakeFiles/test-conky.dir/test-core.cc.o tests/CMakeFiles/test-conky.dir/test-diskio.cc.o tests/CMakeFiles/test-conky.dir/test-fs.cc.o tests/CMakeFiles/test-conky.dir/test-gradient.cc.o tests/CMakeFiles/test-conky.dir/test-graph.cc.o tests/CMakeFiles/test-conky.dir/test-linux.cc.o -o tests/test-conky  tests/libCatch2.a  src/libconky_core.a  -lm  -lcurses  /usr/aarch64-linux-musl/usr/lib/libiw.so  /usr/aarch64-linux-musl/usr/lib/libX11.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libXext.so  /usr/aarch64-linux-musl/usr/lib/libXdamage.so  /usr/aarch64-linux-musl/usr/lib/libXfixes.so  /usr/aarch64-linux-musl/usr/lib/libXft.so  /usr/aarch64-linux-musl/usr/lib/libfontconfig.so  /usr/aarch64-linux-musl/usr/lib/libXinerama.so  /usr/aarch64-linux-musl/usr/lib/libxcb.so  -L/usr/aarch64-linux-musl/usr/lib64  -lImlib2  /usr/aarch64-linux-musl/usr/lib64/libcurl.so  /usr/aarch64-linux-musl/usr/lib64/libxml2.so  3rdparty/toluapp/libtoluapp.a  /usr/aarch64-linux-musl/usr/lib/liblua5.3.so  /usr/aarch64-linux-musl/usr/lib/libm.a  3rdparty/Vc/libVc.a  src/libtcp-portmon.a && cd /builddir/conky-1.22.0/build/tests && /usr/libexec/xbps-src/bin/cmake -D TEST_TARGET=test-conky -D TEST_EXECUTABLE=/builddir/conky-1.22.0/build/tests/test-conky -D TEST_EXECUTOR= -D TEST_WORKING_DIR=/builddir/conky-1.22.0/build/tests -D TEST_SPEC= -D TEST_EXTRA_ARGS= -D "TEST_PROPERTIES=SKIP_RETURN_CODE;4" -D TEST_PREFIX= -D TEST_SUFFIX= -D TEST_LIST=test-conky_TESTS -D TEST_REPORTER= -D TEST_OUTPUT_DIR= -D TEST_OUTPUT_PREFIX= -D TEST_OUTPUT_SUFFIX= -D TEST_DL_PATHS= -D TEST_DL_FRAMEWORK_PATHS= -D CTEST_FILE=/builddir/conky-1.22.0/build/tests/test-conky-b12d07c_tests.cmake -P /builddir/conky-1.22.0/cmake/CatchAddTests.cmake
CMake Error at /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:85 (message):
  Error running test executable
  '/builddir/conky-1.22.0/build/tests/test-conky':

    Result: Unknown system error -8
    Output: 

Call Stack (most recent call first):
  /builddir/conky-1.22.0/cmake/CatchAddTests.cmake:190 (catch_discover_tests_impl)
```

Re: [PR REVIEW] conky: update to 1.22.0.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#discussion_r1903130201

Comment:
selecting on target machine is wrong, check if cross instead

Re: [PR REVIEW] conky: update to 1.22.0.

[zlice]

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#discussion_r1903130472

Comment:
that's what i did the first time. did i f it up?

![fail](https://github.com/user-attachments/assets/24edc83a-5d47-4289-a30c-1d4ea2bddf35)

Re: [PR REVIEW] conky: update to 1.22.0.

[zlice]

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#discussion_r1903130680

Comment:
yes, yes i did, `!`

Re: [PR PATCH] [Updated] conky: update to 1.22.0.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.22.0. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From 582997d801a0a33f063767189931abb56b7fcca4 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.22.0

closes #50564
---
 srcpkgs/conky/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..82d78df59da58c 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.22.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,11 +19,15 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959
+ 4e2f31b09deb60f289f74d9e7f75e2e987ee0c5d400fc4cbf4ef2b60fe457295"
 
 post_extract() {
 	mv conky-*/* .
+	if [ ! -z "$CROSS_BUILD" ] ; then
+		# some tests are in 'build()' now, 'make_check' does nothing
+		echo "" > cmake/CatchAddTests.cmake
+	fi
 }
 
 post_configure() { # conky-cli

Re: [PR REVIEW] conky: update to 1.22.0.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52924#discussion_r1903131853

Comment:
the inverse of `-z`(ero) is `-n`(onzero), no `!` needed

Re: [PR PATCH] [Updated] conky: update to 1.22.0.

[zlice]

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

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

https://github.com/zlice/void-packages conky1218
https://github.com/void-linux/void-packages/pull/52924

conky: update to 1.22.0. 
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564

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

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

From bab4b27e5d3b1965580028e11919565d4724dd97 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Thu, 19 Dec 2024 08:11:25 -0500
Subject: [PATCH] conky: update to 1.22.0

closes #50564
---
 srcpkgs/conky/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 97c21c739e11f3..44ee2aadfeec3b 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.21.6
+version=1.22.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,11 +19,15 @@ 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
  https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
-checksum="b0cd6a9197de1db527953f24635b4e4f19d8ab1258854c4adbfdd6e0f1588341
- 41c14d80a5ee6074ddcb1c3f05805f3f3bb0e65d13c164e619dd7ecbbba314eb"
+checksum="8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959
+ 4e2f31b09deb60f289f74d9e7f75e2e987ee0c5d400fc4cbf4ef2b60fe457295"
 
 post_extract() {
 	mv conky-*/* .
+	if [ -n "$CROSS_BUILD" ] ; then
+		# some tests are in 'build()' now, 'make_check' does nothing
+		echo "" > cmake/CatchAddTests.cmake
+	fi
 }
 
 post_configure() { # conky-cli

Re: [PR PATCH] [Merged]: conky: update to 1.22.0.

[classabbyamp]

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

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

conky: update to 1.22.0. 
https://github.com/void-linux/void-packages/pull/52924

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

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

#### Comments

Fixes race condition starting X11 that prevents conky from starting

closes #50564