public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/hyprland-plugins/files/, gui-apps/hyprland-plugins/
@ 2023-04-16 16:17 Julien Roy
  0 siblings, 0 replies; 2+ messages in thread
From: Julien Roy @ 2023-04-16 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     03b32bba7204d35c036f88d26d5c56c743fa38b8
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Apr 16 16:17:28 2023 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
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"


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/hyprland-plugins/files/, gui-apps/hyprland-plugins/
@ 2023-05-08 12:43 Julien Roy
  0 siblings, 0 replies; 2+ messages in thread
From: Julien Roy @ 2023-05-08 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     d825e119814c9f86f57dcd093b9cd3eb30036cb0
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon May  8 12:43:12 2023 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon May  8 12:43:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d825e119

gui-apps/hyprland-plugins: re-add split-monitor-workspaces

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

 gui-apps/hyprland-plugins/Manifest                        |  1 +
 .../hyprland-plugins/files/split-monitor-workspaces.patch | 13 -------------
 gui-apps/hyprland-plugins/hyprland-plugins-0.25.0.ebuild  | 15 +++++++++++++--
 gui-apps/hyprland-plugins/metadata.xml                    |  1 +
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gui-apps/hyprland-plugins/Manifest b/gui-apps/hyprland-plugins/Manifest
index c97341498..febcd455d 100644
--- a/gui-apps/hyprland-plugins/Manifest
+++ b/gui-apps/hyprland-plugins/Manifest
@@ -1,2 +1,3 @@
 DIST hyprland-plugins-0.25.0-hyprsrc.gh.tar.gz 1510798 BLAKE2B c146c57e5142666ff76188e870ea4d2dd9613e25a1d2c3320dc222fbe62651975a40fffffe9cc936ced0e86f919534d7a6c94a8b1596f912c3ad9750a35e4f13 SHA512 84d12ef7bfb25e69c4a707a8ffc99ca23eb58e73630e3df1f134cb610c6206e42917f76b54db0cc6d10e7b929514cbac06dfc99feba8ff81aea0dc7fcb340450
+DIST hyprland-plugins-0.25.0-split-monitor-workspaces.gh.tar.gz 4498 BLAKE2B 127081c953ce818b80b5865ec48fbf35584f3f5f2945c168e1ecf150dda5f71fdac499c236a5baa34502e0ab69e3fe0fc652d0bfd8c14aaedb74ecb03792b9ba SHA512 47e1dc0a9bcb014a6c7113405ddbc87a5e5f267d65e82ea9f557c1be156cd7e269fdf80406697b295e0f66f53e0d4ccc5a768910f201d6a459f68a8ad7708a93
 DIST hyprland-plugins-0.25.0.gh.tar.gz 12209 BLAKE2B c5f74cbe13e99f71a24a272a015df70f20ae62f9e552d35914ccff37474b564a28ff81e60584caf186d111e1e3a0716e7ba03b3e201823616167708ef0aa2a0f SHA512 875c7cdb2552d5c8e68a6705f7d82173fa6f3e7637b049125d88e6b4a130f330c66b49bbb2685d302345d101fba6f23d873e7511b2fad510d1a9286c127fbaf7

diff --git a/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch b/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch
deleted file mode 100644
index 43ffc090f..000000000
--- a/gui-apps/hyprland-plugins/files/split-monitor-workspaces.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.25.0.ebuild b/gui-apps/hyprland-plugins/hyprland-plugins-0.25.0.ebuild
index ef0f7b024..ff1201696 100644
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.25.0.ebuild
+++ b/gui-apps/hyprland-plugins/hyprland-plugins-0.25.0.ebuild
@@ -6,19 +6,22 @@ EAPI=8
 inherit meson
 
 COMMIT=1228eb57f9debd35811f0ade43bef5eaa09aab42
+SPLITCOMMIT=44785cee3fc0b2aa34a92882df31568bea3af8f0
 DESCRIPTION="A blazing fast wayland wallpaper utility"
 HOMEPAGE="https://github.com/hyprwm/hyprland-plugins"
 SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz
 	https://github.com/hyprwm/Hyprland/releases/download/v${PV}/source-v${PV}.tar.gz \
 	-> ${P}-hyprsrc.gh.tar.gz
+	https://github.com/Duckonaut/split-monitor-workspaces/archive/${SPLITCOMMIT}.tar.gz \
+	-> ${P}-split-monitor-workspaces.gh.tar.gz
 "
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars"
-REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars )"
+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}"
@@ -67,6 +70,10 @@ src_compile() {
 		EMESON_SOURCE="${S}/hyprbars"
 		meson_src_compile
 	fi
+
+	if use split-monitor-workspaces; then
+		emake -C "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" split-monitor-workspaces.so
+	fi
 }
 
 src_install() {
@@ -83,6 +90,10 @@ src_install() {
 	if use hyprbars; then
 		newins "${WORKDIR}/${P}-build/hyprbars/libhyprbars.so" "hyprbars.so"
 	fi
+
+	if use split-monitor-workspaces; then
+		doins "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}/split-monitor-workspaces.so"
+	fi
 }
 
 pkg_postinst() {

diff --git a/gui-apps/hyprland-plugins/metadata.xml b/gui-apps/hyprland-plugins/metadata.xml
index b37837bc3..bc2cc6a37 100644
--- a/gui-apps/hyprland-plugins/metadata.xml
+++ b/gui-apps/hyprland-plugins/metadata.xml
@@ -15,5 +15,6 @@
 		<flag name="borders-plus-plus">adds one or two additional borders to windows</flag>
 		<flag name="csgo-vulkan-fix">fixes custom resolutions on CS:GO with -vulkan</flag>
 		<flag name="hyprbars">adds title bars to windows</flag>
+		<flag name="split-monitor-workspaces">A small plugin to provide awesome/dwm-like behavior with workspaces</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-05-08 12:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-16 16:17 [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/hyprland-plugins/files/, gui-apps/hyprland-plugins/ Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2023-05-08 12:43 Julien Roy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox