git: 03855710ed22 - main - x11/wshowkeys: unbreak runtime after d81a61abe465

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=03855710ed221e2035d6a4062389f4af8cbbed39

commit 03855710ed221e2035d6a4062389f4af8cbbed39
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-08-01 10:00:33 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-08-01 10:06:34 +0000

    x11/wshowkeys: unbreak runtime after d81a61abe465
    
    $ WAYLAND_DEBUG=1 wshowkeys
    [...]
    [0.182]  -> wl_compositor at 5.create_surface(new id wl_surface at 3)
    [0.185]  -> zwlr_layer_shell_v1 at 7.get_layer_surface(new id zwlr_layer_surface_v1 at 11, wl_surface at 3, nil, 2, "showkeys")
    [0.192]  -> zwlr_layer_surface_v1 at 11.set_anchor(0)
    [0.194]  -> zwlr_layer_surface_v1 at 11.set_margin(32, 32, 32, 32)
    [0.198]  -> zwlr_layer_surface_v1 at 11.set_exclusive_zone(-1)
    [0.200]  -> wl_surface at 3.commit()
    [0.296]  -> wl_surface at 3.attach(nil, 0, 0)
    [0.302]  -> wl_surface at 3.commit()
    [0.313] wl_display at 1.error(zwlr_layer_surface_v1 at 11, 1, "width 0 requested without setting left and right anchors")
    zwlr_layer_surface_v1 at 11: error 1: width 0 requested without setting left and right anchors
    wl_display_dispatch: Protocol error
---
 x11/wshowkeys/Makefile | 4 ++++
 x11/wshowkeys/distinfo | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/x11/wshowkeys/Makefile b/x11/wshowkeys/Makefile
index 8045e1e06d6a..e3a1bd1888ad 100644
--- a/x11/wshowkeys/Makefile
+++ b/x11/wshowkeys/Makefile
@@ -1,9 +1,13 @@
 PORTNAME=	wshowkeys
 PORTVERSION=	s20200330
 DISTVERSIONSUFFIX=	-0-g6388a49
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
+PATCH_SITES=	https://github.com/ammgws/${PORTNAME}/commit/
+PATCHFILES+=	35b6f15bd088.patch:-p1 # https://old.reddit.com/r/swaywm/comments/ovfzpv/new_custodianmaintainerbugfix_needed_for_wshowkeys/
+
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	Display keystrokes for screencasts on wlroots compositors
 
diff --git a/x11/wshowkeys/distinfo b/x11/wshowkeys/distinfo
index ea40e5bab097..3379ec831426 100644
--- a/x11/wshowkeys/distinfo
+++ b/x11/wshowkeys/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1585574498
 SHA256 (wshowkeys-s20200330-0-g6388a49.tar.gz) = 1a32d4de6372464aa17f8da10688d03831edc838783ed72ee4ab15d830e0e808
 SIZE (wshowkeys-s20200330-0-g6388a49.tar.gz) = 26748
+SHA256 (35b6f15bd088.patch) = dea3c4bb80d3fa8647baedf315360ce7a129a81e80cfd9936adcaafbca15d8be
+SIZE (35b6f15bd088.patch) = 759