aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4547: the neXTaw GUI is old and does not work well

Browse Source 
Problem:    The neXTaw GUI is old and does not work well.
Solution:   Remove the neXTaw GUI from configure to find out who still wants
            support for this GUI.
This commit is contained in:
Bram Moolenaar 2022-03-11 16:01:26 +00:00
parent 0a4e098f32
commit f52fac2ed9
4 changed files with 14 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Makefile
View File

@ -343,7 +343,6 @@ CClink = $(CC)
#CONF_OPT_GUI = --enable-gnome-check
#CONF_OPT_GUI = --disable-gtk3-check
#CONF_OPT_GUI = --disable-motif-check
#CONF_OPT_GUI = --disable-nextaw-check
# Uncomment one of these lines to select a specific GUI to use.
# When using "yes" or nothing, configure will use the first one found: GTK+,
@ -371,7 +370,6 @@ CClink = $(CC)
#CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=motif
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
#CONF_OPT_GUI = --enable-gui=nextaw
# Uncomment this line to run an individual test with gvim.
#GUI_TESTARG = GUI_FLAG=-g
@ -1304,24 +1302,6 @@ MOTIF_MAN_TARGETS = yes
MOTIF_TESTTARGET = gui
MOTIF_BUNDLE =
### neXtaw GUI
NEXTAW_LIB = -lneXtaw
NEXTAW_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
NEXTAW_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
objects/gui_beval.o objects/gui_at_fs.o
NEXTAW_DEFS = -DFEAT_GUI_ATHENA -DFEAT_GUI_NEXTAW $(NARROW_PROTO)
NEXTAW_IPATH = $(GUI_INC_LOC)
NEXTAW_LIBS_DIR = $(GUI_LIB_LOC)
NEXTAW_LIBS1 = $(NEXTAW_LIB)
NEXTAW_LIBS2 = -lXt
NEXTAW_INSTALL = install_normal install_gui_extra
NEXTAW_TARGETS = installglinks
NEXTAW_MAN_TARGETS = yes
NEXTAW_TESTTARGET = gui
NEXTAW_BUNDLE =
### (J) Sun OpenWindows 3.2 (SunOS 4.1.x) or earlier that produce these ld
# errors: ld: Undefined symbol
# _get_wmShellWidgetClass
@ -2201,7 +2181,7 @@ os_vms.pro: os_vms.c
# must use os_vms_conf.h for auto/config.h
mv auto/config.h auto/config.h.save
cp os_vms_conf.h auto/config.h
$(CPROTO) -DVMS -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
$(CPROTO) -DVMS -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
echo "/* vim: set ft=c : */" >> proto/$@
rm auto/config.h
mv auto/config.h.save auto/config.h
@ -2218,8 +2198,7 @@ gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
notags:
-rm -f tags
# Note: tags is made for the currently configured version, can't include both
# Motif and neXtaw GUI
# Note: tags is made for the currently configured version.
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_FILES)

70
src/auto/configure vendored
View File

@ -834,7 +834,6 @@ enable_gtk2_check
enable_gnome_check
enable_gtk3_check
enable_motif_check
enable_nextaw_check
enable_gtktest
with_gnome_includes
with_gnome_libs
@ -1508,12 +1507,11 @@ Optional Features:
--disable-farsi Deprecated.
--enable-xim Include XIM input support.
--enable-fontset Include X fontset output support.
--enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon
--enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/haiku/photon/carbon
--enable-gtk2-check If auto-select GUI, check for GTK+ 2 default=yes
--enable-gnome-check If GTK GUI, check for GNOME default=no
--enable-gtk3-check If auto-select GUI, check for GTK+ 3 default=yes
--enable-motif-check If auto-select GUI, check for Motif default=yes
--enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
--disable-gtktest Do not try to compile and run a test GTK program
--disable-icon-cache-update update disabled
--disable-desktop-database-update update disabled
@ -9272,7 +9270,6 @@ SKIP_GTK2=YES
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
GUITYPE=NONE
@ -9332,8 +9329,7 @@ $as_echo "yes/auto - automatic GUI support" >&6; }
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
SKIP_NEXTAW=;;
SKIP_MOTIF=;;
gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
$as_echo "GTK+ 2.x GUI support" >&6; }
SKIP_GTK2=;;
@ -9347,9 +9343,6 @@ $as_echo "GTK+ 3.x GUI support" >&6; }
motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5
$as_echo "Motif GUI support" >&6; }
SKIP_MOTIF=;;
nextaw) { $as_echo "$as_me:${as_lineno-$LINENO}: result: neXtaw GUI support" >&5
$as_echo "neXtaw GUI support" >&6; }
SKIP_NEXTAW=;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } ;;
esac
@ -9426,23 +9419,6 @@ $as_echo "$enable_motif_check" >&6; }
fi
fi
if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for neXtaw" >&5
$as_echo_n "checking whether or not to look for neXtaw... " >&6; }
# Check whether --enable-nextaw-check was given.
if test "${enable_nextaw_check+set}" = set; then :
enableval=$enable_nextaw_check;
else
enable_nextaw_check="yes"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nextaw_check" >&5
$as_echo "$enable_nextaw_check" >&6; };
if test "x$enable_nextaw_check" = "xno"; then
SKIP_NEXTAW=YES
fi
fi
@ -9711,7 +9687,6 @@ $as_echo "no" >&6; }
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@ -9970,7 +9945,6 @@ $as_echo "no" >&6; }
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@ -10276,45 +10250,11 @@ $as_echo "<not found>" >&6; }
fi
if test -z "$SKIP_MOTIF"; then
SKIP_NEXTAW=YES
GUITYPE=MOTIF
fi
if test -z "$SKIP_NEXTAW"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if neXtaw header files can be found" >&5
$as_echo_n "checking if neXtaw header files can be found... " >&6; }
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <X11/Intrinsic.h>
#include <X11/neXtaw/Paned.h>
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }; SKIP_NEXTAW=YES
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$cflags_save
fi
if test -z "$SKIP_NEXTAW"; then
GUITYPE=NEXTAW
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
if -z "$SKIP_MOTIF"; then
if test -n "$GUI_INC_LOC"; then
GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
fi
@ -10573,7 +10513,7 @@ done
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
if test -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
for ac_header in X11/xpm.h X11/Sunkeysym.h
@ -10617,7 +10557,7 @@ $as_echo "X GUI selected; xim has been enabled" >&6; }
fi
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
if test -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5

44
src/configure.ac
View File

@ -2443,7 +2443,7 @@ test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX"
AC_MSG_CHECKING(--enable-gui argument)
AC_ARG_ENABLE(gui,
[ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon]], , enable_gui="auto")
[ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/haiku/photon/carbon]], , enable_gui="auto")
dnl Canonicalize the --enable-gui= argument so that it can be easily compared.
dnl Do not use character classes for portability with old tools.
@ -2455,7 +2455,6 @@ SKIP_GTK2=YES
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
GUITYPE=NONE
@ -2500,8 +2499,7 @@ else
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
SKIP_NEXTAW=;;
SKIP_MOTIF=;;
gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
SKIP_GTK2=;;
gnome2) AC_MSG_RESULT(GNOME 2.x GUI support)
@ -2511,8 +2509,6 @@ else
SKIP_GTK3=;;
motif) AC_MSG_RESULT(Motif GUI support)
SKIP_MOTIF=;;
nextaw) AC_MSG_RESULT(neXtaw GUI support)
SKIP_NEXTAW=;;
*) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
esac
@ -2564,17 +2560,6 @@ if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
fi
fi
if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
AC_MSG_CHECKING(whether or not to look for neXtaw)
AC_ARG_ENABLE(nextaw-check,
[ --enable-nextaw-check If auto-select GUI, check for neXtaw [default=yes]],
, enable_nextaw_check="yes")
AC_MSG_RESULT($enable_nextaw_check);
if test "x$enable_nextaw_check" = "xno"; then
SKIP_NEXTAW=YES
fi
fi
dnl define an autoconf function to check for a specified version of GTK, and
dnl try to compile/link a GTK program.
dnl
@ -2806,7 +2791,6 @@ if test -z "$SKIP_GTK2"; then
GUI_INC_LOC="$GTK_CFLAGS"], )
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
AC_SUBST(GTK_LIBNAME)
@ -2856,7 +2840,6 @@ if test -z "$SKIP_GTK3"; then
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
AC_SUBST(GTK_LIBNAME)
@ -3017,28 +3000,11 @@ if test -z "$SKIP_MOTIF"; then
fi
if test -z "$SKIP_MOTIF"; then
SKIP_NEXTAW=YES
GUITYPE=MOTIF
AC_SUBST(MOTIF_LIBNAME)
fi
if test -z "$SKIP_NEXTAW"; then
AC_MSG_CHECKING(if neXtaw header files can be found)
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
AC_TRY_COMPILE([
#include <X11/Intrinsic.h>
#include <X11/neXtaw/Paned.h>], ,
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no); SKIP_NEXTAW=YES )
CFLAGS=$cflags_save
fi
if test -z "$SKIP_NEXTAW"; then
GUITYPE=NEXTAW
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
if -z "$SKIP_MOTIF"; then
dnl Prepend -I and -L to $GUI_INC_LOC and $GUI_LIB_LOC if not empty
dnl Avoid adding it when it twice
if test -n "$GUI_INC_LOC"; then
@ -3100,7 +3066,7 @@ if test "$enable_xsmp" = "yes"; then
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
if test -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@ -3122,7 +3088,7 @@ if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GT
fi
fi
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
if test -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
dnl Xmu/Editres.h may exist but can only be used after including Intrinsic.h

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4547,
/**/
4546,
/**/