From nobody Mon Jul 11 03:32:31 2022 X-Original-To: dev-commits-ports-branches@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 43BB417FA194; Mon, 11 Jul 2022 03:32:32 +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 4Lh8b41XRwz3mvH; Mon, 11 Jul 2022 03:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657510352; 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=6Pxy/uE1wsZ2ktA5beTfm+At83KvTiZqq9J4v2R+P08=; b=EKPVez0V1mvNJEMUTS7U8vqlXQc+PHreXqIFW2QA0Se0qKck8pvWaJBhK4SjD9Ud5/rI+l f0cKurdniAFdLNGY7YIYDZSENlvrADMM6e9qB+2du/C1cT2fp4Uc21e0DxoNvyH2LxFqNN cL9JS7xoSS6vOTGFjc7WWJtmu0LYEPKW9JtKIbVTbgFOlsOFi5YYlrJIo2AKDAj2kgK95r 3wN6Y4Aj3AjP6UkUZbBII+7tSlgSskamYpzu0cQ1AcqKPLZMeHRGZJI6Kfbb5lQ0UvZZwG z2DIgz22KyF7OvX5Eda6Yjvd4lrjs9lsgPRUQWb3HseenPgimdSeK1mFee2+lA== 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 4Lh8b40ZWMzqBp; Mon, 11 Jul 2022 03:32:32 +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 26B3WVhn073192; Mon, 11 Jul 2022 03:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26B3WVk0073191; Mon, 11 Jul 2022 03:32:31 GMT (envelope-from git) Date: Mon, 11 Jul 2022 03:32:31 GMT Message-Id: <202207110332.26B3WVk0073191@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ashish SHUKLA Subject: git: 5d9c5b9cac42 - 2022Q3 - x11-wm/hikari: Patch to prevent crashing with GTK4 apps List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 5d9c5b9cac42a22716f292fca5717c9842fdf464 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657510352; 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=6Pxy/uE1wsZ2ktA5beTfm+At83KvTiZqq9J4v2R+P08=; b=v7Z3Vd+rz/dC+4i2KzIZ5JTjWHyaemAFAI1slCb73NsPyNmFhR/+zYZOSQr9QhedNx1QKM h+oI5PeW4PKjR2gYyttPxWc6AfFH3jtpGhcZlgdBF5R76uz/bWiS5sVf8fvljdYqxkDMuR 5nc0Jcc7EnhphYBwqfEmFYDo2Zxsd68SqmNxhAMx7txji8UP+WAbI+afJfWZ+5WzjsympD g5YO1v/GTrQhiswoG4q7gOxN0T8nyeoYKac5UZM6YGNshizALbfHwEMD1ceyVlogOIMhRE XpyFe/c8tUHFCOofFqKeZpfRBKttWu1I69JWZppLpgAfc4oOIAs8VPkEDwZqhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657510352; a=rsa-sha256; cv=none; b=NY1KhjGi42um5xrkUoeghk9A2Cu1LwF5dA70VzsS7Efa1Ma1hoJTdQU8NDMU9dTL0aisgJ d0yt6zi9x0KWUEBHmWV92nP2xhdzNBxP0fpLmyKRWv+Rs0ddi3dFuIUj5sUngN5BHjEiUu h8EIS4VUpC8KFu4L3a+e1AdS3ufltvmcCaHQzjGk50ri6uIOLKPIRAXhOnZGvXcXz8/UrC fJU1ymnwDyyLeHKKsccx/l/KeBbEM5hm5SbNfMLII6vq2vYRPbvoVgT/pK9hZc9esl+uox 1CkPebBD+VpzGiyJicuJmisjhinhIGppMNGooeF7gkOZEGYjuw/drftEH3FBSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d9c5b9cac42a22716f292fca5717c9842fdf464 commit 5d9c5b9cac42a22716f292fca5717c9842fdf464 Author: Ashish SHUKLA AuthorDate: 2022-07-10 13:53:29 +0000 Commit: Ashish SHUKLA CommitDate: 2022-07-11 03:31:58 +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) (cherry picked from commit c48fee7e6adef8939a7fbbb031e308cbbc809cd4) --- 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 =