[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/yambar/files/, gui-apps/yambar/

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/yambar/files/, gui-apps/yambar/

[Julien Roy]

commit:     5cab9ed88289b12058c3b09343252c970ce75e6f
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Dec 17 22:52:41 2022 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Dec 17 22:52:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cab9ed8

gui-apps/yambar: add patch for bug #239

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 gui-apps/yambar/files/round.patch   | 68 +++++++++++++++++++++++++++++++++++++
 gui-apps/yambar/yambar-1.9.0.ebuild |  8 ++---
 gui-apps/yambar/yambar-9999.ebuild  |  4 ---
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/gui-apps/yambar/files/round.patch b/gui-apps/yambar/files/round.patch
new file mode 100644
index 000000000..a934c0e83
--- /dev/null
+++ b/gui-apps/yambar/files/round.patch
@@ -0,0 +1,68 @@
+From ede6a541e1c6a861461c189513187a69e3e5ce91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
+Date: Sat, 17 Dec 2022 18:15:14 +0100
+Subject: [PATCH] =?UTF-8?q?modules:=20meson:=20add=20missing=20=E2=80=98m?=
+ =?UTF-8?q?=E2=80=99=20(math)=20dependency?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The following modules used functions from the ‘m’ (math)
+library (e.g. round()), but didn’t explicitly link against it. This
+caused build failures when no other plugin that _did_ link against ‘m’
+was enabled.
+
+* cpu
+* mem
+* pulse
+* pipewire
+* foreign-toplevel
+
+Closes #239
+---
+ 
+diff --git a/modules/meson.build b/modules/meson.build
+index 49aba6d..f8d1e80 100644
+--- a/modules/meson.build
++++ b/modules/meson.build
+@@ -70,7 +70,7 @@ if plugin_clock_enabled
+ endif
+ 
+ if plugin_cpu_enabled
+-  mod_data += {'cpu': [[], [dynlist]]}
++  mod_data += {'cpu': [[], [m, dynlist]]}
+ endif
+ 
+ if plugin_disk_io_enabled
+@@ -82,7 +82,7 @@ if plugin_dwl_enabled
+ endif
+ 
+ if plugin_mem_enabled
+-  mod_data += {'mem': [[], []]}
++  mod_data += {'mem': [[], [m]]}
+ endif
+ 
+ if plugin_mpd_enabled
+@@ -102,11 +102,11 @@ if plugin_network_enabled
+ endif
+ 
+ if plugin_pipewire_enabled
+-  mod_data += {'pipewire': [[], [pipewire, dynlist, json_pipewire]]}
++  mod_data += {'pipewire': [[], [m, pipewire, dynlist, json_pipewire]]}
+ endif
+ 
+ if plugin_pulse_enabled
+-  mod_data += {'pulse': [[], [pulse]]}
++  mod_data += {'pulse': [[], [m, pulse]]}
+ endif
+ 
+ if plugin_removables_enabled
+@@ -170,7 +170,7 @@ if plugin_foreign_toplevel_enabled
+       command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
+   endforeach
+ 
+-  mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers + ftop_proto_headers + ftop_proto_src], [dynlist, wayland_client]]}
++  mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers + ftop_proto_headers + ftop_proto_src], [m, dynlist, wayland_client]]}
+ endif
+ 
+ foreach mod, data : mod_data

diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild b/gui-apps/yambar/yambar-1.9.0.ebuild
index 9c6878e02..1c24b420d 100644
--- a/gui-apps/yambar/yambar-1.9.0.ebuild
+++ b/gui-apps/yambar/yambar-1.9.0.ebuild
@@ -23,11 +23,7 @@ REQUIRED_USE="
 	sway-xkb? ( wayland )
 	xkb? ( X )
 	xwindow? ( X )
-	|| ( alsa backlight )
 "
-# For some reason, if building CPU, memory or pipewire modules
-# the build will fail if the alsa or backlight modules aren't present
-# See https://codeberg.org/dnkl/yambar/issues/239
 
 RDEPEND="
 	>=media-libs/fcft-2.4.0
@@ -64,6 +60,10 @@ BDEPEND="
 	)
 "
 
+PATCHES="
+	${FILESDIR}/round.patch
+"
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature wayland backend-wayland)

diff --git a/gui-apps/yambar/yambar-9999.ebuild b/gui-apps/yambar/yambar-9999.ebuild
index 6e1db2c60..94cf9bebb 100644
--- a/gui-apps/yambar/yambar-9999.ebuild
+++ b/gui-apps/yambar/yambar-9999.ebuild
@@ -23,11 +23,7 @@ REQUIRED_USE="
 	sway-xkb? ( wayland )
 	xkb? ( X )
 	xwindow? ( X )
-	|| ( alsa backlight )
 "
-# For some reason, if building CPU, memory or pipewire modules
-# the build will fail if the alsa or backlight modules aren't present
-# See https://codeberg.org/dnkl/yambar/issues/239
 
 RDEPEND="
 	>=media-libs/fcft-2.4.0