Patch 8.2.4547
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.
Files: src/configure.ac, src/auto/configure, src/Makefile
*** ../vim-8.2.4546/src/configure.ac 2022-03-08 13:32:34.234804984 +0000
--- src/configure.ac 2022-03-11 15:56:50.674279496 +0000
***************
*** 2443,2449 ****
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")
dnl Canonicalize the --enable-gui= argument so that it can be easily compared.
dnl Do not use character classes for portability with old tools.
--- 2443,2449 ----
AC_MSG_CHECKING(--enable-gui argument)
AC_ARG_ENABLE(gui,
! [ --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,2461 ****
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
- SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
GUITYPE=NONE
--- 2455,2460 ----
***************
*** 2500,2507 ****
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
! SKIP_MOTIF=
! SKIP_NEXTAW=;;
gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
SKIP_GTK2=;;
gnome2) AC_MSG_RESULT(GNOME 2.x GUI support)
--- 2499,2505 ----
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
! SKIP_MOTIF=;;
gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
SKIP_GTK2=;;
gnome2) AC_MSG_RESULT(GNOME 2.x GUI support)
***************
*** 2511,2518 ****
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
--- 2509,2514 ----
***************
*** 2564,2580 ****
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
--- 2560,2565 ----
***************
*** 2806,2812 ****
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)
--- 2791,2796 ----
***************
*** 2856,2862 ****
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)
--- 2840,2845 ----
***************
*** 3017,3044 ****
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
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
--- 3000,3010 ----
fi
if test -z "$SKIP_MOTIF"; then
GUITYPE=MOTIF
AC_SUBST(MOTIF_LIBNAME)
fi
! 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,3106 ****
fi
! if test -z "$SKIP_NEXTAW" -o -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"
--- 3066,3072 ----
fi
! 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,3128 ****
fi
fi
! if test -z "$SKIP_NEXTAW" -o -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
--- 3088,3094 ----
fi
fi
! 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
*** ../vim-8.2.4546/src/auto/configure 2022-03-08 13:32:34.238804971 +0000
--- src/auto/configure 2022-03-11 15:57:39.394161548 +0000
***************
*** 834,840 ****
enable_gnome_check
enable_gtk3_check
enable_motif_check
- enable_nextaw_check
enable_gtktest
with_gnome_includes
with_gnome_libs
--- 834,839 ----
***************
*** 1508,1519 ****
--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-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
--- 1507,1517 ----
--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/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
--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,9278 ****
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
- SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
GUITYPE=NONE
--- 9270,9275 ----
***************
*** 9332,9339 ****
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
! SKIP_MOTIF=
! SKIP_NEXTAW=;;
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=;;
--- 9329,9335 ----
SKIP_GTK2=
SKIP_GTK3=
SKIP_GNOME=
! 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,9355 ****
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
--- 9343,9348 ----
***************
*** 9426,9448 ****
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
-
--- 9419,9424 ----
***************
*** 9711,9717 ****
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
- SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 9687,9692 ----
***************
*** 9970,9976 ****
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
- SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 9945,9950 ----
***************
*** 10276,10320 ****
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 test -n "$GUI_INC_LOC"; then
GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
fi
--- 10250,10260 ----
fi
if test -z "$SKIP_MOTIF"; then
GUITYPE=MOTIF
fi
! 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,10579 ****
fi
! if test -z "$SKIP_NEXTAW" -o -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
--- 10513,10519 ----
fi
! 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,10623 ****
fi
fi
! if test -z "$SKIP_NEXTAW" -o -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
--- 10557,10563 ----
fi
fi
! 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
*** ../vim-8.2.4546/src/Makefile 2022-03-08 13:32:34.238804971 +0000
--- src/Makefile 2022-03-11 15:59:39.625869524 +0000
***************
*** 343,349 ****
#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+,
--- 343,348 ----
***************
*** 371,377 ****
#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
--- 370,375 ----
***************
*** 1304,1327 ****
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
--- 1302,1307 ----
***************
*** 2201,2207 ****
# 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/$@
echo "/* vim: set ft=c : */" >> proto/$@
rm auto/config.h
mv auto/config.h.save auto/config.h
--- 2181,2187 ----
# 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_MOTIF -UFEAT_GUI_GTK $< > proto/$@
echo "/* vim: set ft=c : */" >> proto/$@
rm auto/config.h
mv auto/config.h.save auto/config.h
***************
*** 2218,2225 ****
notags:
-rm -f tags
! # Note: tags is made for the currently configured version, can't include both
! # Motif and neXtaw GUI
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_FILES)
--- 2198,2204 ----
notags:
-rm -f tags
! # Note: tags is made for the currently configured version.
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_FILES)
*** ../vim-8.2.4546/src/version.c 2022-03-11 15:33:46.437387135 +0000
--- src/version.c 2022-03-11 15:55:25.962483940 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4547,
/**/
--
The term "free software" is defined by Richard M. Stallman as
being software that isn't necessarily for free. Confusing?
Let's call it "Stallman software" then!
-- Bram Moolenaar
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220311160159.346641C0650%40moolenaar.net.
