svn commit: r564773 - head/x11/xterm/files
Emanuel Haupt
ehaupt at FreeBSD.org
Tue Feb 9 08:10:45 UTC 2021
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 <dickey at his.com> (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 <X11/XawPlus/Form.h>
#endif
- #ifdef TERMIO_STRUCT /* { */
++#else
++
++#if defined(HAVE_LIB_XAW3DXFT)
++#include <X11/Xaw3dxft/Xaw3dXft.h>
++#endif
++
+ #endif /* OPT_TOOLBAR */
+
+ #include <pwd.h>
More information about the svn-ports-all
mailing list