From 6306a247093d430f291d9bc5c77d0b92fd9c84c8 Mon Sep 17 00:00:00 2001 From: dsaf Date: Sat, 14 Mar 2026 19:56:15 -0300 Subject: [PATCH] gui-apps/noctalia-qs: simplify build Signed-off-by: dsaf --- gui-apps/noctalia-qs/noctalia-qs-0.0.8.ebuild | 45 +++++++++---------- gui-apps/noctalia-qs/noctalia-qs-9999.ebuild | 45 +++++++++---------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/gui-apps/noctalia-qs/noctalia-qs-0.0.8.ebuild b/gui-apps/noctalia-qs/noctalia-qs-0.0.8.ebuild index 0c8a18fb14..68a80e44b2 100644 --- a/gui-apps/noctalia-qs/noctalia-qs-0.0.8.ebuild +++ b/gui-apps/noctalia-qs/noctalia-qs-0.0.8.ebuild @@ -82,22 +82,21 @@ src_configure() { # hyprland controls all Hyprland sub-features as a group. # i3 controls I3/Sway IPC. # screencopy controls all screencopy backends (icc, wlr, hyprland-toplevel). - local _hyprland=$(usex hyprland ON OFF) - local _screencopy=$(usex screencopy ON OFF) - local _i3=$(usex i3 ON OFF) + local _hyprland=$(usex hyprland) + local _screencopy=$(usex screencopy) + local _i3=$(usex i3) local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" -DINSTALL_QML_PREFIX="$(get_libdir)/qt6/qml" -DGIT_REVISION=${GIT_REVISION} - -DCRASH_HANDLER=OFF # dev-cpp/cpptrace::gentoo does not have required use flags - -DUSE_JEMALLOC=$(usex jemalloc ON OFF) - -DSOCKETS=$(usex sockets ON OFF) - -DWAYLAND=$(usex wayland ON OFF) - -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell ON OFF) - -DWAYLAND_SESSION_LOCK=$(usex session-lock ON OFF) - -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management ON OFF) + -DCRASH_HANDLER=no # dev-cpp/cpptrace::gentoo does not have required use flags + -DUSE_JEMALLOC=$(usex jemalloc) + -DSOCKETS=$(usex sockets) + -DWAYLAND=$(usex wayland) + -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell) + -DWAYLAND_SESSION_LOCK=$(usex session-lock) + -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management) -DHYPRLAND=${_hyprland} -DHYPRLAND_IPC=${_hyprland} -DHYPRLAND_GLOBAL_SHORTCUTS=${_hyprland} @@ -107,20 +106,20 @@ src_configure() { -DSCREENCOPY_ICC=${_screencopy} -DSCREENCOPY_WLR=${_screencopy} -DSCREENCOPY_HYPRLAND_TOPLEVEL=${_screencopy} - -DX11=$(usex X ON OFF) + -DX11=$(usex X) -DI3=${_i3} -DI3_IPC=${_i3} - -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) - -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) - -DSERVICE_MPRIS=$(usex mpris ON OFF) - -DSERVICE_PAM=$(usex pam ON OFF) - -DSERVICE_POLKIT=$(usex polkit ON OFF) - -DSERVICE_GREETD=$(usex greetd ON OFF) - -DSERVICE_UPOWER=$(usex upower ON OFF) - -DSERVICE_NOTIFICATIONS=$(usex notifications ON OFF) - -DBLUETOOTH=$(usex bluetooth ON OFF) - -DNETWORK=$(usex network ON OFF) - -DLTO=$(usex lto ON OFF) + -DSERVICE_STATUS_NOTIFIER=$(usex tray) + -DSERVICE_PIPEWIRE=$(usex pipewire) + -DSERVICE_MPRIS=$(usex mpris) + -DSERVICE_PAM=$(usex pam) + -DSERVICE_POLKIT=$(usex polkit) + -DSERVICE_GREETD=$(usex greetd) + -DSERVICE_UPOWER=$(usex upower) + -DSERVICE_NOTIFICATIONS=$(usex notifications) + -DBLUETOOTH=$(usex bluetooth) + -DNETWORK=$(usex network) + -DLTO=$(usex lto) ) cmake_src_configure } diff --git a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild index bbd23e7e16..7d432e9aa2 100644 --- a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild +++ b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild @@ -80,22 +80,21 @@ src_configure() { # hyprland controls all Hyprland sub-features as a group. # i3 controls I3/Sway IPC. # screencopy controls all screencopy backends (icc, wlr, hyprland-toplevel). - local _hyprland=$(usex hyprland ON OFF) - local _screencopy=$(usex screencopy ON OFF) - local _i3=$(usex i3 ON OFF) + local _hyprland=$(usex hyprland) + local _screencopy=$(usex screencopy) + local _i3=$(usex i3) local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" -DINSTALL_QML_PREFIX="$(get_libdir)/qt6/qml" -DGIT_REVISION=${EGIT_COMMIT} - -DCRASH_HANDLER=OFF # dev-cpp/cpptrace::gentoo does not have required use flags - -DUSE_JEMALLOC=$(usex jemalloc ON OFF) - -DSOCKETS=$(usex sockets ON OFF) - -DWAYLAND=$(usex wayland ON OFF) - -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell ON OFF) - -DWAYLAND_SESSION_LOCK=$(usex session-lock ON OFF) - -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management ON OFF) + -DCRASH_HANDLER=no # dev-cpp/cpptrace::gentoo does not have required use flags + -DUSE_JEMALLOC=$(usex jemalloc) + -DSOCKETS=$(usex sockets) + -DWAYLAND=$(usex wayland) + -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell) + -DWAYLAND_SESSION_LOCK=$(usex session-lock) + -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management) -DHYPRLAND=${_hyprland} -DHYPRLAND_IPC=${_hyprland} -DHYPRLAND_GLOBAL_SHORTCUTS=${_hyprland} @@ -105,20 +104,20 @@ src_configure() { -DSCREENCOPY_ICC=${_screencopy} -DSCREENCOPY_WLR=${_screencopy} -DSCREENCOPY_HYPRLAND_TOPLEVEL=${_screencopy} - -DX11=$(usex X ON OFF) + -DX11=$(usex X) -DI3=${_i3} -DI3_IPC=${_i3} - -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) - -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) - -DSERVICE_MPRIS=$(usex mpris ON OFF) - -DSERVICE_PAM=$(usex pam ON OFF) - -DSERVICE_POLKIT=$(usex polkit ON OFF) - -DSERVICE_GREETD=$(usex greetd ON OFF) - -DSERVICE_UPOWER=$(usex upower ON OFF) - -DSERVICE_NOTIFICATIONS=$(usex notifications ON OFF) - -DBLUETOOTH=$(usex bluetooth ON OFF) - -DNETWORK=$(usex network ON OFF) - -DLTO=$(usex lto ON OFF) + -DSERVICE_STATUS_NOTIFIER=$(usex tray) + -DSERVICE_PIPEWIRE=$(usex pipewire) + -DSERVICE_MPRIS=$(usex mpris) + -DSERVICE_PAM=$(usex pam) + -DSERVICE_POLKIT=$(usex polkit) + -DSERVICE_GREETD=$(usex greetd) + -DSERVICE_UPOWER=$(usex upower) + -DSERVICE_NOTIFICATIONS=$(usex notifications) + -DBLUETOOTH=$(usex bluetooth) + -DNETWORK=$(usex network) + -DLTO=$(usex lto) ) cmake_src_configure }