From nobody Wed Apr 05 14:25:26 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 4Ps6Nl0lPJz43YM3; Wed, 5 Apr 2023 14:25:27 +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 4Ps6Nl0KqLz3kLr; Wed, 5 Apr 2023 14:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680704727; 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=3OmuJZouhHjH27mvs+KxZsitTIw2T82BO925wy2Eswk=; b=Dw57puWDphdaBVtX8JeBXkTqkYqgJSWamSwb4inSlaMkoDUx6WpIEm5x+uyc1jx7XmAs6E iHZpDwK1cFIIJxzro3gBDfCu1AUj/pEbW/A7YoAJWVUB63rNYiqTM4+jqVc25otnCZhwYd jt4tV6dHfZwjgyXEhlvwiDTQb8YBDGV8IItKP6VfufBVouzLnxyZ5LMop1Eu5IJgmGDx41 kJ6yACkCPk2WWOEMIQHyTwKeZuX2vK/RPuU8THgirfAX8/tiWF6Ai9+zLaRg8PwOUDrjFJ NX2o06/Zt8jOLPDRy3+XbucS5a1fpTtBF147FVPB3EneE2gGWiNtxXY+K65+4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680704727; 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=3OmuJZouhHjH27mvs+KxZsitTIw2T82BO925wy2Eswk=; b=lcYffRKTUaBq2BXqfqyylHQ5EeTdfzXq3Y3++H0RrzBJJDOv94j8on8F5gj1HZJQRMXxfx bzlpqj+/nTzWKWn40k50IG+C9Jp8Uf2JEO5T3Gm5t0YTSTJUHl2Zzb2q8m0DRY9wz3t6rr hIvt+uFUxpy2uF+mdgZhqC+gTkBFtW6b1X5fRu0BioTYInrmev6OM3kNyZaTpv4cg6GcNb QLO57F5towAVxZOBPv1AT2g304ssV4Wn2fmhrZMCffWlgAHvFvg7ZGpZclzdfPujUWTv4i M9zBrbshPECjCuxVoZiuPjxTYoBPTdST2/3YIk9/oRl8caJh8a9kZC1KtgigFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680704727; a=rsa-sha256; cv=none; b=ls/x5ts0N6vS6Wf8nafUilQXx0FrfpCcqH3Kf7Mnk7NuxvA9mi8ZOAgpoQzWXQOPJ+Pl2/ JdYPj+ZxjMwveINAnONfJkZXF7esKZOoOGVaKtWm3lE4hy8mJdIF5ko9q1wj3AnzgZilDc ano6lQERAsyKP+LJAfjFdSLuHr7ooizwdwyf7eBTNa0cTOa16TfOWrhN6+vMjLCW+CO9J6 fDpH4ApnNrn7y6+y1MTNz7MqAtoS1MSLDQnE/q7WsEjDZmccckWklhyOrTrUTtkX1wMuK2 /GAqYxxXD7ZH9JpoGrts5CCn7QpNiBuiA5c54hW0c+q7kOuPOD5hYMD/+u9/uQ== 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 4Ps6Nk6Y53zQVQ; Wed, 5 Apr 2023 14:25:26 +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 335EPQ1D066342; Wed, 5 Apr 2023 14:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335EPQNB066341; Wed, 5 Apr 2023 14:25:26 GMT (envelope-from git) Date: Wed, 5 Apr 2023 14:25:26 GMT Message-Id: <202304051425.335EPQNB066341@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: be4f4ef88e49 - main - x11/waybar: add hyprland 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: be4f4ef88e4991abb818401e785dd51233ff283c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=be4f4ef88e4991abb818401e785dd51233ff283c commit be4f4ef88e4991abb818401e785dd51233ff283c Author: Jan Beich AuthorDate: 2023-04-05 14:07:02 +0000 Commit: Jan Beich CommitDate: 2023-04-05 14:25:20 +0000 x11/waybar: add hyprland flavor https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar --- x11/waybar/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 74cbbd6f03b4..864cc22dcfc2 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 nopulse +FLAVORS= default hyprland nopulse CONFLICTS_INSTALL= ${PORTNAME}* USES= compiler:c++17-lang gnome meson pkgconfig @@ -33,6 +33,11 @@ PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config \ etc/xdg/${PORTNAME}/style.css +.if ${FLAVOR:U} == hyprland +# 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}" @@ -139,6 +144,11 @@ post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/modules/wlr/taskbar.cpp +.if ${FLAVOR:U} == hyprland +# 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 \