git: 0bfb41c6e4ce - 2023Q3 - x11/waybar: drop hyprland* flavors after 0f650f15e117
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 03 Sep 2023 12:00:21 UTC
The branch 2023Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0bfb41c6e4cef6d40f60415cf0fa0d8c12cdca6a
commit 0bfb41c6e4cef6d40f60415cf0fa0d8c12cdca6a
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-01 15:43:02 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-03 12:00:08 +0000
x11/waybar: drop hyprland* flavors after 0f650f15e117
https://github.com/hyprwm/Hyprland/commit/bb0933437f46
This reverts commit be4f4ef88e4991abb818401e785dd51233ff283c.
(cherry picked from commit ea3553f41bda374038c14f6fb02ec30763bba81d)
---
x11/waybar/Makefile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index 93166c914b68..738027905bd0 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libdate-tz.so:devel/date \
libxkbregistry.so:x11/libxkbcommon
TEST_DEPENDS= catch>0:devel/catch
-FLAVORS= default hyprland hyprland_nopulse nopulse
+FLAVORS= default nopulse
CONFLICTS_INSTALL= ${PORTNAME}*
USES= compiler:c++20-lang gnome meson pkgconfig
@@ -32,11 +32,6 @@ PLIST_FILES= bin/${PORTNAME} \
etc/xdg/${PORTNAME}/config \
etc/xdg/${PORTNAME}/style.css
-.if ${FLAVOR:U:Mhyprland*}
-# https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/40
-MESON_ARGS+= -Dexperimental=true
-.endif
-
# XXX Add pkg-config support to devel/date
.if exists(${.CURDIR}/files/date.pc.in)
CONFIGURE_ENV+= PKG_CONFIG_PATH="${WRKDIR}"
@@ -154,11 +149,6 @@ post-patch:
# Respect PREFIX for icons
@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
${WRKSRC}/src/modules/wlr/taskbar.cpp
-.if ${FLAVOR:U:Mhyprland*}
-# Use hyprctl to switch workspaces
- @${REINPLACE_CMD} 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' \
- ${WRKSRC}/src/modules/wlr/workspace_manager.cpp
-.endif
pre-test:
@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \