From 5a111b52b0e1956376908fb6de7faaf656773ac9 Mon Sep 17 00:00:00 2001 From: Zachary Hall Date: Wed, 20 Nov 2024 09:23:50 -0800 Subject: [PATCH] Fix build of Looper --- .../files/default-wayfire.patch | 27 +++++++++++++++++++ .../lxqt-wayland-session-9999.ebuild | 24 +++++++++++++++++ media-sound/looper/looper-9999.ebuild | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 lxqt-base/lxqt-wayland-session/files/default-wayfire.patch create mode 100644 lxqt-base/lxqt-wayland-session/lxqt-wayland-session-9999.ebuild diff --git a/lxqt-base/lxqt-wayland-session/files/default-wayfire.patch b/lxqt-base/lxqt-wayland-session/files/default-wayfire.patch new file mode 100644 index 0000000..224796a --- /dev/null +++ b/lxqt-base/lxqt-wayland-session/files/default-wayfire.patch @@ -0,0 +1,27 @@ +diff --git a/startlxqtwayland.in b/startlxqtwayland.in +index c2e14d5..6fe60d0 100644 +--- a/startlxqtwayland.in ++++ b/startlxqtwayland.in +@@ -83,18 +83,10 @@ valid_layouts=$(grep -A98 '! layout' /usr/share/X11/xkb/rules/base.lst | awk '{p + trylayout=$(echo $LANG | cut -c 1,2) + + if [ -z "$COMPOSITOR" ]; then +- echo "No compositor configured yet in Session Settings, trying labwc..." +- COMPOSITOR=labwc +- export XDG_CURRENT_DESKTOP="LXQt:wlroots" +- +- # enable cursor on VM (systemd only) +- if type systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt --quiet; then +- export WLR_NO_HARDWARE_CURSORS=1 +- echo "Running on virtualized hardware" +- fi +- exec $COMPOSITOR -C "$share_dir"/lxqt/wayland/firstrun -S lxqt-config-session +- +-elif [ "$COMPOSITOR" = "labwc" ]; then ++ echo "No compositor configured yet in Session Settings, trying wayfire..." ++ export COMPOSITOR=wayfire ++fi ++if [ "$COMPOSITOR" = "labwc" ]; then + # Copy default configuration if not existing and set keyboard layout if different from us + if [ ! -d "$XDG_CONFIG_HOME/labwc" ]; then + cp -av "$share_dir"/lxqt/wayland/labwc "$XDG_CONFIG_HOME"/ # use default location here diff --git a/lxqt-base/lxqt-wayland-session/lxqt-wayland-session-9999.ebuild b/lxqt-base/lxqt-wayland-session/lxqt-wayland-session-9999.ebuild new file mode 100644 index 0000000..9a15ee9 --- /dev/null +++ b/lxqt-base/lxqt-wayland-session/lxqt-wayland-session-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit git-r3 cmake + +DESCRIPTION="LXQt wayland session" +HOMEPAGE="https://github.com/lxqt/lxqt-wayland-session" +EGIT_REPO_URI="https://github.com/lxqt/lxqt-wayland-session.git" +#SRC_URI="" + +IUSE="compositor" + +LICENSE="GPL3" +SLOT="0" +KEYWORDS="~amd64" +PATCHES=( + "default-wayfire.patch" +) + +DEPEND="lxqt-base/lxqt-session app-misc/qtxdg-tools kde-plasma/layer-shell-qt compositor? ( gui-wm/wayfire )" +RDEPEND="${DEPEND}" +BDEPEND="dev-util/lxqt-build-tools" diff --git a/media-sound/looper/looper-9999.ebuild b/media-sound/looper/looper-9999.ebuild index 52e1a4f..13bb596 100644 --- a/media-sound/looper/looper-9999.ebuild +++ b/media-sound/looper/looper-9999.ebuild @@ -107,7 +107,7 @@ BDEPEND="virtual/pkgconfig" # The following src_configure function is implemented as default by portage, so # you only need to call it if you need a different behaviour. src_configure() { - declare -a mycmakeargs=( -DDISABLE_GTK_UI=ON -DBUILD_SOUNDTOUCH=ON -DBUILD_SHARED_LIBS=OFF -DSOUNDSTRETCH=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo ) + declare -a mycmakeargs=( -DDISABLE_GTK_UI=ON -DBUILD_SOUNDTOUCH=ON -DBUILD_SHARED_LIBS=OFF -DSOUNDSTRETCH=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_VORBIS=OFF -DUSE_CELT=OFF -DUSE_ATRAC9=OFF -DUSE_G719=OFF ) # Most open-source packages use GNU autoconf for configuration. cmake_src_configure }