From nobody Wed Mar 30 08:37:21 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 9093D1A53A28; Wed, 30 Mar 2022 08:37:21 +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 4KT0DK3Zqlz4vB7; Wed, 30 Mar 2022 08:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648629441; 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=c6oiWqtixEn0xatkEL3a0zKpkstA3BkbfXAofI67YWI=; b=lBExgJIIKTgO0jU1SaJ7ArFndusLn8n77JVy3eY4Nf6ljrD5VYeC+G7c/V0fWjM132p+Mv ZfGd9MwYSC8gseu2wobQa5eblXJudekYdPEpRs4jPBk6fINZDgHF4rwOUgQOqG7utj4HO1 cUBrmWSbV+ztSR1Rw9KR2xORrpwMghmDBFNUL15YnJOSfMhWBoX8OsyuH89GXY5kSnF5yb eAaZTOUnciWvBxJ7z4E5B5OaqEMdHHvniRulDQxBcljU27uXgwpTuuX7KefE81WlUhhPvv Tw2Aj6pWoi3BBwPoGTZVV7mTAYOd9RFbleFTUfeUW0SUA+6txAaGFCLsadxsEg== 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 50AC77C0F; Wed, 30 Mar 2022 08:37: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 22U8bLWi036828; Wed, 30 Mar 2022 08:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U8bLx1036827; Wed, 30 Mar 2022 08:37:21 GMT (envelope-from git) Date: Wed, 30 Mar 2022 08:37:21 GMT Message-Id: <202203300837.22U8bLx1036827@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 45e9c8923b1f - main - x11-wm/xfce4-wm: Import upsstream patch fixing crashs 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45e9c8923b1f38f856b2df9b7385cabbff95d82c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648629441; 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=c6oiWqtixEn0xatkEL3a0zKpkstA3BkbfXAofI67YWI=; b=yt05XdkubdLwb/xf1qAZs7D0j/qbdwgrGPc0DHalqjs4Xb3W08v0McBSvzNngg+oj7x6rK D+b3CXkuYiBnupWOQ9Ko6u2p4Wa5qYx7MmGhf6Vyr/gxHks6rLlEoHMYST+WA9pjk3BOde fLJ8Fpi/+P8lj73tIkF4cmbmGlQpRGBYFhc0x/P4qOA+Qsa7Vt0Mqb30AZY+9zcyhazCgM mv133pzR8FmL05BGF4jYMIHTFXk/IQpGG+4A+mxr9CZBnkzC8josbDmbAW3KDeebiYy1Fl aWqD/+2I5cuAPZ87j3T3MnpQkDuPa+/TJzqk0ROJlCWvNLyfxvepVTbDAsP5iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648629441; a=rsa-sha256; cv=none; b=eHb+b95/MgAIU3KTxNjKTKR5GCj22U5l9kk5L1CGH9aiEQLdNNKW4kusNSZ5eI5qtizrjt jbF3ExXQ5J/WRZaz3UXBKQ/8bXWRtyt041ES4UW+hfD5BlaoqhhevUBRBrXL8KWxNxM43G opaMt9fgdcyVz9ekH7p7rh6EWNLt6YUPTUVsAvSLDTeL0z6OOmxNpOd8RG9w6F0vWtS39v m1AS6zRNEluGvVaFJ5O4X0qVcib0pPvitCnXuQEtoauSsa0zisT/scSRCzrsTEEGfmk+6V PFlpVlHncydDLWqh1ydlTTyRAXSAdHkM5YWJqtOanfRcHs1gtk+K4dXrp5YSqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=45e9c8923b1f38f856b2df9b7385cabbff95d82c commit 45e9c8923b1f38f856b2df9b7385cabbff95d82c Author: Mikhail Teterin AuthorDate: 2022-03-30 08:33:57 +0000 Commit: Guido Falsi CommitDate: 2022-03-30 08:36:38 +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 --- 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