7 files changed, 137 insertions, 42 deletions
diff --git a/patches/vim-8.2.5062_pre.local.patch b/patches/vim-8.2.5062_pre.local.patch
deleted file mode 100644
index 5913b9f7..00000000
--- a/patches/vim-8.2.5062_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-8.2.5062.local.patch b/patches/vim-9.0.0037.local.patch
index f91e2645..f91e2645 100644
--- a/patches/vim-8.2.5062.local.patch
+++ b/patches/vim-9.0.0037.local.patch
diff --git a/patches/vim-9.0.0037_pre.local.patch b/patches/vim-9.0.0037_pre.local.patch
new file mode 100644
index 00000000..11ef8745
--- /dev/null
+++ b/patches/vim-9.0.0037_pre.local.patch
@@ -0,0 +1,135 @@
+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<signal.h>
+-#include<time.h>
+-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<signal.h>
+-#include<time.h>
+-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_minipix-8.2.5062.local.patch b/patches/vim_minipix-8.2.5062.local.patch
deleted file mode 120000
index 3d9596c2..00000000
--- a/patches/vim_minipix-8.2.5062.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-vim-8.2.5062.local.patch
-\ No newline at end of file
diff --git a/patches/vim_minipix-8.2.5062_pre.local.patch b/patches/vim_minipix-8.2.5062_pre.local.patch
deleted file mode 120000
index 7676a047..00000000
--- a/patches/vim_minipix-8.2.5062_pre.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-vim-8.2.5062_pre.local.patch
-\ No newline at end of file
diff --git a/patches/vim_minipix-9.0.0037.local.patch b/patches/vim_minipix-9.0.0037.local.patch
new file mode 120000
index 00000000..afa62c5b
--- /dev/null
+++ b/patches/vim_minipix-9.0.0037.local.patch
@@ -0,0 +1 @@
+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
new file mode 120000
index 00000000..387166e5
--- /dev/null
+++ b/patches/vim_minipix-9.0.0037_pre.local.patch
@@ -0,0 +1 @@
+vim-9.0.0037_pre.local.patch
+\ No newline at end of file