diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2021-02-09 16:10:44 +0800 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2021-02-09 16:10:44 +0800 |
| commit | f898b1bc78140c537224cfda9472a15ffa4d243c (patch) | |
| tree | b7e4d5bc539d5d6ff3da912b02d52b69fce3c56f /x11/xterm | |
| parent | 815aec4ad2d0127f8b3e3ee89a56584a7bb11cba (diff) | |
| download | freebsd-ports-gnome-f898b1bc78140c537224cfda9472a15ffa4d243c.tar.gz freebsd-ports-gnome-f898b1bc78140c537224cfda9472a15ffa4d243c.tar.zst freebsd-ports-gnome-f898b1bc78140c537224cfda9472a15ffa4d243c.zip | |
Revised extra patch for the XAW3DXFT breakage, it's more elegant but basically
a noop, so no revision bump.
Submitted by: Thomas Dickey <dickey@his.com> (upstream author)
Diffstat (limited to 'x11/xterm')
| -rw-r--r-- | x11/xterm/files/extrapatch-main.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/x11/xterm/files/extrapatch-main.c b/x11/xterm/files/extrapatch-main.c index eae64d9bebeb..cbde88862717 100644 --- a/x11/xterm/files/extrapatch-main.c +++ b/x11/xterm/files/extrapatch-main.c @@ -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> |