From nobody Mon Jul 11 03:31:12 2022 X-Original-To: dev-commits-ports-main@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 1BB6017F99B9; Mon, 11 Jul 2022 03:31:13 +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 4Lh8YY0NCWz3mZ1; Mon, 11 Jul 2022 03:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657510273; 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=7gypcT27IfD0SOf1G0qQn3NctX2O/qCPIDn+Bam+XA0=; b=lyAXdhDLwpOl3mxWANphRx4nivGlEYNi4tLWLp4vrmBvd+s/vG1JqAH5u7J4lgANmzfqQ2 pOiBqA0hKn1kv+f0d8qbeF3udXz601JqASB0HWn9WbHzR8zs1I1PnJhyjYIh2jzkHDPL7W H2/+ifPHzcQqWwjazIqVwqqY+LstT0KBli8OJ8djjxOQB65d13boVGDcGhMCi9ltM7s68r kJvEg41fb7PGUh4mDRn35c2QVZjNPJ9G5dgwPzq8TwS5KM88a+Qiyty12CUdt7c57kL3Ms EbIRv1V7AVS8IXXLdQ6FqFah59vQzhsofAMYFJonK7VW4Ya1vYRii9OYh+xPYQ== 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 4Lh8YX6X9Kzpkn; Mon, 11 Jul 2022 03:31:12 +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 26B3VCpf072071; Mon, 11 Jul 2022 03:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26B3VCaw072070; Mon, 11 Jul 2022 03:31:12 GMT (envelope-from git) Date: Mon, 11 Jul 2022 03:31:12 GMT Message-Id: <202207110331.26B3VCaw072070@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: c48fee7e6ade - main - x11-wm/hikari: Patch to prevent crashing with GTK4 apps List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: c48fee7e6adef8939a7fbbb031e308cbbc809cd4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657510273; 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=7gypcT27IfD0SOf1G0qQn3NctX2O/qCPIDn+Bam+XA0=; b=cHqGLQSzGkjIWYKFASkK8IXwlsMoNcOH23USpCbC17ui50iOaRqMI4WUQaKd4OzMyElZVK yxWC2/cq+M4HBwV3TV2N8Yp11i0hf9Eier0qOhv+qDpncR0H3rOZSKJv/g1sjKBEQO8hzO ZMTJyRNbvdGqVWakYP9ZPDme0HfE6mxb1S0qHGWDj9jyaYBl1KuLjSsjRTGDcGGUKeSd/T jSowiVb+GkAndx0dW7/tYMA6jPzWdURXC8MWvRPA7Y2EibHaS4YIJZ7TeRd3Et0k7AS5Si qsFbYiW3nsPvh1NeoQwe8fOtpa9beqSWVu/ku2V1xFg1JQQgcTJxdVRjiehr+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657510273; a=rsa-sha256; cv=none; b=DRtk0GxmUlEPXQr1Gprw57uMqGbz0YwO1Z2tZN/7vCdxzQ0wgZZF5FvvEmqoVR635sBlIE gQHk/DLmXx4L6RniKOqcoiUvhC3Ib9nj4rwqNrNYXUKXefyGRXq/HU2Cj+KxYtDtax+LWB Hf6StGvq1SpSpFE8nlOJAhWCX6hH5nRyKBzegXO5qzjmBu6XKkFnx3nTaG+NXi4DDlopEL 7vjwX8nlFdFGCNnnc/ClMDDPH//6VOzMniWv7G6evkC6OZNmzOKO4HJ5H3GnhzrQe0jNIb vamEpOFemCHOwj5zdI0uQ9SR7WoixcXQcwuwiIMpHM/hphTsC+iIYIKb3q3FJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=c48fee7e6adef8939a7fbbb031e308cbbc809cd4 commit c48fee7e6adef8939a7fbbb031e308cbbc809cd4 Author: Ashish SHUKLA AuthorDate: 2022-07-10 13:53:29 +0000 Commit: Ashish SHUKLA CommitDate: 2022-07-11 03:26:46 +0000 x11-wm/hikari: Patch to prevent crashing with GTK4 apps PR: 265110 Reported by: Ahmad Raniri Tested by: Ahmad Raniri Obtained from: alex at xanderio dot de MFH: 2022Q3 (bug fix) --- x11-wm/hikari/Makefile | 1 + x11-wm/hikari/files/patch-src_server.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile index 78980a5b7d3f..a010359d57ab 100644 --- a/x11-wm/hikari/Makefile +++ b/x11-wm/hikari/Makefile @@ -1,5 +1,6 @@ PORTNAME= hikari DISTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MASTER_SITES= https://hikari.acmelabs.space/releases/ diff --git a/x11-wm/hikari/files/patch-src_server.c b/x11-wm/hikari/files/patch-src_server.c new file mode 100644 index 000000000000..ee05cc2228a1 --- /dev/null +++ b/x11-wm/hikari/files/patch-src_server.c @@ -0,0 +1,12 @@ +--- src/server.c.orig 2022-01-13 09:15:55 UTC ++++ src/server.c +@@ -523,6 +523,9 @@ static void + server_decoration_handler(struct wl_listener *listener, void *data) + { + struct wlr_server_decoration *wlr_decoration = data; ++ if (wlr_decoration->surface->role == NULL) { ++ return; ++ } + struct hikari_view *view = + wl_container_of(wlr_decoration->surface, view, surface); + struct wlr_xdg_surface *xdg_surface =