Patch 8.2.4527

[Bram Moolenaar]

Patch 8.2.4527
Problem: The Athena GUI is old and does not work well.
Solution: Remove the Athena 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.4526/src/configure.ac 2022-02-23 18:07:34.361914993 +0000
--- src/configure.ac 2022-03-08 13:24:28.208429708 +0000
***************
*** 291,298 ****
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"

dnl Assume we don't want X11 unless it was specifically asked for
! dnl (--with-x) or Motif, Athena or GTK GUI is used.
! if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
--- 291,298 ----
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"

dnl Assume we don't want X11 unless it was specifically asked for
! dnl (--with-x) or Motif or GTK GUI is used.
! if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
***************
*** 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/athena/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/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.
***************
*** 2455,2461 ****
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
--- 2455,2460 ----
***************
*** 2502,2508 ****
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
- SKIP_ATHENA=
SKIP_NEXTAW=;;
gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
SKIP_GTK2=;;
--- 2501,2506 ----
***************
*** 2513,2520 ****
SKIP_GTK3=;;
motif) AC_MSG_RESULT(Motif GUI support)
SKIP_MOTIF=;;
- athena) AC_MSG_RESULT(Athena GUI support)
- SKIP_ATHENA=;;
nextaw) AC_MSG_RESULT(neXtaw GUI support)
SKIP_NEXTAW=;;
*) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
--- 2511,2516 ----
***************
*** 2568,2584 ****
fi
fi

- if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
- AC_MSG_CHECKING(whether or not to look for Athena)
- AC_ARG_ENABLE(athena-check,
- [ --enable-athena-check If auto-select GUI, check for Athena [default=yes]],
- , enable_athena_check="yes")
- AC_MSG_RESULT($enable_athena_check)
- if test "x$enable_athena_check" = "xno"; then
- SKIP_ATHENA=YES
- 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,
--- 2564,2569 ----
***************
*** 2821,2827 ****
GUI_INC_LOC="$GTK_CFLAGS"], )
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 2806,2811 ----
***************
*** 2872,2878 ****
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 2856,2861 ----
***************
*** 3034,3065 ****
fi

if test -z "$SKIP_MOTIF"; then
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
GUITYPE=MOTIF
AC_SUBST(MOTIF_LIBNAME)
fi

- dnl Check if the Athena files can be found
-
- GUI_X_LIBS=
-
- if test -z "$SKIP_ATHENA"; then
- AC_MSG_CHECKING(if Athena header files can be found)
- cflags_save=$CFLAGS
- CFLAGS="$CFLAGS $X_CFLAGS"
- AC_TRY_COMPILE([
- #include <X11/Intrinsic.h>
- #include <X11/Xaw/Paned.h>], ,
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no); SKIP_ATHENA=YES )
- CFLAGS=$cflags_save
- fi
-
- if test -z "$SKIP_ATHENA"; then
- GUITYPE=ATHENA
- fi
-
if test -z "$SKIP_NEXTAW"; then
AC_MSG_CHECKING(if neXtaw header files can be found)
cflags_save=$CFLAGS
--- 3017,3027 ----
***************
*** 3076,3082 ****
GUITYPE=NEXTAW
fi

! if test -z "$SKIP_ATHENA" -o -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
--- 3038,3044 ----
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
***************
*** 3138,3144 ****
fi


! if test -z "$SKIP_ATHENA" -o -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"
--- 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"
***************
*** 3160,3166 ****
fi
fi

! if test -z "$SKIP_ATHENA" -o -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
--- 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
***************
*** 3175,3181 ****
CPPFLAGS=$cppflags_save
fi

! dnl Only use the Xm directory when compiling Motif, don't use it for Athena
if test -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
--- 3137,3143 ----
CPPFLAGS=$cppflags_save
fi

! dnl Only use the Xm directory when compiling Motif.
if test -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
*** ../vim-8.2.4526/src/auto/configure 2022-01-18 11:11:22.297120442 +0000
--- src/auto/configure 2022-03-08 13:27:28.111929534 +0000
***************
*** 834,840 ****
enable_gnome_check
enable_gtk3_check
enable_motif_check
- enable_athena_check
enable_nextaw_check
enable_gtktest
with_gnome_includes
--- 834,839 ----
***************
*** 1509,1520 ****
--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/athena/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-athena-check If auto-select GUI, check for Athena 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
--- 1508,1518 ----
--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
***************
*** 1523,1529 ****
--disable-canberra Do not use libcanberra.
--disable-libsodium Do not use libsodium.
--disable-acl No check for ACL support.
! --disable-gpm Don't use gpm (Linux mouse daemon).
--disable-sysmouse Don't use sysmouse (mouse in *BSD console).
--disable-nls Don't support NLS (gettext()).

--- 1521,1527 ----
--disable-canberra Do not use libcanberra.
--disable-libsodium Do not use libsodium.
--disable-acl No check for ACL support.
! --enable-gpm=OPTS Use gpm (Linux mouse daemon). default=yes OPTS=yes/no/dynamic
--disable-sysmouse Don't use sysmouse (mouse in *BSD console).
--disable-nls Don't support NLS (gettext()).

***************
*** 4787,4793 ****
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"

! if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
--- 4785,4791 ----
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"

! if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
***************
*** 9274,9280 ****
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
--- 9272,9277 ----
***************
*** 9336,9342 ****
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
- SKIP_ATHENA=
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; }
--- 9333,9338 ----
***************
*** 9351,9359 ****
motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5
$as_echo "Motif GUI support" >&6; }
SKIP_MOTIF=;;
- athena) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Athena GUI support" >&5
- $as_echo "Athena GUI support" >&6; }
- SKIP_ATHENA=;;
nextaw) { $as_echo "$as_me:${as_lineno-$LINENO}: result: neXtaw GUI support" >&5
$as_echo "neXtaw GUI support" >&6; }
SKIP_NEXTAW=;;
--- 9347,9352 ----
***************
*** 9433,9455 ****
fi
fi

- if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Athena" >&5
- $as_echo_n "checking whether or not to look for Athena... " >&6; }
- # Check whether --enable-athena-check was given.
- if test "${enable_athena_check+set}" = set; then :
- enableval=$enable_athena_check;
- else
- enable_athena_check="yes"
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_athena_check" >&5
- $as_echo "$enable_athena_check" >&6; }
- if test "x$enable_athena_check" = "xno"; then
- SKIP_ATHENA=YES
- 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; }
--- 9426,9431 ----
***************
*** 9735,9741 ****

if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 9711,9716 ----
***************
*** 9995,10001 ****
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
--- 9970,9975 ----
***************
*** 10302,10349 ****
fi

if test -z "$SKIP_MOTIF"; then
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
GUITYPE=MOTIF

fi

-
- GUI_X_LIBS=
-
- if test -z "$SKIP_ATHENA"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Athena header files can be found" >&5
- $as_echo_n "checking if Athena 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/Xaw/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_ATHENA=YES
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$cflags_save
- fi
-
- if test -z "$SKIP_ATHENA"; then
- GUITYPE=ATHENA
- 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; }
--- 10276,10286 ----
***************
*** 10377,10383 ****
GUITYPE=NEXTAW
fi

! if test -z "$SKIP_ATHENA" -o -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
--- 10314,10320 ----
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
***************
*** 10636,10642 ****
fi


! if test -z "$SKIP_ATHENA" -o -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
--- 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
***************
*** 10680,10686 ****
fi
fi

! if test -z "$SKIP_ATHENA" -o -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
--- 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
***************
*** 13845,13852 ****
LIBS="$ac_save_LIBS"
fi

! { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gpm argument" >&5
! $as_echo_n "checking --disable-gpm argument... " >&6; }
# Check whether --enable-gpm was given.
if test "${enable_gpm+set}" = set; then :
enableval=$enable_gpm;
--- 13782,13789 ----
LIBS="$ac_save_LIBS"
fi

! { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5
! $as_echo_n "checking --enable-gpm argument... " >&6; }
# Check whether --enable-gpm was given.
if test "${enable_gpm+set}" = set; then :
enableval=$enable_gpm;
***************
*** 13855,13863 ****
fi


! if test "$enable_gpm" = "yes"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
! $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
$as_echo_n "checking for gpm... " >&6; }
if ${vi_cv_have_gpm+:} false; then :
--- 13792,13800 ----
fi


! if test "$enable_gpm" = "yes" -o "$enable_gpm" = "dynamic"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5
! $as_echo "$enable_gpm" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
$as_echo_n "checking for gpm... " >&6; }
if ${vi_cv_have_gpm+:} false; then :
***************
*** 13889,13901 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5
$as_echo "$vi_cv_have_gpm" >&6; }
if test $vi_cv_have_gpm = yes; then
! LIBS="$LIBS -lgpm"
$as_echo "#define HAVE_GPM 1" >>confdefs.h

fi
else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5
--- 13826,13843 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5
$as_echo "$vi_cv_have_gpm" >&6; }
if test $vi_cv_have_gpm = yes; then
! if test "$enable_gpm" = "yes"; then
! LIBS="$LIBS -lgpm"
! else
! $as_echo "#define DYNAMIC_GPM 1" >>confdefs.h
!
! fi
$as_echo "#define HAVE_GPM 1" >>confdefs.h

fi
else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
! $as_echo "no" >&6; }
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5
*** ../vim-8.2.4526/src/Makefile 2022-03-05 14:35:07.315171783 +0000
--- src/Makefile 2022-03-08 13:27:23.287950155 +0000
***************
*** 21,28 ****
# the first column of a line is removed.
# - If you want a version of Vim that is small and starts up quickly,
# you might want to disable the GUI, X11, Perl, Python and Tcl.
! # - Uncomment the line with --disable-gui if you have Motif, GTK and/or
! # Athena but don't want to make gvim (the GUI version of Vim with nice
# menus and scrollbars, but makes Vim bigger and startup slower).
# - Uncomment --disable-darwin if on Mac OS X but you want to compile a
# Unix version.
--- 21,28 ----
# the first column of a line is removed.
# - If you want a version of Vim that is small and starts up quickly,
# you might want to disable the GUI, X11, Perl, Python and Tcl.
! # - Uncomment the line with --disable-gui if you have Motif and/or GTK
! # but don't want to make gvim (the GUI version of Vim with nice
# menus and scrollbars, but makes Vim bigger and startup slower).
# - Uncomment --disable-darwin if on Mac OS X but you want to compile a
# Unix version.
***************
*** 329,335 ****

# GUI - For creating Vim with GUI (gvim) (B)
# Uncomment this line when you don't want to get the GUI version, although you
! # have GTK, Motif and/or Athena. Also use --without-x if you don't want X11
# at all.
#CONF_OPT_GUI = --disable-gui

--- 329,335 ----

# GUI - For creating Vim with GUI (gvim) (B)
# Uncomment this line when you don't want to get the GUI version, although you
! # have GTK and/or Motif. Also use --without-x if you don't want X11
# at all.
#CONF_OPT_GUI = --disable-gui

***************
*** 343,354 ****
#CONF_OPT_GUI = --enable-gnome-check
#CONF_OPT_GUI = --disable-gtk3-check
#CONF_OPT_GUI = --disable-motif-check
- #CONF_OPT_GUI = --disable-athena-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+,
! # Motif or Athena.
#
# GTK versions that are known not to work 100% are rejected.
# Use "--disable-gtktest" to accept them anyway.
--- 343,353 ----
#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+,
! # or Motif.
#
# GTK versions that are known not to work 100% are rejected.
# Use "--disable-gtktest" to accept them anyway.
***************
*** 370,378 ****
#CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=gtk3
#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=athena
#CONF_OPT_GUI = --enable-gui=nextaw

# Uncomment this line to run an individual test with gvim.
--- 369,376 ----
#CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=gtk3
#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.
***************
*** 793,805 ****
#X_LIBS_DIR = -L/usr/openwin/lib -R/usr/openwin/lib
#CFLAGS = -O

- ### (9) Solaris 2.x with cc (SunPro), using Athena.
- ### Only required for compiling gui_at_sb.c.
- ### Symptom: "identifier redeclared: vim_XawScrollbarSetThumb"
- ### Use one of the lines (either Full ANSI or no ANSI at all)
- #CFLAGS = $(CFLAGS) -Xc
- #CFLAGS = $(CFLAGS) -Xs
-
### Solaris 2.3 with X11 and specific cc
#CC=/opt/SUNWspro/bin/cc -O -Xa -v -R/usr/openwin/lib

--- 791,796 ----
***************
*** 1261,1268 ****
### 'configure --enable-gui' can enable one of these for you if you did set
### a corresponding CONF_OPT_GUI above and have X11.
### Override configures choice by uncommenting all the following lines.
! ### As they are, the GUI is disabled. Replace "NONE" with "ATHENA" or "MOTIF"
! ### for enabling the Athena or Motif GUI.
#GUI_SRC = $(NONE_SRC)
#GUI_OBJ = $(NONE_OBJ)
#GUI_DEFS = $(NONE_DEFS)
--- 1252,1259 ----
### 'configure --enable-gui' can enable one of these for you if you did set
### a corresponding CONF_OPT_GUI above and have X11.
### Override configures choice by uncommenting all the following lines.
! ### As they are, the GUI is disabled. Replace "NONE" with "MOTIF"
! ### for enabling the Motif GUI.
#GUI_SRC = $(NONE_SRC)
#GUI_OBJ = $(NONE_OBJ)
#GUI_DEFS = $(NONE_DEFS)
***************
*** 1313,1348 ****
MOTIF_TESTTARGET = gui
MOTIF_BUNDLE =

- ### Athena GUI
- ### Use Xaw3d to make the menus look a little bit nicer
- #XAW_LIB = -lXaw3d
- XAW_LIB = -lXaw
-
- ### When using Xaw3d, uncomment/comment the following lines to also get the
- ### scrollbars from Xaw3d.
- #ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
- #ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
- # objects/gui_beval.o objects/gui_at_fs.o
- #ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
- # -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
- # -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
- ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c \
- gui_at_sb.c gui_at_fs.c
- ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
- objects/gui_beval.o \
- objects/gui_at_sb.o objects/gui_at_fs.o
- ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
-
- ATHENA_IPATH = $(GUI_INC_LOC)
- ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
- ATHENA_LIBS1 = $(XAW_LIB)
- ATHENA_LIBS2 = -lXt
- ATHENA_INSTALL = install_normal install_gui_extra
- ATHENA_TARGETS = installglinks
- ATHENA_MAN_TARGETS = yes
- ATHENA_TESTTARGET = gui
- ATHENA_BUNDLE =
-
### neXtaw GUI
NEXTAW_LIB = -lneXtaw

--- 1304,1309 ----
***************
*** 2240,2246 ****
# 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_ATHENA -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
--- 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
***************
*** 2258,2264 ****
-rm -f tags

# Note: tags is made for the currently configured version, can't include both
! # Motif and Athena GUI
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_FILES)
--- 2219,2225 ----
-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)
*** ../vim-8.2.4526/src/version.c 2022-03-08 13:18:10.813020777 +0000
--- src/version.c 2022-03-08 13:22:31.004612490 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4527,
/**/

--
hundred-and-one symptoms of being an internet addict:
196. Your computer costs more than your car.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

[Bram Moolenaar]

I wrote:

> Patch 8.2.4527
> Problem: The Athena GUI is old and does not work well.
> Solution: Remove the Athena GUI from configure to find out who still wants
> support for this GUI.
> Files: src/configure.ac, src/auto/configure, src/Makefile

Perhaps the NeXtaw GUI should also be removed. It's basically the same
as Athena with some nicer looking widgets. Opinions?

--
hundred-and-one symptoms of being an internet addict:

202. You're amazed to find out Spam is a food.

[Dominique Pellé]

Bram Moolenaar <Br...@moolenaar.net> wrote:

> I wrote:
>
> > Patch 8.2.4527
> > Problem: The Athena GUI is old and does not work well.
> > Solution: Remove the Athena GUI from configure to find out who still wants
> > support for this GUI.
> > Files: src/configure.ac, src/auto/configure, src/Makefile
>
> Perhaps the NeXtaw GUI should also be removed. It's basically the same
> as Athena with some nicer looking widgets. Opinions?

I'm guessing if we remove athena GUI, it indeed makes sense
to remove neXtaw as well. Are there packages on Ubuntu to build
with this GUI? I did not find any at first sight with xubuntu-18.04.

Dominique

[Bram Moolenaar]

There is libxaw, based on the description that's the renamed neXtaw
library, or perhaps a fork. Might also be called libxaw3d, package
libxaw3dxft8-dev.

--
hundred-and-one symptoms of being an internet addict:

203. You're an active member of more than 20 newsgroups.

[James McCoy]

On Tue, Mar 08, 2022 at 03:07:02PM +0000, Bram Moolenaar wrote:
>
> I wrote:
>
> > Patch 8.2.4527
> > Problem: The Athena GUI is old and does not work well.
> > Solution: Remove the Athena GUI from configure to find out who still wants
> > support for this GUI.
> > Files: src/configure.ac, src/auto/configure, src/Makefile
>
> Perhaps the NeXtaw GUI should also be removed. It's basically the same
> as Athena with some nicer looking widgets. Opinions?

FWIW, here's some data about "old" GUI support on the Debian side.

We started providing a lesstif-based package around 2003. In 2011, we
switched to using Athena for the non-GTK/Gnome based GUI (for reasons I
don't recall).

Based on Debian's "Popularity Contest"[0] stats, vim-athena has around
twice[1] the amount of active users that vim-lesstif ever did. However,
that's still quite the minority (147 / 42,086 [2]) of people that have
some Vim version installed, as correlated by having vim-common
installed.

For GUI users[3], it's 147 Athena to 3128 GTK, so still pretty small but
not quite as bad.

I guess it's time to either transition those folks back to a Motif GUI
or drop the non-GTK GUI from Debian.

[0]: https://popcon.debian.org/
[1]: https://qa.debian.org/popcon-graph.php?packages=vim-athena%2Cvim-lesstif&show_vote=on&beenhere=1
[2]: https://qa.debian.org/popcon-graph.php?packages=vim-athena%2Cvim-common&show_vote=on&from_date=2022-03-01&beenhere=1
[3]: https://qa.debian.org/popcon-graph.php?packages=vim-athena%2Cvim-gtk3&show_vote=on&from_date=2022-03-01&beenhere=1
--
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB

[Bram Moolenaar]

James McCoy wrote:

> > > Patch 8.2.4527
> > > Problem: The Athena GUI is old and does not work well.
> > > Solution: Remove the Athena GUI from configure to find out who still wants
> > > support for this GUI.
> > > Files: src/configure.ac, src/auto/configure, src/Makefile
> >
> > Perhaps the NeXtaw GUI should also be removed. It's basically the same
> > as Athena with some nicer looking widgets. Opinions?
>
> FWIW, here's some data about "old" GUI support on the Debian side.
>
> We started providing a lesstif-based package around 2003. In 2011, we
> switched to using Athena for the non-GTK/Gnome based GUI (for reasons I
> don't recall).

I wonder why the lesstif library is still used. Perhaps because nobody
bothered to switch it to the now LGPM Motif libraries? AFAIK the Motif
libraries are better than lesstif, and these days I suspect lesstif is
not being worked on, since the only reason for its existence was that
the Motif library was not generally available.

> Based on Debian's "Popularity Contest"[0] stats, vim-athena has around
> twice[1] the amount of active users that vim-lesstif ever did. However,
> that's still quite the minority (147 / 42,086 [2]) of people that have
> some Vim version installed, as correlated by having vim-common
> installed.
>
> For GUI users[3], it's 147 Athena to 3128 GTK, so still pretty small but
> not quite as bad.
>
> I guess it's time to either transition those folks back to a Motif GUI
> or drop the non-GTK GUI from Debian.

Is there a good reason to not want the Motif version, or does this just
require some encouragement for someone to setup the packages?

You do not mention it explicitly, but there is no package with the
NeXtaw library?

--
hundred-and-one symptoms of being an internet addict:

238. You think faxes are old-fashioned.

[James McCoy]

On Sat, Mar 12, 2022 at 10:59:57AM +0000, Bram Moolenaar wrote:
>
> James McCoy wrote:
>
> > > > Patch 8.2.4527
> > > > Problem: The Athena GUI is old and does not work well.
> > > > Solution: Remove the Athena GUI from configure to find out who still wants
> > > > support for this GUI.
> > > > Files: src/configure.ac, src/auto/configure, src/Makefile
> > >
> > > Perhaps the NeXtaw GUI should also be removed. It's basically the same
> > > as Athena with some nicer looking widgets. Opinions?
> >
> > FWIW, here's some data about "old" GUI support on the Debian side.
> >
> > We started providing a lesstif-based package around 2003. In 2011, we
> > switched to using Athena for the non-GTK/Gnome based GUI (for reasons I
> > don't recall).
>
> I wonder why the lesstif library is still used. Perhaps because nobody
> bothered to switch it to the now LGPM Motif libraries?

We dropped the lesstif package before Motif was released as LGPL.

> > Based on Debian's "Popularity Contest"[0] stats, vim-athena has around
> > twice[1] the amount of active users that vim-lesstif ever did. However,
> > that's still quite the minority (147 / 42,086 [2]) of people that have
> > some Vim version installed, as correlated by having vim-common
> > installed.
> >
> > For GUI users[3], it's 147 Athena to 3128 GTK, so still pretty small but
> > not quite as bad.
> >
> > I guess it's time to either transition those folks back to a Motif GUI
> > or drop the non-GTK GUI from Debian.
>
> Is there a good reason to not want the Motif version, or does this just
> require some encouragement for someone to setup the packages?

Since people do seem to still be using the non-GTK package, I likely
will add a Motif version and transition the Athena users to it.

> You do not mention it explicitly, but there is no package with the
> NeXtaw library?

Correct. As far as I know, Debian doesn't have neXtaw packaged.

Cheers,

[Bram Moolenaar]

James McCoy wrote:

> > > > > Patch 8.2.4527
> > > > > Problem: The Athena GUI is old and does not work well.
> > > > > Solution: Remove the Athena GUI from configure to find out who still wants
> > > > > support for this GUI.
> > > > > Files: src/configure.ac, src/auto/configure, src/Makefile
> > > >
> > > > Perhaps the NeXtaw GUI should also be removed. It's basically the same
> > > > as Athena with some nicer looking widgets. Opinions?
> > >
> > > FWIW, here's some data about "old" GUI support on the Debian side.
> > >
> > > We started providing a lesstif-based package around 2003. In 2011, we
> > > switched to using Athena for the non-GTK/Gnome based GUI (for reasons I
> > > don't recall).
> >
> > I wonder why the lesstif library is still used. Perhaps because nobody
> > bothered to switch it to the now LGPM Motif libraries?
>
> We dropped the lesstif package before Motif was released as LGPL.

Ah, so "switch to using Athena" means you actually stopped providing the
build with lesstif. Probably because lesstif (at the time) had some bugs.

> > > Based on Debian's "Popularity Contest"[0] stats, vim-athena has around
> > > twice[1] the amount of active users that vim-lesstif ever did. However,
> > > that's still quite the minority (147 / 42,086 [2]) of people that have
> > > some Vim version installed, as correlated by having vim-common
> > > installed.
> > >
> > > For GUI users[3], it's 147 Athena to 3128 GTK, so still pretty small but
> > > not quite as bad.
> > >
> > > I guess it's time to either transition those folks back to a Motif GUI
> > > or drop the non-GTK GUI from Debian.
> >
> > Is there a good reason to not want the Motif version, or does this just
> > require some encouragement for someone to setup the packages?
>
> Since people do seem to still be using the non-GTK package, I likely
> will add a Motif version and transition the Athena users to it.

Good. Do I need to roll back the change to configure?

> > You do not mention it explicitly, but there is no package with the
> > NeXtaw library?
>
> Correct. As far as I know, Debian doesn't have neXtaw packaged.

OK. It might have another name, but that means using a different
configuration anyway.

--
Marriage isn't a word. It's a sentence.

[James McCoy]

On Sat, Mar 12, 2022 at 06:40:48PM +0000, Bram Moolenaar wrote:
> James McCoy wrote:

> > > Is there a good reason to not want the Motif version, or does this just
> > > require some encouragement for someone to setup the packages?
> >
> > Since people do seem to still be using the non-GTK package, I likely
> > will add a Motif version and transition the Athena users to it.
>
> Good. Do I need to roll back the change to configure?

If you're going to keep the Athena support around, sure. Otherwise I'll
drop Athena and add Motif.

[Bram Moolenaar]

James McCoy wrote:

> On Sat, Mar 12, 2022 at 06:40:48PM +0000, Bram Moolenaar wrote:
> > James McCoy wrote:
> > > > Is there a good reason to not want the Motif version, or does this just
> > > > require some encouragement for someone to setup the packages?
> > >
> > > Since people do seem to still be using the non-GTK package, I likely
> > > will add a Motif version and transition the Athena users to it.
> >
> > Good. Do I need to roll back the change to configure?
>
> If you're going to keep the Athena support around, sure. Otherwise I'll
> drop Athena and add Motif.

I do hope we can drop Athena. Tests report failures, and it is very
outdated.

--
Eagles may soar, but weasels don't get sucked into jet engines.