summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2023-01-02 12:04:07 +0100
committerØrjan Malde <red@foxi.me>2023-01-02 12:04:07 +0100
commit33d90b667f6f020f60d68e5990ba90fee111b26d (patch)
treebfd25fa78e163a0699a3e3fe0848b90741557274
parent2b4e3fa46b57dd6731ac0b483fcdc1cc9f08b30a (diff)
downloadmidipix_build-33d90b667f6f020f60d68e5990ba90fee111b26d.tar.bz2
midipix_build-33d90b667f6f020f60d68e5990ba90fee111b26d.tar.xz
groups/231.native_packages_etc.group: vim: bump to v9.0.1128
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups/231.native_packages_etc.group6
-rw-r--r--patches/vim-9.0.1128.local.patch (renamed from patches/vim-9.0.0828.local.patch)0
-rw-r--r--patches/vim-9.0.1128_pre.local.patch (renamed from patches/vim-9.0.0828_pre.local.patch)0
-rw-r--r--patches/vim/no-timers.patch11
l---------patches/vim_minipix-9.0.0828.local.patch1
l---------patches/vim_minipix-9.0.0828_pre.local.patch1
l---------patches/vim_minipix-9.0.1128.local.patch1
l---------patches/vim_minipix-9.0.1128_pre.local.patch1
8 files changed, 11 insertions, 10 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 2780e38b..c7984af4 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.1128.local.patch
index f91e2645..f91e2645 100644
--- a/patches/vim-9.0.0828.local.patch
+++ b/patches/vim-9.0.1128.local.patch
diff --git a/patches/vim-9.0.0828_pre.local.patch b/patches/vim-9.0.1128_pre.local.patch
index 5913b9f7..5913b9f7 100644
--- a/patches/vim-9.0.0828_pre.local.patch
+++ b/patches/vim-9.0.1128_pre.local.patch
diff --git a/patches/vim/no-timers.patch b/patches/vim/no-timers.patch
index a51ebd85..b06c9b4b 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 713c3ca0..00000000
--- 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 2a50d763..00000000
--- 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 00000000..2ce74273
--- /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 00000000..5e150a04
--- /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