git: 50fe17b00a7d - main - x11-wm/hikari: Fix a bug

The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=50fe17b00a7d36abf86931f1ed32046479025741

commit 50fe17b00a7d36abf86931f1ed32046479025741
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2023-01-15 15:44:35 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2023-01-15 16:13:52 +0000

    x11-wm/hikari: Fix a bug
    
    - Add a patch where input from mouse/keyboard goes to the wrong view
    
    PR:             268758
    Reported by:    J.R. Oldroyd <fbsd at opal dot com>
---
 x11-wm/hikari/Makefile                         |  2 +-
 x11-wm/hikari/files/patch-Makefile             |  4 ++--
 x11-wm/hikari/files/patch-src_xwayland__view.c | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 56640dfca3f7..782bd3a62968 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hikari
 DISTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm wayland
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
diff --git a/x11-wm/hikari/files/patch-Makefile b/x11-wm/hikari/files/patch-Makefile
index 46b33dc0c0c6..8e8ab0298900 100644
--- a/x11-wm/hikari/files/patch-Makefile
+++ b/x11-wm/hikari/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-06-09 16:21:34 UTC
+--- Makefile.orig	2021-04-09 17:37:23 UTC
 +++ Makefile
-@@ -224,7 +224,7 @@ install: hikari hikari-unlocker share/man/man1/hikari.
+@@ -252,7 +252,7 @@ install: hikari hikari-unlocker share/man/man1/hikari.
  	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
diff --git a/x11-wm/hikari/files/patch-src_xwayland__view.c b/x11-wm/hikari/files/patch-src_xwayland__view.c
new file mode 100644
index 000000000000..cb7e8d04b77b
--- /dev/null
+++ b/x11-wm/hikari/files/patch-src_xwayland__view.c
@@ -0,0 +1,10 @@
+--- src/xwayland_view.c.orig	2023-01-15 15:39:48 UTC
++++ src/xwayland_view.c
+@@ -304,6 +304,7 @@ activate(struct hikari_view *view, bool active)
+   struct wlr_xwayland_surface *xwayland_surface = xwayland_view->surface;
+ 
+   wlr_xwayland_surface_activate(xwayland_surface, active);
++  wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_ABOVE);
+   wlr_xwayland_set_seat(hikari_server.xwayland, hikari_server.seat);
+ }
+