diff --git a/no-common.patch b/no-common.patch new file mode 100644 index 0000000..e07f34d --- /dev/null +++ b/no-common.patch @@ -0,0 +1,13 @@ +Index: vim-8.2.0348/src/globals.h +=================================================================== +--- vim-8.2.0348.orig/src/globals.h ++++ vim-8.2.0348/src/globals.h +@@ -1242,7 +1242,7 @@ extern char *Version; + #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC) + extern char longVersion[]; + #else +-EXTERN char *longVersion; ++extern char *longVersion; + #endif + + /* diff --git a/vim.changes b/vim.changes index 666b714..b9f3d2a 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 27 08:24:14 UTC 2020 - Ismail Dönmez + +- Add no-common.patch to make longVersion extern in all cases, + fixes build with gcc10 bsc#1160418 + ------------------------------------------------------------------- Sun Mar 15 20:19:21 UTC 2020 - Christian Boltz diff --git a/vim.spec b/vim.spec index 5d3727e..ab62d90 100644 --- a/vim.spec +++ b/vim.spec @@ -69,6 +69,7 @@ Patch100: vim73-no-static-libpython.patch Patch101: vim-8.0.1568-defaults.patch # https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test Patch102: vim-8.1.0297-dump3.patch +Patch103: no-common.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -175,6 +176,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests