Date: Mon, 8 Feb 2021 08:51:10 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564682 - in head/x11/xterm: . files Message-ID: <202102080851.1188pAMp077005@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 /* { */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102080851.1188pAMp077005>