From nobody Fri Aug 12 05:35:01 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 4M3snd72BVz4Y2yZ; Fri, 12 Aug 2022 05:35:01 +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 4M3snd6W94z3ZDp; Fri, 12 Aug 2022 05:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660282501; 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=F4mzRwzpC1sgoETb+i0a3lO4+hR7MII+7zCxkAodHec=; b=Dqprvspj5bFtnT+EIaHA7rs4tM2CDLNyjwJ5RTXS8F6Q//nCfohFlAX/luPMTIdstc5pl6 CdOovSG7XJsZH1zzUEvATEjkduzzclxSIYZA1+0CoyVpaoUOJ/AqvBSdrulBx3RotD2M7f TzqQS8PyrgPYG1ZA3K1G1Pppf0vv539RqMZyaYgkLBge4uRQUIuEP/LRWlr9ymHzzyV+ug 3Hn8jChVhmOH2HwZXYkWtVVb5doFPoXDnjLde//Gp81Tx0sFi6ykZ17GgYFx6K9btEbNvK qmt3far7YrgrekslKMVJmS4kfrDKB+kc7u1u2A2+zCuciU7nIH1FVZhQATvXvA== 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 4M3snd5NNqzK5w; Fri, 12 Aug 2022 05:35:01 +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 27C5Z1tf027491; Fri, 12 Aug 2022 05:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27C5Z11L027490; Fri, 12 Aug 2022 05:35:01 GMT (envelope-from git) Date: Fri, 12 Aug 2022 05:35:01 GMT Message-Id: <202208120535.27C5Z11L027490@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: 815db75caec9 - main - x11/cde: Make cde-25 default 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 815db75caec984b95977ccd12f8a2e384439dd11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660282501; 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=F4mzRwzpC1sgoETb+i0a3lO4+hR7MII+7zCxkAodHec=; b=iP6tS1G5zBnBKAh5vAQT2SMdzT+wqsew7YiMCrOtuTpq9rSDQVimSqkX4tLQUwZDBmXBy5 hi8blm2i5ZJUDbsPQc3Crtxwm63SuIv8xG1kqM3yVe+hP2JvGuA/Is9u1KA/N5/79HcdY3 bF4d7aPMaqL6uiUDohOk0KakHg5f1p6Jk02QqKwkWzRAwwA8ke8zb67ehRo3AvMwkHXY3r +wWb5AB0hxK+FH6b+vuO24wE9d85oqKlJcifvcJqryiRRmkdSoCAy/9gGdWV8L2xFNw0pc srK/6RTPCl6lUizPlxmlDD8gXfR4/aM0LvrPiTJBkReRA6kdKM2r8OcWxmQMpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660282501; a=rsa-sha256; cv=none; b=EzO0KP9D9Cvf7UWp4/Dnbak+s4Dl0B5DpZZw9QF9xkAvzpB94onjR0KDhH0CmFNc3xPKzh DLuojs+ovDiC6wMU6tyY/w3L3vIyjYFLgqp3AmMeMWqtml3drJG09Y47Jl5/u0Rwbyr0IW Prfziy146BlKYZR7V0fa5JqM7QC3GGebd6pGmAqqRbfut+3icCQHEHPcZ++rL543KeCBiy Mce+9Ly5JLRU3LTRWq9S5Vg+kTeT1hTd/Y2rTKkSa8Dniw6Q3P32BpO+kaFr+TLIJK4wkT nz6FLTUQf+rQhOtrTwlzzx7XxDpANV0hS4AL81Vr6Jc3BEdSgRkBakGlAjOUyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=815db75caec984b95977ccd12f8a2e384439dd11 commit 815db75caec984b95977ccd12f8a2e384439dd11 Author: Cy Schubert AuthorDate: 2022-08-12 04:01:49 +0000 Commit: Cy Schubert CommitDate: 2022-08-12 04:01:49 +0000 x11/cde: Make cde-25 default Upstream commit 9af0993de added font aliases, specifically gb2312.1980, which may be incompatible with some legacy Xm and Xaw apps however there is a circumvention recommended by the cdesktopenv-code upstream. That is to add -xrm '*international: true' to the affected app's arguments. A more elegant approach is to create a ~/.Xdefaults file containing the following example: XPostit.*international: false *international: true --- x11/cde/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x11/cde/Makefile b/x11/cde/Makefile index 703f1c2d56f2..9d0bdc057a01 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -1,7 +1,5 @@ VERSIONS= 24 25 -# The reason we will keep our main CDE metaport at 2.4.3 is to -# avoid a POLA violation due to font differences. -CDE_VERSION?= 24 +CDE_VERSION?= 25 MASTERDIR= ${.CURDIR}/../cde-${CDE_VERSION}