groups/231.native_packages_etc.group: vim: bump to v9.0.1300

Signed-off-by: Ørjan Malde <red@foxi.me>

6 files changed, 15 insertions, 16 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 3bda262b..20995b98 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -494,8 +494,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 libiconv"};
-: ${PKG_VIM_SHA256SUM:=754d3c240b9f9ab5b37eb407cd2533e02c90bc6f23ac3c74c420256ba7220129};
-: ${PKG_VIM_VERSION:=9.0.1128};
+: ${PKG_VIM_SHA256SUM:=3ddec0c67ac5a8bc905a5bc2cd2d9272ddbeddf57ed0964c1f1c489f3c80c4f5};
+: ${PKG_VIM_VERSION:=9.0.1300};
 : ${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.1128.local.patch b/patches/vim-9.0.1128.local.patch
deleted file mode 100644
index f91e2645..00000000
--- a/patches/vim-9.0.1128.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 <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-9.0.1128_pre.local.patch b/patches/vim-9.0.1300_pre.local.patch
index 5913b9f7..d3a4eca7 100644
--- a/patches/vim-9.0.1128_pre.local.patch
+++ b/patches/vim-9.0.1300_pre.local.patch
@@ -1,3 +1,15 @@
+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 -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
diff --git a/patches/vim_minipix-9.0.1128.local.patch b/patches/vim_minipix-9.0.1128.local.patch
deleted file mode 120000
index 2ce74273..00000000
--- a/patches/vim_minipix-9.0.1128.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 120000
index 5e150a04..00000000
--- a/patches/vim_minipix-9.0.1128_pre.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-vim-9.0.1128_pre.local.patch
\ No newline at end of file
diff --git a/patches/vim_minipix-9.0.1300_pre.local.patch b/patches/vim_minipix-9.0.1300_pre.local.patch
new file mode 120000
index 00000000..c4a0f18d
--- /dev/null
+++ b/patches/vim_minipix-9.0.1300_pre.local.patch
@@ -0,0 +1 @@
+vim-9.0.1300_pre.local.patch
\ No newline at end of file