From nobody Sun Sep 3 11:59:33 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 4Rdr0j2WQ2z4s0mQ; Sun, 3 Sep 2023 11:59:33 +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 4Rdr0j1sKHz3JVL; Sun, 3 Sep 2023 11:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693742373; 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=fMu33P9fIS1o7GhblSZhSXW7IXOn/KsnPXi2fYV5MGI=; b=Ljq3AfYTq6X5++K+DuFARl357IMvaE9rSatGV8k7h6QVspomefPK7Bn/0no4sZFnSyAdyF 23DQO4yNUXgFMJgWWPhCmSCZHyntYmscPoen5yJo+FdkqHXHRKnGOXuGGS8OtG8rADM79y GMJdrVNPx7WKqMmKOxXd8dqpIywHQ/2nKk6ZrmD+31vZSlFDRPZwFap9yVPfG/Uc+Bhlfx kpuwcAU4HJwzTahQpzFBD2nbfgXg+jHFp4I4uDCe/SVCaL867rjWtFkvt6fOEMp8CsAl1S ikUwSy7M+PZFFJZnzbJxLwUwmN98C+Qs0TFN9yGjfgxczkdZgX3un4Q0ZJ3eCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693742373; a=rsa-sha256; cv=none; b=TRr67ytF6+vQdF6XV2E6+d08tv3mZx9rrbeabyrFnRW9AHUX7fTkLZGIpp0qiLqbrizbck fTlQ1tsbuj3qLkmaC5xRe4iYRlatWGPiekuMrZpYXk7vKrd3HXRdghaxnZzeYpLpjL3M/H Acm2TE5eNZqVNIwAjFfbQPapiSVLl06dtWCP34iemPET3amWvGXnqFqrDDxh2oYi5ZNBSA 2WiAZnz89+62kTlbLGmAcYHsTGVSm27LT081jEoz8FVLGJb67kv9/l4eGUucwg7pTzv16s T22j3NCTDD7S+SXO8ycuPF3VdaEZXlbrQ4HDYSUcW2+NBT6zQUDeBIQvcVVOHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693742373; 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=fMu33P9fIS1o7GhblSZhSXW7IXOn/KsnPXi2fYV5MGI=; b=m19IAABdx9g7Pzr4XCE8P8kygWveFcVwNrbVF85oE6pNuIekT5KdVCq54OfGWFKEzhUfMw GAfima7ir1oVk8eytf5kCZfB/Rj8NwxUkM5WcBN///jsrF/YSKo0TgXDYvW8CsQePGNrlJ 9Cu26wH1RCG5SVyPVgOUmOHWUu3ZxWLWzrLuKYfFuCYkY/CaL9gwO20lXizjkGBmSMaTBf Oly7Fu0akAOP+E8NsBohObeTS4rHDvJ9U1IRurHn8bWknTG+pNRS4Rn2Odrm9I4uPe3HzV bwRffTXUw82ZOMIGW9uNdb7NOaFNg4fTCJSumafXgqmNty9LfAYP3haJ4QuPWw== 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 4Rdr0j0tXkz8Vx; Sun, 3 Sep 2023 11:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383BxXjd045921; Sun, 3 Sep 2023 11:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383BxXRS045918; Sun, 3 Sep 2023 11:59:33 GMT (envelope-from git) Date: Sun, 3 Sep 2023 11:59:33 GMT Message-Id: <202309031159.383BxXRS045918@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: ea3553f41bda - main - x11/waybar: drop hyprland* flavors after 0f650f15e117 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/main X-Git-Reftype: branch X-Git-Commit: ea3553f41bda374038c14f6fb02ec30763bba81d Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea3553f41bda374038c14f6fb02ec30763bba81d commit ea3553f41bda374038c14f6fb02ec30763bba81d Author: Jan Beich AuthorDate: 2023-09-01 15:43:02 +0000 Commit: Jan Beich CommitDate: 2023-09-03 11:55:56 +0000 x11/waybar: drop hyprland* flavors after 0f650f15e117 https://github.com/hyprwm/Hyprland/commit/bb0933437f46 This reverts commit be4f4ef88e4991abb818401e785dd51233ff283c. --- 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 \