public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: gui-apps/hyprland-plugins/, gui-apps/hyprland-plugins/files/
Date: Mon, 17 Apr 2023 09:22:24 +0000 (UTC)	[thread overview]
Message-ID: <1681661868.03b32bba7204d35c036f88d26d5c56c743fa38b8.flow@gentoo> (raw)

commit:     03b32bba7204d35c036f88d26d5c56c743fa38b8
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Apr 16 16:17:28 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 16:17:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=03b32bba

gui-apps/hyprland-plugins: support building split-monitor-workspaces without wlroots[X]

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

 .../files/split-monitor-workspaces.patch                | 13 +++++++++++++
 .../hyprland-plugins/hyprland-plugins-0.24.1.ebuild     | 17 +++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch b/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch
new file mode 100644
index 000000000..43ffc090f
--- /dev/null
+++ b/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 264f1aa..ee88b24 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ ifndef HYPRLAND_HEADERS
+ endif
+ 
+ $(PLUGIN_NAME).so: $(SOURCE_FILES) $(INCLUDE_FILES)
+-	g++ -shared -fPIC --no-gnu-unique $(SOURCE_FILES) -o $(PLUGIN_NAME).so -g -I "/usr/include/pixman-1" -I "/usr/include/libdrm" -I "${HYPRLAND_HEADERS}" -Iinclude -std=c++23
++	g++ -shared -fPIC --no-gnu-unique $(SOURCE_FILES) -o $(PLUGIN_NAME).so -g -I "/usr/include/pixman-1" -I "/usr/include/libdrm" -I "${HYPRLAND_HEADERS}" -Iinclude -std=c++23 -DNO_XWAYLAND
+ 
+ clean:
+ 	rm -f ./$(PLUGIN_NAME).so

diff --git a/gui-apps/hyprland-plugins/hyprland-plugins-0.24.1.ebuild b/gui-apps/hyprland-plugins/hyprland-plugins-0.24.1.ebuild
index 9c5189a1f..c674218ec 100644
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.24.1.ebuild
+++ b/gui-apps/hyprland-plugins/hyprland-plugins-0.24.1.ebuild
@@ -18,18 +18,31 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars split-monitor-workspaces"
+IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars split-monitor-workspaces X"
 REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars split-monitor-workspaces )"
 
 RDEPEND="gui-wm/hyprland"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	~gui-wm/hyprland-${PV}
-	split-monitor-workspaces? ( gui-libs/wlroots[X] )
+	split-monitor-workspaces? ( gui-libs/wlroots[X?] )
 	x11-libs/libdrm
 	x11-libs/pixman
 "
 
+src_unpack() {
+	default
+	cp "${FILESDIR}/split-monitor-workspaces.patch" "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" || die
+}
+
+src_prepare() {
+	eapply_user
+	if use split-monitor-workspaces && ! use X; then
+		cd "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" || die
+		eapply "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}"
+	fi
+}
+
 src_compile() {
 	emake -C "${WORKDIR}/hyprland-source" protocols
 	export HYPRLAND_HEADERS="${WORKDIR}/hyprland-source"


                 reply	other threads:[~2023-04-17  9:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1681661868.03b32bba7204d35c036f88d26d5c56c743fa38b8.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox