To: vim_dev@googlegroups.com Subject: Patch 8.2.1424 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1424 (after 8.2.1422) Problem: Mac build fails. Solution: Adjust configure to not fall back to Athena. Adjust some other files. Files: src/configure.ac, src/auto/configure, src/os_macosx.m, src/version.c *** ../vim-8.2.1423/src/configure.ac 2020-08-11 21:58:12.577968264 +0200 --- src/configure.ac 2020-08-11 23:00:49.405924831 +0200 *************** *** 262,267 **** --- 262,273 ---- dnl TODO: use -arch i386 on Intel machines dnl Removed -no-cpp-precomp, only for very old compilers. 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 dnl Avoid a bug with -O2 with gcc 4.0.1. Symptom: malloc() reports double *************** *** 2421,2426 **** --- 2427,2441 ---- SKIP_PHOTON=YES ;; esac + elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then + case "$enable_gui_canon" in + no) AC_MSG_RESULT(no GUI support) ;; + yes|"") AC_MSG_RESULT(yes - automatic GUI support) + gui_auto=yes ;; + auto) AC_MSG_RESULT(auto - disable GUI support for Mac OS) ;; + *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) + SKIP_CARBON=YES ;; + esac else case "$enable_gui_canon" in *** ../vim-8.2.1423/src/auto/configure 2020-08-11 21:58:12.577968264 +0200 --- src/auto/configure 2020-08-11 23:00:53.165911271 +0200 *************** *** 4744,4749 **** --- 4744,4753 ---- OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; 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 if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then *************** *** 9232,9237 **** --- 9236,9254 ---- SKIP_PHOTON=YES ;; esac + elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then + case "$enable_gui_canon" in + no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 + $as_echo "no GUI support" >&6; } ;; + yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 + $as_echo "yes - automatic GUI support" >&6; } + gui_auto=yes ;; + auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - disable GUI support for Mac OS" >&5 + $as_echo "auto - disable GUI support for Mac OS" >&6; } ;; + *) { $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; } + SKIP_CARBON=YES ;; + esac else case "$enable_gui_canon" in *** ../vim-8.2.1423/src/os_macosx.m 2019-06-14 23:26:26.000000000 +0200 --- src/os_macosx.m 2020-08-11 22:36:25.094892484 +0200 *************** *** 33,39 **** * gui_mac.c are used then. TODO: remove those instead? * But for MacVim we do need these ones. */ ! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED) || defined(FEAT_GUI_MACVIM)) /* Used to identify clipboard data copied from Vim. */ --- 33,39 ---- * gui_mac.c are used then. TODO: remove those instead? * But for MacVim we do need these ones. */ ! #if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED)) /* Used to identify clipboard data copied from Vim. */ *** ../vim-8.2.1423/src/version.c 2020-08-11 22:30:39.223770448 +0200 --- src/version.c 2020-08-11 23:07:55.744781755 +0200 *************** *** 3954,3970 **** # else # if defined(MSWIN) msg_puts(_("with GUI.")); - # else - # if defined(TARGET_API_MAC_CARBON) && TARGET_API_MAC_CARBON - msg_puts(_("with Carbon GUI.")); - # else - # if defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX - msg_puts(_("with Cocoa GUI.")); - # else - # endif - # endif - # endif # endif # endif # endif # endif --- 3956,3963 ---- # else # if defined(MSWIN) msg_puts(_("with GUI.")); # endif + # endif # endif # endif # endif *** ../vim-8.2.1423/src/version.c 2020-08-11 22:30:39.223770448 +0200 --- src/version.c 2020-08-11 23:07:55.744781755 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1424, /**/ -- If Apple would build a car... ... it would be powered by the sun, be reliable, five times as fast and twice as easy to drive; but would only run on five percent of the roads. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///