From 31de23c80378f24edd4b7cbfa2552475169fcf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 7 Apr 2023 14:27:01 +0200
Subject: groups.d/231.native_packages_etc.group: vim: bump to v9.0.1440
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Ørjan Malde <red@foxi.me>
---
groups.d/231.native_packages_etc.group | 4 +--
patches/vim-9.0.1300_pre.local.patch | 52 ----------------------------------
patches/vim-9.0.1440_pre.local.patch | 52 ++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 54 deletions(-)
delete mode 100644 patches/vim-9.0.1300_pre.local.patch
create mode 100644 patches/vim-9.0.1440_pre.local.patch
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 9a8adea8..347a4e8f 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -490,8 +490,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:=3ddec0c67ac5a8bc905a5bc2cd2d9272ddbeddf57ed0964c1f1c489f3c80c4f5};
-: ${PKG_VIM_VERSION:=9.0.1300};
+: ${PKG_VIM_SHA256SUM:=ca218ffd666583f1aca657c2673a60c96a487c6e9ea4c276657e233b6cad3200};
+: ${PKG_VIM_VERSION:=9.0.1440};
: ${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.1300_pre.local.patch b/patches/vim-9.0.1300_pre.local.patch
deleted file mode 100644
index d3a4eca7..00000000
--- a/patches/vim-9.0.1300_pre.local.patch
+++ /dev/null
@@ -1,52 +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 -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.1440_pre.local.patch b/patches/vim-9.0.1440_pre.local.patch
new file mode 100644
index 00000000..d3a4eca7
--- /dev/null
+++ b/patches/vim-9.0.1440_pre.local.patch
@@ -0,0 +1,52 @@
+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
+@@ -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 $@
--
cgit v1.2.3