git: 5499f1d544c7 - 2021Q2 - x11-wm/sway: backport some fixes for firefox >= 87

[Jan Beich]

The branch 2021Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5499f1d544c7e3b15a1059f5baf6be3b8b277c6c

commit 5499f1d544c7e3b15a1059f5baf6be3b8b277c6c
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-04-18 12:31:34 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-04-18 16:15:43 +0000

    x11-wm/sway: backport some fixes for firefox >= 87
    
    Fixes popup flickering with MOZ_ENABLE_WAYLAND. Already included in
    sway-1.6 via 2f03c33bdc2e from /latest package set.
    
    Inspired by:    Arch, Void
---
 x11-wm/sway/Makefile | 5 ++++-
 x11-wm/sway/distinfo | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 0f3c9516559a..fcf42b231ba8 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,7 +1,7 @@
 
 PORTNAME=	sway
 DISTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -11,6 +11,9 @@ PATCHFILES+=	968c005760b6.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	fdbe98512a71.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	a52176f83035.patch:-p1 # https://github.com/swaywm/sway/pull/5856
 PATCHFILES+=	c9fe0626ca73.patch:-p1 # https://github.com/swaywm/sway/pull/5891
+PATCHFILES+=	1a6471be172f.patch:-p1 # https://github.com/swaywm/sway/pull/6046
+PATCHFILES+=	79e43b19d795.patch:-p1 # https://github.com/swaywm/sway/pull/6046
+PATCHFILES+=	e7af5b630916.patch:-p1 # https://github.com/swaywm/sway/pull/6046
 
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 8d16ea61f70f..de87c59abf6a 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -13,3 +13,9 @@ SHA256 (a52176f83035.patch) = 503f0ce5699799b82332a414d76b2148d53d1066a1e77ff24b
 SIZE (a52176f83035.patch) = 2588
 SHA256 (c9fe0626ca73.patch) = 4f6005a1f7c9b454ab6e7c85a01b44c27cc5f2641e58bb220220fdceb7b111cb
 SIZE (c9fe0626ca73.patch) = 913
+SHA256 (1a6471be172f.patch) = d825b90b3c3e9bc98f1b84bef668fc7e9c2ca22f37e5faeeb7f104e49d09ae9c
+SIZE (1a6471be172f.patch) = 2037
+SHA256 (79e43b19d795.patch) = 0591e0467bf2ccd8cded9851e2a87ad831e183dd6a79fff86a9205c0eeee14f0
+SIZE (79e43b19d795.patch) = 1001
+SHA256 (e7af5b630916.patch) = 9ff1b9093fccdc34cd8dab97a60f54abd2c34af5b00925ca6f573a462ad1f141
+SIZE (e7af5b630916.patch) = 1395