From nobody Fri Apr 28 20:14:04 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7P2P0lyPz47w20; Fri, 28 Apr 2023 20:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7P2P0Fvjz3KnW; Fri, 28 Apr 2023 20:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682712845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnGkJ8nRB7XJ/Jq6IS6lZxou1lAiP/K4XB8u4pJcTb8=; b=ZkhRFB1j959+AVwjFe03GRu66+QpMWdvQnIYIeOYjMeUYsJeDP0irGtOkAlivx5g4MVmSu urAE0mI7rPeRS59OTk5MlfYLxAa1pWJz2ntW9mgzzBeSZ60hpLBjZ+InssXi2qovVoEdqR ENb1jVwnJxiHC8OLFoslhw19q1T7AaEotBWL6MHzhquc6anEVm3V7nCPkJjJ6FFYoe92Wx brkuAAz33x2jJSYTzFnc4ooD4TJqFEn7XTXHyuidQXPVSaSxmbP7We8JjjS6nk/w8VolCp cw9mTRuSPEqNdXnD20mCGEMm1YwI4XLp3IFvLQY8JXUx2wID2ko25jp5FgIJSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682712845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnGkJ8nRB7XJ/Jq6IS6lZxou1lAiP/K4XB8u4pJcTb8=; b=hEhQW0wUr+5TtZhBHXLh5/xqU9KLFLdjQQIa2SB5DcdmAz3n0uo+VDThecuMyJhpu9RPoS +GM2QLObKp1/k2EgU5ahdFcTTcc5lh/hQwGokxdpPNNzNrfnJXf//dXgncTdoZFDfyWZut YAJySl9qxezRpvs9GaZ664EhDUfeb3QmBmLj1i/0o/HlG4bO63r6OTqS9CTDftkgN8J4gp rhp0+GUX8ukqcmpN4uALy1SAunhKV6MT83sj3GCQ/8kyVAsLFBadZpWTuAchsn575kyY4H RHFNdiAPtkyEy1dmfTuD1NhHP1iLzqvyp1/9ckUOga34toxtYZp91j+Xcpao0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682712845; a=rsa-sha256; cv=none; b=YVIIAyTwOfy6QGMoiaaFbscoAIECzjt8d6rmYyi9W1an5w2zyORCgIyzFVUXU4TiJmtOCh 8NhprhD769Xjg/spEMq9aJZGkYHJBuKzs0WCIh78569TQJqaReAAZ7YmzKA5cXHuIQdTys wM5kWuz5qXbGgpd8PRIL8dxGV7izQEpbYJ4FEBZYpoFys+bUPyxNEcCgQZwzIyDa31K+gO B/0jyZ6nn+Pdaxf6Q/X2xmwmb7ZLJ4ZPmmH5z126XJhIiaBDtHiCNjpHzTBeWiHXlmKI1Y JekqiNAD4tsDoS4fm92BYGm6EqtDypqSTa2y0Bhv5uJfEHqtGwCs9+TWFr3ZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7P2N6GWmz1CW3; Fri, 28 Apr 2023 20:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SKE4jj041365; Fri, 28 Apr 2023 20:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SKE4MF041364; Fri, 28 Apr 2023 20:14:04 GMT (envelope-from git) Date: Fri, 28 Apr 2023 20:14:04 GMT Message-Id: <202304282014.33SKE4MF041364@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d8e7e2cdb2b9 - main - x11/waybar: add hyprland_nopulse flavor List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8e7e2cdb2b9a7ef277a3baebdedaac084b30359 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8e7e2cdb2b9a7ef277a3baebdedaac084b30359 commit d8e7e2cdb2b9a7ef277a3baebdedaac084b30359 Author: Jan Beich AuthorDate: 2023-04-28 20:03:23 +0000 Commit: Jan Beich CommitDate: 2023-04-28 20:13:55 +0000 x11/waybar: add hyprland_nopulse flavor PR: 271089 --- x11/waybar/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 6c04d4770499..db5b07e2dcdb 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libdate-tz.so:devel/date \ libxkbregistry.so:x11/libxkbcommon TEST_DEPENDS= catch>0:devel/catch -FLAVORS= default hyprland nopulse +FLAVORS= default hyprland hyprland_nopulse nopulse CONFLICTS_INSTALL= ${PORTNAME}* USES= compiler:c++17-lang gnome meson pkgconfig @@ -33,7 +33,7 @@ PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config \ etc/xdg/${PORTNAME}/style.css -.if ${FLAVOR:U} == hyprland +.if ${FLAVOR:U:Mhyprland*} # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/40 MESON_ARGS+= -Dexperimental=true .endif @@ -46,7 +46,7 @@ SUB_FILES+= date.pc OPTIONS_DEFINE= DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER -.if ${FLAVOR:U} == nopulse +.if ${FLAVOR:U:M*nopulse} OPTIONS_EXCLUDE=PULSEAUDIO .endif @@ -144,7 +144,7 @@ post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/modules/wlr/taskbar.cpp -.if ${FLAVOR:U} == hyprland +.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