git: 3bccb3b0d286 - main - x11-wm/sway: unbreak workspace switching after 2af7805da5c5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Dec 2021 18:03:17 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3bccb3b0d286858d7124075fbc125ae0bc737831
commit 3bccb3b0d286858d7124075fbc125ae0bc737831
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-17 17:57:33 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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