From owner-svn-ports-all@freebsd.org Tue Feb 9 08:10:45 2021 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 2CA17535674; Tue, 9 Feb 2021 08:10:45 +0000 (UTC) (envelope-from ehaupt@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 4DZbDj0qq9z4dWj; Tue, 9 Feb 2021 08:10:45 +0000 (UTC) (envelope-from ehaupt@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 0F71626A7A; Tue, 9 Feb 2021 08:10:45 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1198Aita040495; Tue, 9 Feb 2021 08:10:44 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1198AiOQ040494; Tue, 9 Feb 2021 08:10:44 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <202102090810.1198AiOQ040494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Tue, 9 Feb 2021 08:10:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564773 - head/x11/xterm/files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: head/x11/xterm/files X-SVN-Commit-Revision: 564773 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: Tue, 09 Feb 2021 08:10:45 -0000 Author: ehaupt Date: Tue Feb 9 08:10:44 2021 New Revision: 564773 URL: https://svnweb.freebsd.org/changeset/ports/564773 Log: Revised extra patch for the XAW3DXFT breakage, it's more elegant but basically a noop, so no revision bump. Submitted by: Thomas Dickey (upstream author) Modified: head/x11/xterm/files/extrapatch-main.c Modified: head/x11/xterm/files/extrapatch-main.c ============================================================================== --- head/x11/xterm/files/extrapatch-main.c Tue Feb 9 08:04:00 2021 (r564772) +++ head/x11/xterm/files/extrapatch-main.c Tue Feb 9 08:10:44 2021 (r564773) @@ -1,25 +1,15 @@ --- main.c.orig 2021-02-02 00:20:59 UTC +++ main.c -@@ -2210,9 +2210,6 @@ main(int argc, char *argv[]ENVP_ARG) - char *my_class = x_strdup(DEFCLASS); - unsigned line_speed = VAL_LINE_SPEED; - Window winToEmbedInto = None; --#if defined(HAVE_LIB_XAW3DXFT) -- Xaw3dXftData *xaw3dxft_data; --#endif - - ProgramName = argv[0]; - -@@ -2330,12 +2327,6 @@ main(int argc, char *argv[]ENVP_ARG) - /* This dumped core on HP-UX 9.05 with X11R5 */ - #if OPT_I18N_SUPPORT - XtSetLanguageProc(NULL, NULL, NULL); --#endif -- -- /* enable Xft support in Xaw3DXft */ --#if defined(HAVE_LIB_XAW3DXFT) -- GET_XAW3DXFT_DATA(xaw3dxft_data); -- xaw3dxft_data->encoding = -1; +@@ -110,6 +110,12 @@ + #include #endif - #ifdef TERMIO_STRUCT /* { */ ++#else ++ ++#if defined(HAVE_LIB_XAW3DXFT) ++#include ++#endif ++ + #endif /* OPT_TOOLBAR */ + + #include