diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 13 | ||||
| -rw-r--r-- | patches/vim-7.4.1952.local.patch | 56 | ||||
| -rw-r--r-- | patches/vim-8.2.4230.local.patch | 12 | ||||
| -rw-r--r-- | patches/vim-8.2.4230_pre.local.patch | 40 |
4 files changed, 62 insertions, 59 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 49c91e8e..2dc83a44 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -498,14 +498,21 @@ ac_cv_lib_rt_timer_create=no ac_cv_search_timer_create=no ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"}; : ${PKG_VIM_DEPENDS:="ncursesw"}; -: ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67}; -: ${PKG_VIM_VERSION:=7.4.1952}; +: ${PKG_VIM_SHA256SUM:=96f3653cd4e3d1f8519146b394c8780a855c440f7342745da2c69b793746fa91}; +: ${PKG_VIM_VERSION:=8.2.4230}; : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz}; -: ${PKG_VIM_CONFIGURE_ARGS_EXTRA:="--enable-gui=no --with-tlib=tinfow --without-x"}; +: ${PKG_VIM_CONFIGURE_ARGS_EXTRA:="--enable-gui=no --with-tlib=tinfow --without-x --disable-canberra --disable-libsodium --disable-motif-check --disable-sysmouse --disable-gpm"}; : ${PKG_VIM_IN_TREE:=1}; : ${PKG_VIM_INSTALL_FILES_V2:="@vim=bin/vi"}; : ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true}; : ${PKG_VIM_SUBDIR:=vim-${PKG_VIM_VERSION}}; +: ${PKG_VIM_CONFIG_CACHE_EXTRA:=" +vim_cv_tgetent=zero +vim_cv_toupper_broken=no +vim_cv_terminfo=yes +vim_cv_getcwd_broken=no +vim_cv_stat_ignores_slash=yes +vim_cv_memmove_handles_overlap=yes"}; : ${PKG_VORBIS_TOOLS_DEPENDS:="curl libflac libogg libvorbis"}; : ${PKG_VORBIS_TOOLS_SHA256SUM:=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc}; : ${PKG_VORBIS_TOOLS_VERSION:=1.4.0}; diff --git a/patches/vim-7.4.1952.local.patch b/patches/vim-7.4.1952.local.patch deleted file mode 100644 index 178e0fc5..00000000 --- a/patches/vim-7.4.1952.local.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- vim-7.4.1952/src/osdef2.h.in.orig 2016-06-21 23:42:20.000000000 +0200 -+++ vim-7.4.1952/src/osdef2.h.in 2016-09-06 18:33:43.655518796 +0200 -@@ -92,5 +92,5 @@ - extern int _Xmblen(char const *, size_t); - #else - /* This is different from the header but matches mblen() */ --extern int _Xmblen(char *, size_t); -+extern int _Xmblen(char *, int); - #endif ---- vim-7.4.1952/src/Makefile.orig 2016-06-21 23:42:20.000000000 +0200 -+++ vim-7.4.1952/src/Makefile 2016-09-07 06:29:14.483862359 +0200 -@@ -2692,7 +2692,7 @@ - $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ - - auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in -- CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh -+ CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh - - auto/pathdef.c: Makefile auto/config.mk - -@echo creating $@ ---- vim-7.4.1952/src/auto/configure.orig 2016-06-21 23:42:20.000000000 +0200 -+++ vim-7.4.1952/src/auto/configure 2016-09-16 16:37:28.147266000 +0200 -@@ -2603,7 +2603,7 @@ - ## -------------------- ## - - ac_ext=c --ac_cpp='$CPP $CPPFLAGS' -+ac_cpp='$CPP $CFLAGS $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu -@@ -7607,6 +7607,7 @@ - - # Standard set of common directories for X headers. - # Check X11 before X11Rn because it is often a symlink to the current release. -+if test -z "$ac_x_header_dirs"; then - ac_x_header_dirs=' - /usr/X11/include - /usr/X11R7/include -@@ -7645,6 +7646,7 @@ - - /usr/openwin/include - /usr/openwin/share/include' -+fi - - if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. -@@ -9488,7 +9490,7 @@ - - - -- -+SKIP_MOTIF=YES - if test -z "$SKIP_MOTIF"; then - gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" - GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" diff --git a/patches/vim-8.2.4230.local.patch b/patches/vim-8.2.4230.local.patch new file mode 100644 index 00000000..f91e2645 --- /dev/null +++ b/patches/vim-8.2.4230.local.patch @@ -0,0 +1,12 @@ +diff -ru vim-8.2.4230.orig/src/libvterm/src/vterm_internal.h vim-8.2.4230/src/libvterm/src/vterm_internal.h +--- vim-8.2.4230.orig/src/libvterm/src/vterm_internal.h 2022-01-27 16:04:22.000000000 +0100 ++++ vim-8.2.4230/src/libvterm/src/vterm_internal.h 2022-01-27 17:07:13.522370456 +0100 +@@ -5,7 +5,7 @@ + + #include <stdarg.h> + +-#if defined(__GNUC__) && !defined(__MINGW32__) ++#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__midipix__) + # define INTERNAL __attribute__((visibility("internal"))) + # define UNUSED __attribute__((unused)) + #else diff --git a/patches/vim-8.2.4230_pre.local.patch b/patches/vim-8.2.4230_pre.local.patch new file mode 100644 index 00000000..5913b9f7 --- /dev/null +++ b/patches/vim-8.2.4230_pre.local.patch @@ -0,0 +1,40 @@ +diff -ru vim-8.2.4230.orig/src/auto/configure vim-8.2.4230/src/auto/configure +--- vim-8.2.4230.orig/src/auto/configure 2022-01-27 16:04:22.000000000 +0100 ++++ vim-8.2.4230/src/auto/configure 2022-01-27 17:15:07.217234738 +0100 +@@ -3772,7 +3772,7 @@ + fi + + ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' ++ac_cpp='$CPP $CFLAGS $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -8343,6 +8343,7 @@ + + # Standard set of common directories for X headers. + # Check X11 before X11Rn because it is often a symlink to the current release. ++if test -z "$ac_x_header_dirs"; then + ac_x_header_dirs=' + /usr/X11/include + /usr/X11R7/include +@@ -8381,6 +8382,7 @@ + + /usr/openwin/include + /usr/openwin/share/include' ++fi + + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. +diff -ru vim-8.2.4230.orig/src/Makefile vim-8.2.4230/src/Makefile +--- vim-8.2.4230.orig/src/Makefile 2022-01-27 16:04:22.000000000 +0100 ++++ vim-8.2.4230/src/Makefile 2022-01-27 17:13:59.313233849 +0100 +@@ -3093,7 +3093,7 @@ + $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ + + auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in +- CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh ++ CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh + + auto/os_haiku.rdef: os_haiku.rdef.in + @echo creating $@ |