From c745bcaf794e855d20a764cf0b17d2f8b1ff046c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Mon, 29 Aug 2022 16:24:30 +0200 Subject: groups/231.native_packages_etc.group: vim: bump to v9.0.0234 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/231.native_packages_etc.group | 7 +- patches/vim-9.0.0037.local.patch | 12 --- patches/vim-9.0.0037_pre.local.patch | 135 --------------------------- patches/vim-9.0.0234.local.patch | 12 +++ patches/vim-9.0.0234_pre.local.patch | 40 ++++++++ patches/vim_minipix-9.0.0037.local.patch | 1 - patches/vim_minipix-9.0.0037_pre.local.patch | 1 - patches/vim_minipix-9.0.0234.local.patch | 1 + patches/vim_minipix-9.0.0234_pre.local.patch | 1 + 9 files changed, 58 insertions(+), 152 deletions(-) delete mode 100644 patches/vim-9.0.0037.local.patch delete mode 100644 patches/vim-9.0.0037_pre.local.patch create mode 100644 patches/vim-9.0.0234.local.patch create mode 100644 patches/vim-9.0.0234_pre.local.patch delete mode 120000 patches/vim_minipix-9.0.0037.local.patch delete mode 120000 patches/vim_minipix-9.0.0037_pre.local.patch create mode 120000 patches/vim_minipix-9.0.0234.local.patch create mode 120000 patches/vim_minipix-9.0.0234_pre.local.patch diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 19b05ee5..a96df99f 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -498,8 +498,8 @@ 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:=34a81534fcdd8f507795df39123d90892af11d2d0543b9fc9dd206823e910ec4}; -: ${PKG_VIM_VERSION:=9.0.0037}; +: ${PKG_VIM_SHA256SUM:=cbcf24ded38b7b49734911ed7a1b9d7fed75682d1c14068814117855411f7abb}; +: ${PKG_VIM_VERSION:=9.0.0234}; : ${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}; @@ -512,7 +512,8 @@ 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"}; +vim_cv_memmove_handles_overlap=yes +vim_cv_timer_create=yes"}; : ${PKG_VORBIS_TOOLS_DEPENDS:="curl libflac libogg libvorbis"}; : ${PKG_VORBIS_TOOLS_SHA256SUM:=db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0}; : ${PKG_VORBIS_TOOLS_VERSION:=1.4.2}; diff --git a/patches/vim-9.0.0037.local.patch b/patches/vim-9.0.0037.local.patch deleted file mode 100644 index f91e2645..00000000 --- a/patches/vim-9.0.0037.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.0037_pre.local.patch b/patches/vim-9.0.0037_pre.local.patch deleted file mode 100644 index 11ef8745..00000000 --- a/patches/vim-9.0.0037_pre.local.patch +++ /dev/null @@ -1,135 +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. -@@ -13037,93 +13039,7 @@ - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create" >&5 --$as_echo_n "checking for timer_create... " >&6; } --save_LIBS="$LIBS" --LIBS="$LIBS -lrt" --if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --#include --static void set_flag(union sigval sv) {} -- --int --main () --{ -- -- struct timespec ts; -- struct sigevent action = {0}; -- timer_t timer_id; -- -- action.sigev_notify = SIGEV_THREAD; -- action.sigev_notify_function = set_flag; -- if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) -- exit(1); // cannot create a monotonic timer -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; with -lrt" >&5 --$as_echo "yes; with -lrt" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h -- --else -- LIBS="$save_LIBS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --#include --static void set_flag(union sigval sv) {} -- --int --main () --{ -- -- struct timespec ts; -- struct sigevent action = {0}; -- timer_t timer_id; -- -- action.sigev_notify = SIGEV_THREAD; -- action.sigev_notify_function = set_flag; -- if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) -- exit(1); // cannot create a monotonic timer -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5 - $as_echo_n "checking whether stat() ignores a trailing slash... " >&6; } -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.0234.local.patch b/patches/vim-9.0.0234.local.patch new file mode 100644 index 00000000..f91e2645 --- /dev/null +++ b/patches/vim-9.0.0234.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.0234_pre.local.patch b/patches/vim-9.0.0234_pre.local.patch new file mode 100644 index 00000000..5913b9f7 --- /dev/null +++ b/patches/vim-9.0.0234_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_minipix-9.0.0037.local.patch b/patches/vim_minipix-9.0.0037.local.patch deleted file mode 120000 index afa62c5b..00000000 --- a/patches/vim_minipix-9.0.0037.local.patch +++ /dev/null @@ -1 +0,0 @@ -vim-9.0.0037.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.0037_pre.local.patch b/patches/vim_minipix-9.0.0037_pre.local.patch deleted file mode 120000 index 387166e5..00000000 --- a/patches/vim_minipix-9.0.0037_pre.local.patch +++ /dev/null @@ -1 +0,0 @@ -vim-9.0.0037_pre.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.0234.local.patch b/patches/vim_minipix-9.0.0234.local.patch new file mode 120000 index 00000000..a30c1198 --- /dev/null +++ b/patches/vim_minipix-9.0.0234.local.patch @@ -0,0 +1 @@ +vim-9.0.0234.local.patch \ No newline at end of file diff --git a/patches/vim_minipix-9.0.0234_pre.local.patch b/patches/vim_minipix-9.0.0234_pre.local.patch new file mode 120000 index 00000000..90ea08f5 --- /dev/null +++ b/patches/vim_minipix-9.0.0234_pre.local.patch @@ -0,0 +1 @@ +vim-9.0.0234_pre.local.patch \ No newline at end of file -- cgit v1.2.3