From owner-svn-ports-all@freebsd.org Mon Feb 8 08:51:11 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 5256852AC22; Mon, 8 Feb 2021 08:51:11 +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 4DZ09q1yy0z4sHR; Mon, 8 Feb 2021 08:51:11 +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 3680714A28; Mon, 8 Feb 2021 08:51:11 +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 1188pBLu077007; Mon, 8 Feb 2021 08:51:11 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1188pAMp077005; Mon, 8 Feb 2021 08:51:10 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <202102080851.1188pAMp077005@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Mon, 8 Feb 2021 08:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564682 - in head/x11/xterm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/x11/xterm: . files X-SVN-Commit-Revision: 564682 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: Mon, 08 Feb 2021 08:51:11 -0000 Author: ehaupt Date: Mon Feb 8 08:51:10 2021 New Revision: 564682 URL: https://svnweb.freebsd.org/changeset/ports/564682 Log: Fix build with XAW3DXFT enabled Notified by: olgeni (via mail) Added: head/x11/xterm/files/extrapatch-main.c (contents, props changed) Modified: head/x11/xterm/Makefile Modified: head/x11/xterm/Makefile ============================================================================== --- head/x11/xterm/Makefile Mon Feb 8 08:40:46 2021 (r564681) +++ head/x11/xterm/Makefile Mon Feb 8 08:51:10 2021 (r564682) @@ -3,6 +3,7 @@ PORTNAME= xterm PORTVERSION= 365 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.invisible-island.net/xterm/:src1 \ https://invisible-mirror.net/archives/xterm/:src1 \ @@ -72,6 +73,7 @@ WCHAR_CONFIGURE_ENABLE= wide-chars WCHAR_VARS= PKGMESSAGE="${PKGDIR}/pkg-message.wchar" XAW3DXFT_LIB_DEPENDS= libXaw3dxft.so:x11-toolkits/libxaw3dxft XAW3DXFT_CONFIGURE_WITH= Xaw3dxft +XAW3DXFT_EXTRA_PATCHES= ${FILESDIR}/extrapatch-main.c XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_WITH= Xaw3d XINERAMA_USE= XORG=xinerama,xorgproto Added: head/x11/xterm/files/extrapatch-main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xterm/files/extrapatch-main.c Mon Feb 8 08:51:10 2021 (r564682) @@ -0,0 +1,25 @@ +--- 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; + #endif + + #ifdef TERMIO_STRUCT /* { */