From nobody Fri Apr 28 20:14:16 2023 X-Original-To: dev-commits-ports-all@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 4Q7P2d0lyyz47vDZ; Fri, 28 Apr 2023 20:14:17 +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 4Q7P2d0Fblz3KjL; Fri, 28 Apr 2023 20:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682712857; 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=QRYIta+QWSL3IsYH3Sy7MJTVJ5LjoI9w2ke0P/iz9HM=; b=uxbdiRZesszDIDOkcbDBI9emEA6ylT4WxGhiAvl70xssCkbsaX8nI30kFTWECjbfuIcxXT Q4gelhMbTBH5JCTuQg3xMBC1ZZSpeO8ZQLOIVwgzj3DWoZzPsF0U0zxZe//WxxzjsVTORh JgTZu8uKJ7AqCk9nnlfjQbDyti0AOXVazExfElHKA66wQuv0u3zM4S2kuvNXiNtiFlqUDK i7iHejgNqMWNHKw6IbZU8aQ5wHDI1UlMoCXNkJXsko363PNjkkrkGvWuFFW6f+xxjPslNP tVMqwrbDYKtW2fp1uX4EI7g7zmV4ptTXMwfuneQKT4bfVKhfx3s+A5VhKn49iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682712857; 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=QRYIta+QWSL3IsYH3Sy7MJTVJ5LjoI9w2ke0P/iz9HM=; b=UJX0Q2b916CVx0VjUtcumSKXmcKs7SpLmd+jpaTB08mLo7znEn8CNqF5go4+LsTRh81BLM 23TaFLmhDRtswH5VOw+s6vs1iqxysOR/9NrUFFv5mMTKFYR0TDa9AU+07bBcwxl5OkFsGv F3MGyNZQ2hEqkDoHeuyXX+IiBQGiTL1mFnzdBi+OpD/RD/KAAKb8naFNBboIPOfIq/FzCj q1f+rbWhvcSnl5D5u8d0HNUOwaXjW/Hi0AtolttkxjjcykBYbgFAXnV0su3q86p9ExSk9z ffVe3qZHSceQ3Y59va+9vYGai9tmIP2q3gUwZ5f2LZJPLqhb/HSsNMQSr3mvdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682712857; a=rsa-sha256; cv=none; b=pwqqFvoDcl69FrVrs3Hp0TA1CC5BPDpzaErypGsgxl/CkDk1rKSdBZMUyRNP+4BGGZDOqK 849q3+9ciA9tO7AKWOn25BAY0YJpTFbXd7RmlaBCTt88weQMo9E63CJmor/dtN1wsgWk+W bBOgXeugOqgfS70GrbVw0p/p1eMChxYbpMPAD5aoUsqVqcr78KY4usbuD2rQ4lYMm6vP7/ VSc4O0Q6+hIYgBpSrzVYuhS/HNseYi5pzg7FULbMDdGqF+BAXvyLzAqDxgMvf4gV7PAByH jX6eGFPFopNeBI/M5T+kXiCkqJBfVyDhH46qSfkgFhLucvuYceVSzAC+O8AE1g== 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 4Q7P2c6Q0vz1Cr0; Fri, 28 Apr 2023 20:14:16 +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 33SKEGhD041509; Fri, 28 Apr 2023 20:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SKEG7Z041508; Fri, 28 Apr 2023 20:14:16 GMT (envelope-from git) Date: Fri, 28 Apr 2023 20:14:16 GMT Message-Id: <202304282014.33SKEG7Z041508@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 5123e648f417 - 2023Q2 - x11/waybar: add hyprland_nopulse flavor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 5123e648f417db2ef53663b1ebacfb8a14cabe68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5123e648f417db2ef53663b1ebacfb8a14cabe68 commit 5123e648f417db2ef53663b1ebacfb8a14cabe68 Author: Jan Beich AuthorDate: 2023-04-28 20:03:23 +0000 Commit: Jan Beich CommitDate: 2023-04-28 20:14:11 +0000 x11/waybar: add hyprland_nopulse flavor PR: 271089 (cherry picked from commit d8e7e2cdb2b9a7ef277a3baebdedaac084b30359) --- x11/waybar/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 864cc22dcfc2..86d7af30cd0e 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