mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Vim: bump to 8.0.1230 (#3092)
This commit is contained in:
kenmays
fbrosson
File diff suppressed because it is too large
Load Diff
@@ -5,10 +5,10 @@ Subject: Applied patchset
|
||||
|
||||
|
||||
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
|
||||
index edc12ef..56404e5 100644
|
||||
index 759ad16..45bc6bc 100644
|
||||
--- a/runtime/doc/eval.txt
|
||||
+++ b/runtime/doc/eval.txt
|
||||
@@ -8850,12 +8850,14 @@ gui_gnome Compiled with Gnome support (gui_gtk is also defined).
|
||||
@@ -8855,12 +8855,14 @@ gui_gnome Compiled with Gnome support (gui_gtk is also defined).
|
||||
gui_gtk Compiled with GTK+ GUI (any version).
|
||||
gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined).
|
||||
gui_gtk3 Compiled with GTK+ 3 GUI (gui_gtk is also defined).
|
||||
@@ -48,7 +48,7 @@ index 2be3ced..a687a9f 100644
|
||||
|os_vms.txt| VMS
|
||||
|os_win32.txt| MS-Windows 95/98/NT
|
||||
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
|
||||
index 56697d5..5cc2dc2 100644
|
||||
index ebe9c92..1b6c82a 100644
|
||||
--- a/runtime/doc/options.txt
|
||||
+++ b/runtime/doc/options.txt
|
||||
@@ -3875,7 +3875,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
@@ -60,7 +60,7 @@ index 56697d5..5cc2dc2 100644
|
||||
*'go-f'*
|
||||
'f' Foreground: Don't use fork() to detach the GUI from the shell
|
||||
where it was started. Use this for programs that wait for the
|
||||
@@ -6257,7 +6257,12 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
@@ -6282,7 +6282,12 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
$VIM/vimfiles,
|
||||
$VIMRUNTIME,
|
||||
$VIM/vimfiles/after,
|
||||
@@ -74,7 +74,7 @@ index 56697d5..5cc2dc2 100644
|
||||
global
|
||||
{not in Vi}
|
||||
This is a list of directories which will be searched for runtime
|
||||
@@ -7715,6 +7720,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
@@ -7740,6 +7745,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
on MiNT: "vt52"
|
||||
on MS-DOS: "pcterm"
|
||||
on OS/2: "os2ansi"
|
||||
@@ -435,7 +435,7 @@ index a68ebe5..10a6b4a 100644
|
||||
" When started as "evim", evim.vim will already have done these settings.
|
||||
if v:progname =~? "evim"
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 06204bd..8a5f726 100644
|
||||
index 75e528e..dfd8643 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -1373,6 +1373,23 @@ CARBONGUI_BUNDLE = gui_bundle
|
||||
@@ -449,7 +449,7 @@ index 06204bd..8a5f726 100644
|
||||
+HAIKUGUI_IPATH =
|
||||
+HAIKUGUI_LIBS_DIR =
|
||||
+HAIKUGUI_LIBS1 = -lbe -lroot -ltracker -ltranslation
|
||||
+ifeq ($(strip $(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))), 5)
|
||||
+ifeq ($(strip $(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))), 7)
|
||||
+HAIKUGUI_LIBS1 += -lsupc++ -lstdc++
|
||||
+endif
|
||||
+HAIKUGUI_LIBS2 =
|
||||
@@ -547,7 +547,7 @@ index 06204bd..8a5f726 100644
|
||||
### Dependencies:
|
||||
objects/arabic.o: arabic.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
|
||||
diff --git a/src/configure.ac b/src/configure.ac
|
||||
index 76714b1..d7bcd38 100644
|
||||
index f465096..6921c9e 100644
|
||||
--- a/src/configure.ac
|
||||
+++ b/src/configure.ac
|
||||
@@ -118,6 +118,12 @@ case `uname` in
|
||||
@@ -660,7 +660,7 @@ index 55d2295..d031a72 100644
|
||||
"gui_mac",
|
||||
#endif
|
||||
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
|
||||
index b4351b2..2e6ce28 100644
|
||||
index 1543728..6389d0c 100644
|
||||
--- a/src/ex_cmds.c
|
||||
+++ b/src/ex_cmds.c
|
||||
@@ -14,6 +14,9 @@
|
||||
@@ -703,10 +703,10 @@ index b4351b2..2e6ce28 100644
|
||||
if (fp_in == NULL)
|
||||
{
|
||||
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
|
||||
index e2dfd92..917975d 100644
|
||||
index 036569f..0f5f3b8 100644
|
||||
--- a/src/ex_docmd.c
|
||||
+++ b/src/ex_docmd.c
|
||||
@@ -7880,6 +7880,7 @@ ex_shell(exarg_T *eap UNUSED)
|
||||
@@ -7863,6 +7863,7 @@ ex_shell(exarg_T *eap UNUSED)
|
||||
|| (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \
|
||||
|| defined(FEAT_GUI_MSWIN) \
|
||||
|| defined(FEAT_GUI_MAC) \
|
||||
@@ -6307,7 +6307,7 @@ index 0000000..414d127
|
||||
+
|
||||
+#endif
|
||||
diff --git a/src/misc1.c b/src/misc1.c
|
||||
index f7789ff..1ef3f2e 100644
|
||||
index eb893f6..27244f7 100644
|
||||
--- a/src/misc1.c
|
||||
+++ b/src/misc1.c
|
||||
@@ -14,6 +14,10 @@
|
||||
@@ -6321,7 +6321,7 @@ index f7789ff..1ef3f2e 100644
|
||||
static char_u *vim_version_dir(char_u *vimdir);
|
||||
static char_u *remove_tail(char_u *p, char_u *pend, char_u *name);
|
||||
#if defined(FEAT_CMDL_COMPL)
|
||||
@@ -4228,7 +4232,16 @@ vim_getenv(char_u *name, int *mustfree)
|
||||
@@ -4229,7 +4233,16 @@ vim_getenv(char_u *name, int *mustfree)
|
||||
|
||||
vimruntime = (STRCMP(name, "VIMRUNTIME") == 0);
|
||||
if (!vimruntime && STRCMP(name, "VIM") != 0)
|
||||
@@ -6340,10 +6340,10 @@ index f7789ff..1ef3f2e 100644
|
||||
/*
|
||||
* When expanding $VIMRUNTIME fails, try using $VIM/vim<version> or $VIM.
|
||||
diff --git a/src/normal.c b/src/normal.c
|
||||
index d78a53b..2e428d9 100644
|
||||
index e781cd7..7296795 100644
|
||||
--- a/src/normal.c
|
||||
+++ b/src/normal.c
|
||||
@@ -2656,13 +2656,14 @@ do_mouse(
|
||||
@@ -2657,13 +2657,14 @@ do_mouse(
|
||||
if (!is_click)
|
||||
return FALSE;
|
||||
#endif
|
||||
@@ -6361,7 +6361,7 @@ index d78a53b..2e428d9 100644
|
||||
{
|
||||
jump_flags = 0;
|
||||
diff --git a/src/option.h b/src/option.h
|
||||
index ecd70dc..87a50c3 100644
|
||||
index 88eadae..f71ecd5 100644
|
||||
--- a/src/option.h
|
||||
+++ b/src/option.h
|
||||
@@ -10,6 +10,8 @@
|
||||
@@ -6373,7 +6373,7 @@ index ecd70dc..87a50c3 100644
|
||||
/*
|
||||
* Default values for 'errorformat'.
|
||||
* The "%f|%l| %m" one is used for when the contents of the quickfix window is
|
||||
@@ -1181,5 +1183,7 @@ enum
|
||||
@@ -1185,5 +1187,7 @@ enum
|
||||
, WV_COUNT /* must be the last one */
|
||||
};
|
||||
|
||||
@@ -6758,7 +6758,7 @@ index 151a278..8072499 100644
|
||||
static char TtyProto[] = "/dev/tt/XY";
|
||||
# else
|
||||
diff --git a/src/screen.c b/src/screen.c
|
||||
index 3e08b60..d7a9df8 100644
|
||||
index c92b17e..45f2457 100644
|
||||
--- a/src/screen.c
|
||||
+++ b/src/screen.c
|
||||
@@ -89,6 +89,15 @@
|
||||
@@ -6862,10 +6862,10 @@ index 7b0f70c..ae9865b 100644
|
||||
/* MenuHandle id; */
|
||||
/* short index; */ /* the item index within the father menu */
|
||||
diff --git a/src/term.c b/src/term.c
|
||||
index 9925b0a..5254b71 100644
|
||||
index 4a202bb..faa5d63 100644
|
||||
--- a/src/term.c
|
||||
+++ b/src/term.c
|
||||
@@ -1354,6 +1354,11 @@ termgui_mch_get_rgb(guicolor_T color)
|
||||
@@ -1367,6 +1367,11 @@ termgui_mch_get_rgb(guicolor_T color)
|
||||
# define DEFAULT_TERM (char_u *)"beos-ansi"
|
||||
#endif
|
||||
|
||||
@@ -6891,10 +6891,10 @@ index f175e1a..caab0b5 100644
|
||||
* Translate window coordinates to buffer position without any side effects
|
||||
*/
|
||||
diff --git a/src/version.c b/src/version.c
|
||||
index 8d7a5e5..1619a41 100644
|
||||
index 6ab4e75..a5d346f 100644
|
||||
--- a/src/version.c
|
||||
+++ b/src/version.c
|
||||
@@ -3400,6 +3400,9 @@ list_version(void)
|
||||
@@ -3498,6 +3498,9 @@ list_version(void)
|
||||
MSG_PUTS(_("with X11-Athena GUI."));
|
||||
# endif
|
||||
# else
|
||||
@@ -6904,7 +6904,7 @@ index 8d7a5e5..1619a41 100644
|
||||
# ifdef FEAT_GUI_PHOTON
|
||||
MSG_PUTS(_("with Photon GUI."));
|
||||
# else
|
||||
@@ -3417,6 +3420,7 @@ list_version(void)
|
||||
@@ -3515,6 +3518,7 @@ list_version(void)
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
@@ -6913,7 +6913,7 @@ index 8d7a5e5..1619a41 100644
|
||||
# endif
|
||||
# endif
|
||||
diff --git a/src/vim.h b/src/vim.h
|
||||
index 4567c36..a194194 100644
|
||||
index ed12b07..329edb5 100644
|
||||
--- a/src/vim.h
|
||||
+++ b/src/vim.h
|
||||
@@ -115,6 +115,7 @@
|
||||
@@ -6936,7 +6936,7 @@ index 4567c36..a194194 100644
|
||||
#if (defined(UNIX) || defined(VMS)) \
|
||||
&& (!defined(MACOS_X) || defined(HAVE_CONFIG_H))
|
||||
# include "os_unix.h" /* bring lots of system header files */
|
||||
@@ -2077,6 +2083,9 @@ typedef struct VimClipboard
|
||||
@@ -2080,6 +2086,9 @@ typedef struct VimClipboard
|
||||
int_u format; /* Vim's own special clipboard format */
|
||||
int_u format_raw; /* Vim's raw text clipboard format */
|
||||
# endif
|
||||
@@ -6946,7 +6946,7 @@ index 4567c36..a194194 100644
|
||||
} VimClipboard;
|
||||
#else
|
||||
typedef int VimClipboard; /* This is required for the prototypes. */
|
||||
@@ -2117,7 +2126,7 @@ typedef enum {
|
||||
@@ -2120,7 +2129,7 @@ typedef enum {
|
||||
* been seen at that stage. But it must be before globals.h, where error_ga
|
||||
* is declared. */
|
||||
#if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \
|
||||
@@ -6957,4 +6957,3 @@ index 4567c36..a194194 100644
|
||||
# define mch_msg(str) printf("%s", (str))
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
SUMMARY="A highly configurable text editor"
|
||||
DESCRIPTION="Vim is a highly configurable text editor built to enable \
|
||||
efficient text editing. It is an improved version of the vi editor \
|
||||
distributed with most UNIX systems.
|
||||
|
||||
Vim is often called a \"programmer's editor,\" and so useful for programming \
|
||||
that many consider it an entire IDE. It's not just for programmers, though. \
|
||||
Vim is perfect for all kinds of text editing, from composing email to editing \
|
||||
configuration files.
|
||||
Despite this, Vim can be configured to work in a very simple (Notepad-like) \
|
||||
way, called evim or Easy Vim."
|
||||
HOMEPAGE="http://www.vim.org"
|
||||
COPYRIGHT="1991-2017 Bram Moleenar et al."
|
||||
LICENSE="Vim"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="5a8d2e2a79e0e7a263bd9467806c5cdccc6feeb4a79e90a633f1a1b7aa925e5e"
|
||||
SOURCE_DIR="vim-$portVersion"
|
||||
PATCHES="vim-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
vim = $portVersion
|
||||
cmd:ex = $portVersion
|
||||
cmd:gview = $portVersion
|
||||
cmd:gvim = $portVersion
|
||||
cmd:gvimdiff = $portVersion
|
||||
cmd:rgview = $portVersion
|
||||
cmd:rgvim = $portVersion
|
||||
cmd:rview = $portVersion
|
||||
cmd:rvim = $portVersion
|
||||
cmd:vi = $portVersion
|
||||
cmd:view = $portVersion
|
||||
cmd:vim = $portVersion
|
||||
cmd:vimdiff = $portVersion
|
||||
cmd:vimtutor = $portVersion
|
||||
cmd:xxd = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libncurses
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
# devel:liblua
|
||||
devel:libncurses
|
||||
devel:libruby
|
||||
devel:libtclstub8.5
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:grep
|
||||
cmd:make
|
||||
# cmd:perl
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python2
|
||||
# cmd:python3
|
||||
cmd:ruby
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
|
||||
# Global ----------------------------------------
|
||||
|
||||
cd src
|
||||
autoconf
|
||||
|
||||
export CFLAGS="\
|
||||
`pkg-config --cflags python2` \
|
||||
-fPIC"
|
||||
|
||||
# CLI -------------------------------------------
|
||||
|
||||
runConfigure ./configure \
|
||||
--disable-gui \
|
||||
--with-features=big \
|
||||
--enable-cscope \
|
||||
--enable-multibyte \
|
||||
--enable-pythoninterp=dynamic \
|
||||
--enable-rubyinterp=dynamic \
|
||||
--enable-tclinterp=dynamic \
|
||||
--with-compiledby=Haikuports
|
||||
# --enable-luainterp=dynamic
|
||||
# --enable-python3interp=dynamic currently broken
|
||||
# --enable-perlinterp=dynamic not dynamic yet
|
||||
|
||||
|
||||
make $jobArgs
|
||||
cp vim vim.con # preserve gui-less executable
|
||||
rm objects/*.o
|
||||
|
||||
# GUI -------------------------------------------
|
||||
|
||||
MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
sed -i "s|@MAJOR@|$MAJOR|" os_haiku.rdef
|
||||
sed -i "s|@MIDDLE@|$MIDDLE|" os_haiku.rdef
|
||||
sed -i "s|@MINOR@|$MINOR|" os_haiku.rdef
|
||||
|
||||
runConfigure ./configure \
|
||||
--with-features=big \
|
||||
--enable-cscope \
|
||||
--enable-multibyte \
|
||||
--enable-pythoninterp=dynamic \
|
||||
--enable-rubyinterp=dynamic \
|
||||
--enable-tclinterp==dynamic \
|
||||
--with-compiledby=Haikuports
|
||||
# --enable-luainterp=dynamic
|
||||
# --enable-python3interp=dynamic currently broken
|
||||
# --enable-perlinterp=dynamic not dynamic yet
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# Make arrow keys, backspace, delete, etc behave as expected.
|
||||
echo "set nocompatible" > $dataDir/vim/vimrc
|
||||
|
||||
# Workaround to get the themes and plugins work
|
||||
echo "set runtimepath+=`finddir B_USER_SETTINGS_DIRECTORY`/vim" > $dataDir/vim/vimrc
|
||||
|
||||
ln -s vim $binDir/vi
|
||||
|
||||
addAppDeskbarSymlink $binDir/gvim Vim
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd src
|
||||
make check
|
||||
}
|
||||
@@ -9,13 +9,13 @@ Vim is perfect for all kinds of text editing, from composing email to editing \
|
||||
configuration files.
|
||||
Despite this, Vim can be configured to work in a very simple (Notepad-like) \
|
||||
way, called evim or Easy Vim."
|
||||
HOMEPAGE="http://www.vim.org"
|
||||
HOMEPAGE="https://www.vim.org/"
|
||||
COPYRIGHT="1991-2017 Bram Moleenar et al."
|
||||
LICENSE="Vim"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="1485524d747b2046b9e1ea3bfcf80148e6a9a65e29d972d23cf88152ad9dcca2"
|
||||
SOURCE_DIR="vim-$portVersion"
|
||||
CHECKSUM_SHA256="943cee58fb8aee1803decdca4fb4c9b3b96ce15eac36b84a03c570921e65715e"
|
||||
SOURCE_FILENAME="vim-$portVersion.tar.gz"
|
||||
PATCHES="vim-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
|
||||
@@ -134,11 +134,10 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# Make arrow keys, backspace, delete, etc behave as expected.
|
||||
echo "set nocompatible" > $dataDir/vim/vimrc
|
||||
|
||||
# Workaround to get the themes and plugins work
|
||||
echo "set runtimepath+=`finddir B_USER_SETTINGS_DIRECTORY`/vim" > $dataDir/vim/vimrc
|
||||
cat << EOF > $dataDir/vim/vimrc
|
||||
" Workaround to get the themes and plugins work
|
||||
execute "set runtimepath+=" . substitute(system("finddir B_USER_SETTINGS_DIRECTORY"), '\n\+$', '', '') . "/vim"
|
||||
EOF
|
||||
|
||||
ln -s vim $binDir/vi
|
||||
|
||||
Reference in New Issue
Block a user