From nobody Fri Dec 17 18:03:17 2021 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 389E418EDC3C; Fri, 17 Dec 2021 18:03:18 +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 4JFxfs6Vdrz4hH9; Fri, 17 Dec 2021 18:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BF17320696; Fri, 17 Dec 2021 18:03:17 +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 1BHI3HjS095139; Fri, 17 Dec 2021 18:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHI3HSb095138; Fri, 17 Dec 2021 18:03:17 GMT (envelope-from git) Date: Fri, 17 Dec 2021 18:03:17 GMT Message-Id: <202112171803.1BHI3HSb095138@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: 3bccb3b0d286 - main - x11-wm/sway: unbreak workspace switching after 2af7805da5c5 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: 3bccb3b0d286858d7124075fbc125ae0bc737831 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639764197; 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=9NkyEKcECDR6tCs7BNHe5b9gEU/Zeu2Mq9PnjIhNcyE=; b=NCNw3Z5P6VQWOKcAv67BJg2uXWU8Z9E60KP0qLJgrL4K6oQBwAfa7wswtGDITBNEK5liNf Ss+nhW25cCYX80uoFjn5gw4RipDvczL7RYxPZKQ2CegMffZ8ATC0dH0aIrZbjpd1jWO/d9 hbXfXEzHP0S3JQfDFocwJKTU7BbxpRxt4Dsjp4B7iQR2oHVbSixFM+qk2PoqclB/+pakd1 oCuKamRudIivA5pCLQnYFSz/2FXbXWG80GVBVlP6z/qfTGpwBpPmtWjcGwMjWR4opAN/7w lX20seSgYaACMazdEVytHnyWCPgwAyqds6vtGOHJ5XfIt6k+ijSPGSfghoehPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639764197; a=rsa-sha256; cv=none; b=c6QzvpNlB/5mkeXomU43TEo4lgubO9DLB7hh8SYiPe2qxC9inA5rU+LcEriJxf1Yww5ylk 99IpkCFMiz/4Yrd2NKN9VR5NXbih08PoMPRwbH1FO3txEyD3Hm8PvkLnMfzf8xVV4nFKrJ XCMWqxXppEOa6s0NbOoFLFUOtRzktRijnGR06L1+2Hw2I6HkDshoIpclogtSqOy/bVt3+7 Nm03DoOZwTISeOLN1xdtQQJM01SvsgXAui51xXwsoMG9dWcFyhmMm9/T0cmH70oCFcMUGN sjR7+cu6hNhHKzLkL+YkKYTHIC5InzEX+79QgnLXd0xg5U+Y85wg040DFPuNUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bccb3b0d286858d7124075fbc125ae0bc737831 commit 3bccb3b0d286858d7124075fbc125ae0bc737831 Author: Jan Beich AuthorDate: 2021-12-17 17:57:33 +0000 Commit: Jan Beich CommitDate: 2021-12-17 18:02:39 +0000 x11-wm/sway: unbreak workspace switching after 2af7805da5c5 Somehow the following got lost during rebase: void handle_new_output(struct wl_listener *listener, void *data) { struct sway_server *server = wl_container_of(listener, server, new_output); struct wlr_output *wlr_output = data; + if (wlr_output == root->fallback_output->wlr_output) { + return; + } + sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)", wlr_output, wlr_output->name, wlr_output->non_desktop); --- x11-wm/sway/Makefile | 4 ++-- x11-wm/sway/distinfo | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index cdefc08c0bcc..b0fee61904f5 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,6 +1,6 @@ PORTNAME= sway DISTVERSION= 1.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -23,7 +23,7 @@ PATCHFILES+= 94680d1aa044.patch:-p1 # wlroots 0.15 PATCHFILES+= 0c210a5e68ea.patch:-p1 # wlroots 0.15 PATCHFILES+= 3e2f3f5d67b8.patch:-p1 # wlroots 0.15 PATCHFILES+= 729e18bff5ff.patch:-p1 # wlroots 0.15 -PATCHFILES+= d475eb2d8089.patch:-p1 # wlroots 0.15 +PATCHFILES+= 95dd7b6715c6.patch:-p1 # wlroots 0.15 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index f572dc41ebad..be2fcd78662d 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -39,5 +39,5 @@ SHA256 (3e2f3f5d67b8.patch) = 93afa35c723a687c80f4fb097e740b4cc4e064712b0e20aeac SIZE (3e2f3f5d67b8.patch) = 6930 SHA256 (729e18bff5ff.patch) = 84057f5efe10ccf4e7b5b2536edf37aa39ba230dcdf7cffc8dc7af7b9fc0c8b2 SIZE (729e18bff5ff.patch) = 1285 -SHA256 (d475eb2d8089.patch) = 01ae1c03758fed3d58a86cbf442613f5b57f7dc7dacb0057869b85f543458841 -SIZE (d475eb2d8089.patch) = 9277 +SHA256 (95dd7b6715c6.patch) = 907c2609da409daf00d1679a544427140dc547be5427da5aa70a27f65b975543 +SIZE (95dd7b6715c6.patch) = 9771