From nobody Sun Jan 15 16:13:57 2023 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 4Nw0Zt01tHz2tlKy; Sun, 15 Jan 2023 16:13:58 +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 4Nw0Zs6bjfz3G2k; Sun, 15 Jan 2023 16:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673799237; 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=hwlvZW1Iipmi+IsFJT5DTuTPCadSIRAREY6YDKNl5XE=; b=bf/RdailWMA2BliLKEdJhob3RAZ6Ss9J9/+0e/9P9Q6hx/6pT3cLdglRIcmB0vuFfBiDy1 CvFLQaAiyaoz5PYdio/wM56lxdImr5KfEXKjywVA3Ejpkk7hPGsTfI1X0S0aGYj5t50WHK nC+p7fYlfFUagge8GEjRE8w8dF6W5X6HtyRryuQhgm9862fC3yrBzGXkPoNofuMnLEc7k/ mdPb+yJQs867MDiMOHadr9h8YVuznk2QGHz3pXzRHiQY77VSShdoUfJ65F2qry+7iL47i/ soT4eLjn94+f7MzM90GzTHvgQpJKfrE99uQFof5rXP41QpiQHW3tXcmqn6rRbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673799237; 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=hwlvZW1Iipmi+IsFJT5DTuTPCadSIRAREY6YDKNl5XE=; b=tmhAVqc6ZoFoU4FsdsgUlpSlEHRLDjQtNICI6AB3a1f7lznmZ8Gxlhyn9uVRHuDUuR7js2 ndxjydXJnfW5Isl8qjduRrJd05emnqhklAkXqQyqbycyfYmAOQ4UjsQJ/sZVWUeE6BQWZW EjU9OB+gvLvWXys+7GRTLOsxF89yqwMsKGa0i3gXOP1txnbEv4QLOuL0ewo93N/U6KpmZW 5fU/e2IOo2xMlyJel83Und11NlYmX5cRgrjL55FjqmAXsMNzQZ3Bp61i5VhzjUaIqbclcU a7ZfclzPap8D8DruvHVdMiZ5Tc0Jr7Kk7RZnTwcI0rykHukmk56f7jWwdpdvHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673799237; a=rsa-sha256; cv=none; b=wVyKOuocY2V1Ljs19W8ArqqQQFJkjXvEl7JzK9a6CaYURAShMx/D5RKMREVbbeYNDmg8PD fqDcPYfY2oAMu0VgL76gyb02BKHR9AzjOXYz42mMRwTuVFq3zp04LJaKO4Xp0x1/1YQl8S j03TGZr2tS/oNMKR+DHbjtKkM5mJdOnTi9rDP5+iiWqqJfpfi8KM2igUHe1KNX5SIM7rAV vIKTUXiHQHS4RkEpXK9okbdk0vor4SiVGoUPj3pKn5wmUF1HxaQgqeObtm/dxuM5nXjLuX RQLBgqBF1CPhjGFaFMis1+OMdzjpGTWg31mo8c1ij2CpqXckgo7mWmZ9vN+5Yw== 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 4Nw0Zs5dYkzYJZ; Sun, 15 Jan 2023 16:13:57 +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 30FGDv8u028724; Sun, 15 Jan 2023 16:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FGDvf6028723; Sun, 15 Jan 2023 16:13:57 GMT (envelope-from git) Date: Sun, 15 Jan 2023 16:13:57 GMT Message-Id: <202301151613.30FGDvf6028723@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 50fe17b00a7d - main - x11-wm/hikari: Fix a bug 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50fe17b00a7d36abf86931f1ed32046479025741 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=50fe17b00a7d36abf86931f1ed32046479025741 commit 50fe17b00a7d36abf86931f1ed32046479025741 Author: Ashish SHUKLA AuthorDate: 2023-01-15 15:44:35 +0000 Commit: Ashish SHUKLA 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 --- 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); + } +