From 9bd38b28dc0aa1c0066adcb32c898283ecb3f3e7 Mon Sep 17 00:00:00 2001 From: dsaf Date: Sun, 8 Mar 2026 19:49:05 -0300 Subject: [PATCH] gui-apps/quickshell: 9999 drop 'breakpad' IUSE * Drop 'breakpad' USE flag: Now requires dev-cpp/cpptrace::gentoo which does not feature the required build flags * Use get_libdir instead of hard-coding (* all versions) Signed-off-by: dsaf --- gui-apps/quickshell/quickshell-0.2.1.ebuild | 56 ++++++++++----------- gui-apps/quickshell/quickshell-9999.ebuild | 56 ++++++++++----------- 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/gui-apps/quickshell/quickshell-0.2.1.ebuild b/gui-apps/quickshell/quickshell-0.2.1.ebuild index 31a0a20140..e3537919fb 100644 --- a/gui-apps/quickshell/quickshell-0.2.1.ebuild +++ b/gui-apps/quickshell/quickshell-0.2.1.ebuild @@ -64,32 +64,32 @@ BDEPEND=" ) " -src_configure(){ - mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" - -DINSTALL_QML_PREFIX="lib64/qt6/qml" - -DGIT_REVISION=${GIT_REVISION} - -DCRASH_REPORTER=$(usex breakpad ON OFF) - -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) - -DSCREENCOPY=$(usex screencopy ON OFF) - -DX11=$(usex X ON OFF) - -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) - -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) - -DSERVICE_MPRIS=$(usex mpris ON OFF) - -DSERVICE_PAM=$(usex pam ON OFF) - -DSERVICE_POLKIT=$(usex polkit ON OFF) - -DHYPRLAND=$(usex hyprland ON OFF) - -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts) - -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab) - -DI3=$(usex i3 ON OFF) - -DI3_IPC=$(usex i3-ipc ON OFF) - -DBLUETOOTH=$(usex bluetooth ON OFF) - ) - cmake_src_configure +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" + -DINSTALL_QML_PREFIX="$(get_libdir)/qt6/qml" + -DGIT_REVISION=${GIT_REVISION} + -DCRASH_REPORTER=$(usex breakpad ON OFF) + -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) + -DSCREENCOPY=$(usex screencopy ON OFF) + -DX11=$(usex X ON OFF) + -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) + -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) + -DSERVICE_MPRIS=$(usex mpris ON OFF) + -DSERVICE_PAM=$(usex pam ON OFF) + -DSERVICE_POLKIT=$(usex polkit ON OFF) + -DHYPRLAND=$(usex hyprland ON OFF) + -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts) + -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab) + -DI3=$(usex i3 ON OFF) + -DI3_IPC=$(usex i3-ipc ON OFF) + -DBLUETOOTH=$(usex bluetooth ON OFF) + ) + cmake_src_configure } diff --git a/gui-apps/quickshell/quickshell-9999.ebuild b/gui-apps/quickshell/quickshell-9999.ebuild index c75bc67974..6c54ac13f1 100644 --- a/gui-apps/quickshell/quickshell-9999.ebuild +++ b/gui-apps/quickshell/quickshell-9999.ebuild @@ -20,7 +20,7 @@ LICENSE="LGPL-3" SLOT="0" # Upstream recommends leaving all build options enabled by default IUSE=" - +breakpad +jemalloc +sockets +wayland +layer-shell + +jemalloc +sockets +wayland +layer-shell +session-lock +toplevel-management +screencopy +X +pipewire +tray +mpris +pam +polkit +hyprland +hyprland-global-shortcuts +hyprland-focus-grab @@ -55,7 +55,6 @@ BDEPEND=" virtual/pkgconfig dev-cpp/cli11 dev-qt/qtshadertools:6 - breakpad? ( dev-util/breakpad ) wayland? ( dev-util/wayland-scanner dev-libs/wayland-protocols @@ -68,31 +67,30 @@ src_configure() { append-flags -fno-strict-aliasing filter-lto - mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" - -DINSTALL_QML_PREFIX="lib64/qt6/qml" - -DGIT_REVISION=${EGIT_COMMIT} - -DCRASH_REPORTER=$(usex breakpad ON OFF) - -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) - -DSCREENCOPY=$(usex screencopy ON OFF) - -DX11=$(usex X ON OFF) - -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) - -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) - -DSERVICE_MPRIS=$(usex mpris ON OFF) - -DSERVICE_PAM=$(usex pam ON OFF) - -DSERVICE_POLKIT=$(usex polkit ON OFF) - -DHYPRLAND=$(usex hyprland ON OFF) - -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts) - -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab) - -DI3=$(usex i3 ON OFF) - -DI3_IPC=$(usex i3-ipc ON OFF) - -DBLUETOOTH=$(usex bluetooth ON OFF) - ) - cmake_src_configure + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU" + -DINSTALL_QML_PREFIX="$(get_libdir)/qt6/qml" + -DGIT_REVISION=${EGIT_COMMIT} + -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) + -DSCREENCOPY=$(usex screencopy ON OFF) + -DX11=$(usex X ON OFF) + -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF) + -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF) + -DSERVICE_MPRIS=$(usex mpris ON OFF) + -DSERVICE_PAM=$(usex pam ON OFF) + -DSERVICE_POLKIT=$(usex polkit ON OFF) + -DHYPRLAND=$(usex hyprland ON OFF) + -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts) + -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab) + -DI3=$(usex i3 ON OFF) + -DI3_IPC=$(usex i3-ipc ON OFF) + -DBLUETOOTH=$(usex bluetooth ON OFF) + ) + cmake_src_configure }