From nobody Tue Dec 05 00:09:25 2023 X-Original-To: dev-commits-ports-all@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 4SkgrP4dbNz5311h; Tue, 5 Dec 2023 00:09:25 +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 4SkgrP4C3Nz4ZmW; Tue, 5 Dec 2023 00:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734965; 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=tDGluk63Dx/bbxJnH837ISOGtiIbLwKGZBAxvvjiqgg=; b=u9KmjVeIUg8ark40KLJH0IFqnaBqvpnFDwJPe5ImzqLSz0/V6kDuPhuKdjg/M/vv4y7qFw e9zBTYULUV1XKcqP1CHrmhwFnvt/uC8UQ/tmR0usvqy9K4HBrCp04TudUCux20T4aDiZjd NK5ybQlRK6qkHUZ2UQPO6KN3mHiby1JyScI4SlTgo1NqUl0QfbDnZFV6mw7cMiyt4bBpvm A6JxbULajZTGyFeYPEB7wxSPML4HzxUPIIvnUEFMf1PXtWzrSL0QBv0QEMqOh5xweTWymo 6xxV1dshkjJLXn9mXS+bNiUu5ieIn8lqulOAfl03IFS4isuWA6CMAfgvhdyMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701734965; 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=tDGluk63Dx/bbxJnH837ISOGtiIbLwKGZBAxvvjiqgg=; b=DtIuQ1KoJb3vgf23ZIt3wnbnSlZbs3XQLOrXtlt3ShIltl8bBU5XpDVosNNaL2aGXSmvno AVwVSZnKLN98dy5CjxLrrjEc2ZUlW5MBdzlUq13U0xg37caTPwXrTAL6UjYWGkGT8O+npX GVMPE+6RjJhjVxdiYJa0pn7ri/bzlo18nfliHNDibA+/F6pepDLNkZYGtlPpHzwuteL3Vi K6uYg/vNMGCDpsVVq0TmsK6z1Wwg2Hq3wRdIoTEh33CmQUFcEx1ImqVHupHm81wya1wdCh ojZKSr+ms+cxmvEILr0Q/Sznrawiq/UQ5YXNfevqXxrgGCnDaUzIsvbqrPPzag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701734965; a=rsa-sha256; cv=none; b=Uqq0g4ZQzdUmEECPcXK2rD6HhynoPdUl+ioD9kfaSbClib3sAD7POJ6mp2iAq2bgY+iJQi ukvSDACdacgIAxkVMJFDosYHm01scVqTLddVpe+s42Mgtc+IOC0yfSXwYJ3Y7y2WEveWwm RxMTRdzleFDHVvhea4r29iZyIAvgIYY+RVdSbVYMp8ijimTtdaJbZRK3cuRr73ySX1FhTu pODfRGrZ35xy7xbcZQZ1dcNxlaBpfr8E5t1cu0i5N4i8CHDca1kSdXb1dalEEhK5jL0FhQ wItoNLBiDy+zqpvAxxx60ilaAxWyQKU1Fs8m1Ic+5CFn6Tip5K0TgZUR3nqh7A== 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 4SkgrP30dhznGy; Tue, 5 Dec 2023 00:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B509Prx063787; Tue, 5 Dec 2023 00:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B509PUn063784; Tue, 5 Dec 2023 00:09:25 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:09:25 GMT Message-Id: <202312050009.3B509PUn063784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: ebd43103a866 - main - x11-toolkits/open-motif*: Don't share cached Xft renditions across display connections List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebd43103a86630e2f6a55b73b538e039aa066dbf Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebd43103a86630e2f6a55b73b538e039aa066dbf commit ebd43103a86630e2f6a55b73b538e039aa066dbf Author: Cy Schubert AuthorDate: 2023-12-04 23:44:53 +0000 Commit: Cy Schubert CommitDate: 2023-12-05 00:02:05 +0000 x11-toolkits/open-motif*: Don't share cached Xft renditions across display connections Xft rendition caching added with the fix #1414 won't check whether the matching rendition was allocated trough a different display connection. This causes a forked process that creates Motif widgets on a separate display connection to fail with RenderBadGlyphSet X error as soon as the parent process closes its display, thus invalidating the associated Xft font resource. Obtained from: https://sourceforge.net/p/motif/code/merge-requests/4/ --- x11-toolkits/open-motif-devel/Makefile | 2 +- .../open-motif-devel/files/patch-lib_Xm_XmRenderT.c | 15 +++++++++++++++ x11-toolkits/open-motif/Makefile | 2 +- x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c | 15 +++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile index d34714852e78..298f7c6f06f1 100644 --- a/x11-toolkits/open-motif-devel/Makefile +++ b/x11-toolkits/open-motif-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel diff --git a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c new file mode 100644 index 000000000000..45fe127e420c --- /dev/null +++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c @@ -0,0 +1,15 @@ +--- lib/Xm/XmRenderT.c.orig 2023-02-15 16:42:34.000000000 -0800 ++++ lib/Xm/XmRenderT.c 2023-12-04 15:42:20.894104000 -0800 +@@ -2091,10 +2091,9 @@ + static int count_rend=0, num_rend; + num_rend = GetSameRenditions(rend_cache, rend, count_rend); + +- if (num_rend>=0) ++ if(num_rend >= 0 && (display == _XmRendDisplay(rend_cache[num_rend]))) { + _XmRendXftFont(rend) = _XmRendXftFont(rend_cache[num_rend]); +- else +- { ++ } else { + #endif + _XmRendPattern(rend) = FcPatternCreate(); + if (_XmRendFontName(rend)) diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 47eb20ebd003..e90595a26679 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -1,6 +1,6 @@ PORTNAME= open-motif PORTVERSION= 2.3.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits # MASTER_SITES= SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/ MASTER_SITES= SF/motif/Motif%20${PORTVERSION}%20Source%20Code/ diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c new file mode 100644 index 000000000000..84b92bd900b7 --- /dev/null +++ b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c @@ -0,0 +1,15 @@ +--- lib/Xm/XmRenderT.c.orig 2017-03-27 15:24:31.000000000 -0700 ++++ lib/Xm/XmRenderT.c 2023-12-04 15:42:22.406098000 -0800 +@@ -2091,10 +2091,9 @@ + static int count_rend=0, num_rend; + num_rend = GetSameRenditions(rend_cache, rend, count_rend); + +- if (num_rend>=0) ++ if(num_rend >= 0 && (display == _XmRendDisplay(rend_cache[num_rend]))) { + _XmRendXftFont(rend) = _XmRendXftFont(rend_cache[num_rend]); +- else +- { ++ } else { + #endif + _XmRendPattern(rend) = FcPatternCreate(); + if (_XmRendFontName(rend))