Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] conky: fix maintainer mode
@ 2025-01-05  2:44 zlice
  2025-01-05  5:44 ` Caellian
  0 siblings, 1 reply; 2+ messages in thread
From: zlice @ 2025-01-05  2:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/zlice/void-packages conky-fix-maintainer-mode
https://github.com/void-linux/void-packages/pull/53852

conky: fix maintainer mode
#### 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**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **aarch64-musl**

#### Comments

per last update - https://github.com/void-linux/void-packages/pull/52924

https://github.com/brndnmtthws/conky/issues/2131

Void and nix both have `MAINTAINER_MODE` on when it should not be. It is for conky's own CI and turns on `BUILD_TESTS` when enabled.

The new conky code does bomb with `BUILD_TESTS` on and `MAINTAINER_MODE` off. But Void disables checks for cross builds anyway, so it's good enough to disable tests and maint-mode.

This doesn't really need rebuilt, just a better fix than previous fix.

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

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

From 686b18754e4cad6653e5b485d2e95c2ba8570b24 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 4 Jan 2025 21:34:35 -0500
Subject: [PATCH] conky: fix build tests

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

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 44ee2aadfeec3b..cbf728a6a23840 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -4,7 +4,7 @@ version=1.22.0
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
+configure_args="-DMAINTAINER_MODE=OFF -DRELEASE=ON
  -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
  -DBUILD_RSS=ON -DBUILD_WLAN=ON -DBUILD_X11=ON -DBUILD_XDBE=ON
  -DBUILD_IMLIB2=ON -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON
@@ -22,18 +22,27 @@ distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
 checksum="8633b78e6c0c9e7128efc9fe54b48df75a3860928e3fb101bcf71f6fb3844959
  4e2f31b09deb60f289f74d9e7f75e2e987ee0c5d400fc4cbf4ef2b60fe457295"
 
+# MAINTAINER_MODE turns on BUILD_TESTS and is only for the conky project
+if [ -n "$CROSS_BUILD" ] ; then
+	configure_args+=" -DBUILD_TESTS=OFF"
+else
+	configure_args+=" -DBUILD_TESTS=ON"
+fi
+
 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
-	configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON -DDOC_PATH=share/doc/${pkgname}
+	configure_args="-DMAINTAINER_MODE=OFF -DRELEASE=ON -DDOC_PATH=share/doc/${pkgname}
 	-DBUILD_X11=OFF -DBUILD_WAYLAND=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
 	-DBUILD_RSS=ON -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON"
+	# this probably doesn't really need to be tested again
+	if [ -n "$CROSS_BUILD" ] ; then
+		configure_args+=" -DBUILD_TESTS=OFF"
+	else
+		configure_args+=" -DBUILD_TESTS=ON"
+	fi
 	(
 		cmake_builddir="cli-build"
 		do_configure

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

* Re: conky: fix maintainer mode
  2025-01-05  2:44 [PR PATCH] conky: fix maintainer mode zlice
@ 2025-01-05  5:44 ` Caellian
  0 siblings, 0 replies; 2+ messages in thread
From: Caellian @ 2025-01-05  5:44 UTC (permalink / raw)
  To: ml

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

New comment by Caellian on void-packages repository

https://github.com/void-linux/void-packages/pull/53852#issuecomment-2571510956

Comment:
I just finished and merged [conky#2132](https://github.com/brndnmtthws/conky/pull/2132), which renames `BUILD_TESTS` to `BUILD_TESTING`. Variable name should probably be updated in this PR.

Remove `MAINTAINER_MODE` completely, it's OFF by default and always will be. Shouldn't be used from packaging.

Lastly, I added support for `USE_CCACHE` and sccache/ccache detection which is enabled by default. I believe this is a good fit for Void (unlike Nix), but turn it off if you want to explicitly disable binary caching.

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

end of thread, other threads:[~2025-01-05  5:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-05  2:44 [PR PATCH] conky: fix maintainer mode zlice
2025-01-05  5:44 ` Caellian

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).