From 33d90b667f6f020f60d68e5990ba90fee111b26d Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Jan 02 2023 11:04:07 +0000 Subject: groups/231.native_packages_etc.group: vim: bump to v9.0.1128 Signed-off-by: Ørjan Malde --- diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 2780e38..c7984af 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -498,9 +498,9 @@ ac_cv_func_timer_create=no 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:=51931a951e45dda11a69d3c59639898193ed9b1c7809060eb9eeb487c463d7a8}; -: ${PKG_VIM_VERSION:=9.0.0828}; +: ${PKG_VIM_DEPENDS:="ncursesw libiconv"}; +: ${PKG_VIM_SHA256SUM:=754d3c240b9f9ab5b37eb407cd2533e02c90bc6f23ac3c74c420256ba7220129}; +: ${PKG_VIM_VERSION:=9.0.1128}; : ${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 --disable-canberra --disable-libsodium --disable-motif-check --disable-sysmouse --disable-gpm"}; : ${PKG_VIM_IN_TREE:=1}; diff --git a/patches/vim-9.0.0828.local.patch b/patches/vim-9.0.0828.local.patch deleted file mode 100644 index f91e264..0000000 --- a/patches/vim-9.0.0828.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - --#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-9.0.0828_pre.local.patch b/patches/vim-9.0.0828_pre.local.patch deleted file mode 100644 index 5913b9f..0000000 --- a/patches/vim-9.0.0828_pre.local.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 $@ diff --git a/patches/vim-9.0.1128.local.patch b/patches/vim-9.0.1128.local.patch new file mode 100644 index 0000000..f91e264 --- /dev/null +++ b/patches/vim-9.0.1128.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 + +-#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-9.0.1128_pre.local.patch b/patches/vim-9.0.1128_pre.local.patch new file mode 100644 index 0000000..5913b9f --- /dev/null +++ b/patches/vim-9.0.1128_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 $@ diff --git a/patches/vim/no-timers.patch b/patches/vim/no-timers.patch index a51ebd8..b06c9b4 100644 --- a/patches/vim/no-timers.patch +++ b/patches/vim/no-timers.patch @@ -1,14 +1,15 @@ -diff -ru vim-9.0.0234.orig/src/feature.h vim-9.0.0234/src/feature.h ---- vim-9.0.0234.orig/src/feature.h 2022-08-21 11:40:07.000000000 +0200 -+++ vim-9.0.0234/src/feature.h 2022-10-08 01:45:47.482619953 +0200 -@@ -288,12 +288,14 @@ +diff -ru vim-9.0.1128.orig/src/feature.h vim-9.0.1128/src/feature.h +--- vim-9.0.1128.orig/src/feature.h 2023-01-01 21:31:30.000000000 +0100 ++++ vim-9.0.1128/src/feature.h 2023-01-02 11:59:16.584845483 +0100 +@@ -270,6 +270,7 @@ /* * +reltime reltime() function */ +#ifndef __midipix__ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ - && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ + && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \ +@@ -277,6 +278,7 @@ || defined(MSWIN)) # define FEAT_RELTIME #endif diff --git a/patches/vim_minipix-9.0.0828.local.patch b/patches/vim_minipix-9.0.0828.local.patch deleted file mode 120000 index 713c3ca..0000000 --- a/patches/vim_minipix-9.0.0828.local.patch +++ /dev/null @@ -1 +0,0 @@ -vim-9.0.0828.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.0828_pre.local.patch b/patches/vim_minipix-9.0.0828_pre.local.patch deleted file mode 120000 index 2a50d76..0000000 --- a/patches/vim_minipix-9.0.0828_pre.local.patch +++ /dev/null @@ -1 +0,0 @@ -vim-9.0.0828_pre.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.1128.local.patch b/patches/vim_minipix-9.0.1128.local.patch new file mode 120000 index 0000000..2ce7427 --- /dev/null +++ b/patches/vim_minipix-9.0.1128.local.patch @@ -0,0 +1 @@ +vim-9.0.1128.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.1128_pre.local.patch b/patches/vim_minipix-9.0.1128_pre.local.patch new file mode 120000 index 0000000..5e150a0 --- /dev/null +++ b/patches/vim_minipix-9.0.1128_pre.local.patch @@ -0,0 +1 @@ +vim-9.0.1128_pre.local.patch \ No newline at end of file