From 5c6ee8937d88e25534e9b3f60b81295bd5ad01ac Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 28 Jun 2023 10:55:02 +0800 Subject: [PATCH] add sw Signed-off-by: wxiat --- vim.spec | 8 ++++++-- vim80-sw.patch | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 vim80-sw.patch diff --git a/vim.spec b/vim.spec index 334b512..4dc0a5b 100644 --- a/vim.spec +++ b/vim.spec @@ -25,7 +25,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 19%{anolis_release}%{?dist}.4 +Release: 19%{anolis_release}%{?dist}.5 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -118,6 +118,7 @@ Patch3040: 0001-patch-8.2.5037-cursor-position-may-be-invalid-after-.patch # backport patch to fix build error with ruby Patch10000: 0001-vim-anolis-build-with-ruby26.patch # End +Patch10001: vim80-sw.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -337,7 +338,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3040 -p1 -b .cve1927 %patch10000 -p1 - +%patch10001 -p1 %build %if 0%{?rhel} > 7 export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 @@ -855,6 +856,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri May 12 2023 wxiat - 2:8.0.1763-19.0.1.5 +- add sw patch + * Mon Aug 08 2022 Mahailiang - 2:8.0.1763-19.0.1.4 - Rebrand to Anolis(Xiaoxuan Yang) - Fix build issue with ruby(Liwei Ge) diff --git a/vim80-sw.patch b/vim80-sw.patch new file mode 100644 index 0000000..a440eac --- /dev/null +++ b/vim80-sw.patch @@ -0,0 +1,24 @@ +diff -Naur vim80.org/runtime/syntax/debcontrol.vim vim80.sw/runtime/syntax/debcontrol.vim +--- vim80.org/runtime/syntax/debcontrol.vim 2018-02-12 16:55:41.000000000 +0800 ++++ vim80.sw/runtime/syntax/debcontrol.vim 2023-05-12 14:59:37.859109283 +0800 +@@ -31,7 +31,7 @@ + \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa' + \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips' + \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 's390x', 's390', 'sh3eb' +- \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32' ++ \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32', 'sw_64' + \ ] + let s:pairs = [ + \ 'hurd-i386', 'kfreebsd-i386', 'kfreebsd-amd64', 'knetbsd-i386' +diff -Naur vim80.org/src/osdef1.h.in vim80.sw/src/osdef1.h.in +--- vim80.org/src/osdef1.h.in 2016-12-02 16:39:09.000000000 +0800 ++++ vim80.sw/src/osdef1.h.in 2023-05-12 15:02:42.527581672 +0800 +@@ -130,7 +130,7 @@ + #else + extern char *getwd(char *); + #endif +-#ifndef __alpha /* suggested by Campbell */ ++#if !defined __alpha && !defined __sw_64 /* suggested by Campbell */ + extern int ioctl(int, int, ...); + #endif + extern int chmod(const char *, mode_t); -- Gitee