Skip to content

Commit 097148e

Browse files
brammoolbrammool
committed
patch 8.2.1422: the Mac GUI implementation is outdated
Problem: The Mac GUI implementation is outdated and probably doesn't even work. Solution: Remove the Mac GUI code. The MacVim project provides the supported Vim GUI version.
1 parent 4301a72 commit 097148e

26 files changed

Lines changed: 48 additions & 7264 deletions

‎Filelist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,13 +642,11 @@ SRC_HAIKU = \
642642
SRC_MAC = \
643643
src/INSTALLmac.txt \
644644
src/dehqx.py \
645-
src/gui_mac.c \
646645
src/os_mac_rsrc/*.icns \
647646
src/os_mac.h \
648647
src/os_mac.rsr.hqx \
649648
src/os_mac_conv.c \
650649
src/os_macosx.m \
651-
src/proto/gui_mac.pro \
652650
src/proto/os_mac_conv.pro \
653651

654652
# source files for VMS (in the extra archive)

‎src/INSTALLmac.txt‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Summary
1616
----------------------------------------------------------------------------
1717

1818
1 MacOS X
19-
1.1. Carbon interface
19+
1.1. Terminal version
2020
1.2. X (Athena, GTK, Motif) or plain text.
2121

2222
MacOS Classic is no longer supported. If you really want it use Vim 6.4.
@@ -27,24 +27,17 @@ MacOS Classic is no longer supported. If you really want it use Vim 6.4.
2727

2828
1.0 Considerations
2929

30-
Only '/' supported as path separator.
30+
Only '/' is supported as path separator.
3131

32-
1.1 Carbon interface (default)
32+
1.1 Terminal version (default)
3333

3434
You can compile vim with the standard Unix routine:
3535
cd .../src
3636
make
3737
make test
3838
sudo make install
3939

40-
"make" will create a working Vim.app application bundle in the src
41-
directory. You can move this bundle (the Vim.app directory) anywhere
42-
you want. Or use "make install" to move it to /Applications.
43-
44-
You need at least Xcode 1.5 to compile Vim 7.0.
45-
46-
Configure will create a universal binary if possible. This requires
47-
installing the universal SDK (currently for 10.4).
40+
You need at least Xcode 1.5.
4841

4942
To overrule the architecture do this before running make:
5043

@@ -53,17 +46,16 @@ MacOS Classic is no longer supported. If you really want it use Vim 6.4.
5346
./configure --with-mac-arch=ppc
5447

5548

56-
1.2 X-Windows or Plain Text
49+
1.2 X-Windows
5750

58-
If you do not want the Carbon interface, you must explicitly tell
59-
configure to use a different GUI.
51+
You must explicitly tell configure to use a GUI.
6052

6153
cd .../src
6254
./configure --disable-darwin --enable-gui=gtk2
6355
make; make install
6456

65-
NOTE: The following GUI options are supported:
66-
no (for text), motif, athena, nextaw
57+
NOTE: The following GUI options are possible (but might not work):
58+
no (for terminal only), motif, athena, nextaw
6759
gtk, gtk2, gnome, gnome2,
6860

6961
NOTE: You need to first install XFree86 and XDarwin.

‎src/Makefile‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,24 +1373,6 @@ PHOTONGUI_MAN_TARGETS = yes
13731373
PHOTONGUI_TESTTARGET = gui
13741374
PHOTONGUI_BUNDLE =
13751375

1376-
# CARBON GUI
1377-
CARBONGUI_SRC = gui.c gui_mac.c
1378-
CARBONGUI_OBJ = objects/gui.o objects/gui_mac.o
1379-
CARBONGUI_DEFS = -DFEAT_GUI_MAC -fno-common -fpascal-strings \
1380-
-Wall -Wno-unknown-pragmas \
1381-
-mdynamic-no-pic -pipe
1382-
CARBONGUI_IPATH = -I. -Iproto
1383-
CARBONGUI_LIBS_DIR =
1384-
CARBONGUI_LIBS1 = -framework Carbon
1385-
CARBONGUI_LIBS2 =
1386-
CARBONGUI_INSTALL = install_macosx
1387-
CARBONGUI_TARGETS =
1388-
CARBONGUI_MAN_TARGETS =
1389-
CARBONGUI_TESTTARGET = gui
1390-
CARBONGUI_BUNDLE = gui_bundle
1391-
APPDIR = $(VIMNAME).app
1392-
CARBONGUI_TESTARG = VIMPROG=../$(APPDIR)/Contents/MacOS/$(VIMTARGET)
1393-
13941376
### Haiku GUI
13951377
HAIKUGUI_SRC = gui.c gui_haiku.cc
13961378
HAIKUGUI_OBJ = objects/gui.o objects/gui_haiku.o

‎src/auto/configure‎

Lines changed: 13 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,6 @@ enable_gtk3_check
829829
enable_motif_check
830830
enable_athena_check
831831
enable_nextaw_check
832-
enable_carbon_check
833832
enable_gtktest
834833
with_gnome_includes
835834
with_gnome_libs
@@ -1509,7 +1508,6 @@ Optional Features:
15091508
--enable-motif-check If auto-select GUI, check for Motif default=yes
15101509
--enable-athena-check If auto-select GUI, check for Athena default=yes
15111510
--enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
1512-
--enable-carbon-check If auto-select GUI, check for Carbon default=yes
15131511
--disable-gtktest Do not try to compile and run a test GTK program
15141512
--disable-icon-cache-update update disabled
15151513
--disable-desktop-database-update update disabled
@@ -4746,8 +4744,18 @@ rm -f core conftest.err conftest.$ac_objext \
47464744
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
47474745
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
47484746
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
4747+
fi
4748+
4749+
if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
4750+
CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
4751+
fi
4752+
4753+
else
4754+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4755+
$as_echo "no" >&6; }
4756+
fi
47494757

4750-
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
4758+
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
47514759
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
47524760
inttypes.h stdint.h unistd.h
47534761
do :
@@ -4764,28 +4772,6 @@ fi
47644772
done
47654773

47664774

4767-
ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
4768-
if test "x$ac_cv_header_Carbon_Carbon_h" = xyes; then :
4769-
CARBON=yes
4770-
fi
4771-
4772-
4773-
if test "x$CARBON" = "xyes"; then
4774-
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
4775-
with_x=no
4776-
fi
4777-
fi
4778-
fi
4779-
4780-
if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
4781-
CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
4782-
fi
4783-
4784-
else
4785-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4786-
$as_echo "no" >&6; }
4787-
fi
4788-
47894775
for ac_header in AvailabilityMacros.h
47904776
do :
47914777
ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
@@ -9212,7 +9198,6 @@ SKIP_ATHENA=YES
92129198
SKIP_NEXTAW=YES
92139199
SKIP_PHOTON=YES
92149200
SKIP_HAIKU=YES
9215-
SKIP_CARBON=YES
92169201
GUITYPE=NONE
92179202

92189203
if test "x$HAIKU" = "xyes"; then
@@ -9247,25 +9232,6 @@ $as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
92479232
SKIP_PHOTON=YES ;;
92489233
esac
92499234

9250-
elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then
9251-
SKIP_CARBON=
9252-
case "$enable_gui_canon" in
9253-
no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5
9254-
$as_echo "no GUI support" >&6; }
9255-
SKIP_CARBON=YES ;;
9256-
yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5
9257-
$as_echo "yes - automatic GUI support" >&6; }
9258-
gui_auto=yes ;;
9259-
auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - Carbon GUI is outdated - disable GUI support" >&5
9260-
$as_echo "auto - Carbon GUI is outdated - disable GUI support" >&6; }
9261-
SKIP_CARBON=YES ;;
9262-
carbon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Carbon GUI support" >&5
9263-
$as_echo "Carbon GUI support" >&6; } ;;
9264-
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
9265-
$as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
9266-
SKIP_CARBON=YES ;;
9267-
esac
9268-
92699235
else
92709236

92719237
case "$enable_gui_canon" in
@@ -9278,8 +9244,7 @@ $as_echo "yes/auto - automatic GUI support" >&6; }
92789244
SKIP_GNOME=
92799245
SKIP_MOTIF=
92809246
SKIP_ATHENA=
9281-
SKIP_NEXTAW=
9282-
SKIP_CARBON=;;
9247+
SKIP_NEXTAW=;;
92839248
gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
92849249
$as_echo "GTK+ 2.x GUI support" >&6; }
92859250
SKIP_GTK2=;;
@@ -9409,56 +9374,6 @@ $as_echo "$enable_nextaw_check" >&6; };
94099374
fi
94109375
fi
94119376

9412-
if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
9413-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Carbon" >&5
9414-
$as_echo_n "checking whether or not to look for Carbon... " >&6; }
9415-
# Check whether --enable-carbon-check was given.
9416-
if test "${enable_carbon_check+set}" = set; then :
9417-
enableval=$enable_carbon_check;
9418-
else
9419-
enable_carbon_check="yes"
9420-
fi
9421-
9422-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_carbon_check" >&5
9423-
$as_echo "$enable_carbon_check" >&6; };
9424-
if test "x$enable_carbon_check" = "xno"; then
9425-
SKIP_CARBON=YES
9426-
fi
9427-
fi
9428-
9429-
9430-
if test "x$MACOS_X" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
9431-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5
9432-
$as_echo_n "checking for Carbon GUI... " >&6; }
9433-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9434-
$as_echo "yes" >&6; };
9435-
GUITYPE=CARBONGUI
9436-
if test "$VIMNAME" = "vim"; then
9437-
VIMNAME=Vim
9438-
fi
9439-
9440-
if test "x$MACARCH" = "xboth"; then
9441-
CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
9442-
else
9443-
CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
9444-
fi
9445-
9446-
if test x$prefix = xNONE; then
9447-
prefix=/Applications
9448-
fi
9449-
9450-
datadir='${prefix}/Vim.app/Contents/Resources'
9451-
9452-
SKIP_GTK2=YES;
9453-
SKIP_GNOME=YES;
9454-
SKIP_MOTIF=YES;
9455-
SKIP_ATHENA=YES;
9456-
SKIP_NEXTAW=YES;
9457-
SKIP_PHOTON=YES;
9458-
SKIP_HAIKU=YES;
9459-
SKIP_CARBON=YES
9460-
fi
9461-
94629377

94639378

94649379

@@ -14860,11 +14775,7 @@ fi
1486014775
if test "$MACOS_X" = "yes"; then
1486114776
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5
1486214777
$as_echo_n "checking whether we need macOS frameworks... " >&6; }
14863-
if test "$GUITYPE" = "CARBONGUI"; then
14864-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need Carbon" >&5
14865-
$as_echo "yes, we need Carbon" >&6; }
14866-
LIBS="$LIBS -framework Carbon"
14867-
elif test "$MACOS_X_DARWIN" = "yes"; then
14778+
if test "$MACOS_X_DARWIN" = "yes"; then
1486814779
if test "$features" = "tiny"; then
1486914780
OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
1487014781
OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
@@ -14881,9 +14792,6 @@ $as_echo "yes, we need AppKit" >&6; }
1488114792
$as_echo "no" >&6; }
1488214793
fi
1488314794
fi
14884-
if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
14885-
LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
14886-
fi
1488714795

1488814796
DEPEND_CFLAGS_FILTER=
1488914797
if test "$GCC" = yes; then

0 commit comments

Comments
 (0)