From nobody Wed Mar 30 08:39:21 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 0B2C31A53B33; Wed, 30 Mar 2022 08:39:22 +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 4KT0Gd6WgBz4vMR; Wed, 30 Mar 2022 08:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648629561; 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=wmJqqglABLEU+NH0BrXqEVhfp+gRNanfOhACB2jFes4=; b=O2O1+c+d/W0/h0nbsx5P1GD+2zeecykVmKJikzJf1nv1jRwih8CUY1fUVCQmAN/vb6IcqU HrX0Wiz2ELKHUXyyTJOuwzHouo5rR1n90eH6oOFEW66fVsihWhobbS/gXZB16Tq5vBfHwx 6jMgOYduCe+44G6ScFdVMMhewUsqjZ5Fek3X4U5wKEyrfdYE9r7iC/Ki92EfxQGeYZNhy1 7mXrz21/S3SldKBxin3ej5iC66GBquBTi2rUysIkCA608Em8dePw55CnqgvHUIC0IB+PBr vfu23YBMDbGCLc/R+nUWFZ0J+i8aumJ9G5reYUgb8J3mtq1O1edz17PGO9m9sQ== 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 B656B7B9F; Wed, 30 Mar 2022 08:39:21 +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 22U8dL13037099; Wed, 30 Mar 2022 08:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U8dLKU037098; Wed, 30 Mar 2022 08:39:21 GMT (envelope-from git) Date: Wed, 30 Mar 2022 08:39:21 GMT Message-Id: <202203300839.22U8dLKU037098@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 8eb564bc5a6b - 2022Q1 - x11-wm/xfce4-wm: Import upsstream patch fixing crashs 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 8eb564bc5a6be8cb06ea69f883397176d595933f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648629561; 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=wmJqqglABLEU+NH0BrXqEVhfp+gRNanfOhACB2jFes4=; b=WqffTcKSvUB/14IhuaUdrNd5ttRpgd8qQcpn0depxEReqgiz92A+hK1vOndQm1iirBVkdy nYDrad7T8RfUtSzYDUDiyGsOt0Ahq4gA7t9mlFNTMEVSj8ZNSEHm3nX+Gwa63+dqAUyH3c XDGIAj9veH2h2FbX0dMpqAjpxNk56ta3gt+U7PmWwNBknPsOA1B+rL0CdEgIHMZaffbGEN Tbq+z9DcN+8x8qZX93X3j+4qAN2dJ36uML3Rv2p/s2dTb0VUnt987BZ/GcNZFfxyNE1K4s ZPgOZAdrVcAUiWkVgq4t7/mAi/SJODrek63PzElJesmHUVPpETBDw265LtZ3Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648629561; a=rsa-sha256; cv=none; b=DI+1KQ6Pj4dqEw17D2mp8GEOkzpaEVFeVHis3S6+d6YklugvS4gdcc7m7BCe8642Q5flcS BiRJBT4B7ocYMboUDHT4aTeLl6R4ajx0ocUV85GaC3Wmm4l1L1Majz1LjDBrql/PB0W9ax 23F17zzSdX8/rfYpoWvZNuSNmuTSLAH5ATWfNjnpg0WJsIs3dgjTFzj2lXknTbTxfO8B5+ wXCi9QyKkqkTlJlD2duECKGb9oIaTNLy1q2HVpsc4296K2Dqcnu5YNkWvW3qnaodUae9l0 xrvil14xiWGf8h8TB0YCAz4Pt1EeaMIb8i2H3mxA1RXaC6vMy9ALPVR4KNjPdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8eb564bc5a6be8cb06ea69f883397176d595933f commit 8eb564bc5a6be8cb06ea69f883397176d595933f Author: Mikhail Teterin AuthorDate: 2022-03-30 08:33:57 +0000 Commit: Guido Falsi CommitDate: 2022-03-30 08:39:04 +0000 x11-wm/xfce4-wm: Import upsstream patch fixing crashs xfce4-wm could crash if a broken client tries to usse a nonexistent icon. Importing upstream patch that avoids the crash. PR: 262908 Obtained from: https://gitlab.xfce.org/xfce/xfwm4/-/commit/a7971823de40a17dcba940fcef56d781626826d3 MFH: 2022Q1 (cherry picked from commit 45e9c8923b1f38f856b2df9b7385cabbff95d82c) --- x11-wm/xfce4-wm/Makefile | 1 + x11-wm/xfce4-wm/files/patch-src_icons.c | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index dcbb0d370cfd..e61018553c3d 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -2,6 +2,7 @@ PORTNAME= xfce4-wm PORTVERSION= 4.16.1 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfwm4-${DISTVERSIONFULL} diff --git a/x11-wm/xfce4-wm/files/patch-src_icons.c b/x11-wm/xfce4-wm/files/patch-src_icons.c new file mode 100644 index 000000000000..564d90fd25fd --- /dev/null +++ b/x11-wm/xfce4-wm/files/patch-src_icons.c @@ -0,0 +1,46 @@ +--- src/icons.c.orig 2021-01-05 08:18:20 UTC ++++ src/icons.c +@@ -295,16 +295,26 @@ static void + } + + static void +-get_pixmap_geometry (Display *dpy, Pixmap pixmap, guint *out_width, guint *out_height, guint *out_depth) ++get_pixmap_geometry (ScreenInfo *screen_info, Pixmap pixmap, guint *out_width, guint *out_height, guint *out_depth) + { + Window root; + guint border_width; + gint x, y; + guint width, height; + guint depth; ++ Status rc; ++ int result; + +- XGetGeometry (dpy, pixmap, &root, &x, &y, &width, &height, &border_width, &depth); ++ myDisplayErrorTrapPush (screen_info->display_info); ++ rc = XGetGeometry (myScreenGetXDisplay(screen_info), pixmap, &root, ++ &x, &y, &width, &height, &border_width, &depth); ++ result = myDisplayErrorTrapPop (screen_info->display_info); + ++ if ((rc != Success) || (result != Success)) ++ { ++ return; ++ } ++ + if (out_width != NULL) + { + *out_width = width; +@@ -371,12 +381,12 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap s + return NULL; + } + +- get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_pixmap, &w, &h, &depth); ++ get_pixmap_geometry (screen_info, src_pixmap, &w, &h, &depth); + surface = get_surface_from_pixmap (screen_info, src_pixmap, w, h, depth); + + if (surface && src_mask != None) + { +- get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_mask, &w, &h, &depth); ++ get_pixmap_geometry (screen_info, src_mask, &w, &h, &depth); + mask_surface = get_surface_from_pixmap (screen_info, src_mask, w, h, depth); + } + else