From owner-svn-ports-all@freebsd.org Sun Nov 15 12:25:31 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3AC122E71A3; Sun, 15 Nov 2020 12:25:31 +0000 (UTC) (envelope-from madpilot@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CYryM1F53z3pHV; Sun, 15 Nov 2020 12:25:31 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D0501BA5F; Sun, 15 Nov 2020 12:25:31 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AFCPUqc092906; Sun, 15 Nov 2020 12:25:30 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AFCPUPs092905; Sun, 15 Nov 2020 12:25:30 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202011151225.0AFCPUPs092905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 15 Nov 2020 12:25:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555201 - in head/x11-wm/xfce4-wm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/x11-wm/xfce4-wm: . files X-SVN-Commit-Revision: 555201 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 12:25:31 -0000 Author: madpilot Date: Sun Nov 15 12:25:30 2020 New Revision: 555201 URL: https://svnweb.freebsd.org/changeset/ports/555201 Log: Import upstream patch to avoid crash due to unhandled XError in XKillClient() PR: 251136 Submitted by: rozhuk.im@gmail.com Obtained from: https://gitlab.xfce.org/xfce/xfwm4/-/commit/e2fbfac304beace0297d071f7de0aceba4f0016a MFH: 2020Q4 Added: head/x11-wm/xfce4-wm/files/ head/x11-wm/xfce4-wm/files/patch-XKillClient-XError (contents, props changed) Modified: head/x11-wm/xfce4-wm/Makefile Modified: head/x11-wm/xfce4-wm/Makefile ============================================================================== --- head/x11-wm/xfce4-wm/Makefile Sun Nov 15 12:18:49 2020 (r555200) +++ head/x11-wm/xfce4-wm/Makefile Sun Nov 15 12:25:30 2020 (r555201) @@ -3,6 +3,7 @@ PORTNAME= xfce4-wm PORTVERSION= 4.14.6 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfwm4-${DISTVERSIONFULL} Added: head/x11-wm/xfce4-wm/files/patch-XKillClient-XError ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/xfce4-wm/files/patch-XKillClient-XError Sun Nov 15 12:25:30 2020 (r555201) @@ -0,0 +1,24 @@ +diff --git a/src/client.c b/src/client.c +index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644 +--- src/client.c ++++ src/client.c +@@ -2705,10 +2705,18 @@ clientClose (Client *c) + void + clientKill (Client *c) + { ++ ScreenInfo *screen_info; ++ DisplayInfo *display_info; ++ + g_return_if_fail (c != NULL); + TRACE ("client \"%s\" (0x%lx)", c->name, c->window); + +- XKillClient (clientGetXDisplay (c), c->window); ++ screen_info = c->screen_info; ++ display_info = screen_info->display_info; ++ ++ myDisplayErrorTrapPush (display_info); ++ XKillClient (display_info->dpy, c->window); ++ myDisplayErrorTrapPopIgnored (display_info); + } + + void