From 0965a334c296af7e7a3644281ff3fce7dafb662e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Jan 2026 11:18:56 +0100 Subject: [PATCH] patchlevel 2114 added Swedish translation --- sources | 2 +- vim-9.1-copy-paste.patch | 281 +++++++++++++++++++++++++++++++++++ vim-test-port-mismatch.patch | 36 +++++ vim.spec | 29 +++- 4 files changed, 344 insertions(+), 4 deletions(-) create mode 100644 vim-9.1-copy-paste.patch create mode 100644 vim-test-port-mismatch.patch diff --git a/sources b/sources index a45db60a..7fa82d30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-2086.tar.bz2) = f8eb77f913699a465f4a020425f64a83c2ccaab72610ed6e02c6d7d9c5af483774849b01d674a36335be0be54cba5880b96d423d268ff55ad3846a88575dcbf3 +SHA512 (vim-9.1-2114.tar.bz2) = 7ef6964cd35130512f52459467bbee86a2afcce9dd1d95cea3a5efa02b856493b231f3df4c592ba554e2312553b1eaa5756ad0087eae1456892cace00cb617da diff --git a/vim-9.1-copy-paste.patch b/vim-9.1-copy-paste.patch new file mode 100644 index 00000000..ceb644a4 --- /dev/null +++ b/vim-9.1-copy-paste.patch @@ -0,0 +1,281 @@ +diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim +index b4d11ac..8a56110 100644 +--- a/src/testdir/test_cmdline.vim ++++ b/src/testdir/test_cmdline.vim +@@ -2057,6 +2057,7 @@ func Test_cmdlineclear_tabenter() + CheckScreendump + + let lines =<< trim [SCRIPT] ++ set mouse=a + call setline(1, range(30)) + [SCRIPT] + +diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim +index 7e93ea3..64ada23 100644 +--- a/src/testdir/test_diffmode.vim ++++ b/src/testdir/test_diffmode.vim +@@ -2213,6 +2214,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + func DiffExprStub() + let txt_in = readfile(v:fname_in) + let txt_new = readfile(v:fname_new) +@@ -2228,7 +2230,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged() + call writefile(lines, 'XdiffSetup', 'D') + + call WriteDiffFiles(0, [], []) +- let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {}) ++ let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2 -c ":set mouse=a"', {}) + call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") + + call WriteDiffFiles(buf, ["a", "b"], ["x", "x"]) +@@ -2470,7 +2472,7 @@ func Test_diff_inline() + CheckScreendump + + call WriteDiffFiles(0, [], []) +- let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {}) ++ let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 -c ":set mouse=a"', {}) + call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") + + call WriteDiffFiles(buf, ["abcdef ghi jk n", "x", "y"], ["aBcef gHi lm n", "y", "z"]) +@@ -2899,7 +2901,7 @@ func Test_linematch_diff_iwhite() + call delete('.Xdifile2.swp') + call WriteDiffFiles(0, [], []) + let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {}) +- call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") ++ call term_sendkeys(buf, ":set autoread\:set mouse=a\\w:set autoread\:set mouse=a\\w") + + " setup a diff with 2 files and set linematch:30, with ignore white + call term_sendkeys(buf, ":set diffopt=internal,filler,linematch:30\") +@@ -2925,7 +2927,7 @@ func Test_linematch_diff_grouping() + call delete('.Xdifile1.swp') + call delete('.Xdifile2.swp') + call WriteDiffFiles(0, [], []) +- let buf = RunVimInTerminal('-d Xdifile1 Xdifile2', {}) ++ let buf = RunVimInTerminal('-d Xdifile1 Xdifile2 -c ":set mouse=a"', {}) + call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") + + " a diff that would result in multiple groups before grouping optimization +diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim +index 37553e6..6e9103c 100644 +--- a/src/testdir/test_ins_complete.vim ++++ b/src/testdir/test_ins_complete.vim +@@ -883,6 +883,7 @@ func Test_pum_with_folds_two_tabs() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set fdm=marker + call setline(1, ['" x {{{1', '" a some text']) + call setline(3, range(&lines)->map({_, val -> '" a' .. val})) +@@ -6045,6 +6046,7 @@ endfunc + func Test_fuzzy_select_item_when_acl() + CheckScreendump + let lines =<< trim [SCRIPT] ++ set mouse=a + call setline(1, ["v", "vi", "vim"]) + set autocomplete completeopt=menuone,noinsert,fuzzy autocompletedelay=300 + [SCRIPT] +diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim +index 0942fe2..baa5e4f 100644 +--- a/src/testdir/test_messages.vim ++++ b/src/testdir/test_messages.vim +@@ -617,6 +617,7 @@ func Test_echowindow() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + call setline(1, 'some text') + func ShowMessage(arg) + echowindow a:arg +diff --git a/src/testdir/test_plugin_termdebug.vim b/src/testdir/test_plugin_termdebug.vim +index 1f6fd36..5decd00 100644 +--- a/src/testdir/test_plugin_termdebug.vim ++++ b/src/testdir/test_plugin_termdebug.vim +@@ -333,6 +333,7 @@ func Test_termdebug_evaluate_in_popup() + call system($'{g:GCC} -g -o {bin_name} {src_name}') + + let lines =<< trim END ++ set mouse=a + edit XTD_evaluate_in_popup.c + packadd termdebug + let g:termdebug_config = {} +diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim +index 9086ebb..5ccfcbb 100644 +--- a/src/testdir/test_popup.vim ++++ b/src/testdir/test_popup.vim +@@ -2205,6 +2205,7 @@ func Test_pum_clear_when_switch_tab_or_win() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + inoremap wincmd w + inoremap tabnext + END +diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim +index 0348169..7bc1446 100644 +--- a/src/testdir/test_popupwin.vim ++++ b/src/testdir/test_popupwin.vim +@@ -8,6 +8,7 @@ func Test_simple_popup() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + call setline(1, range(1, 100)) + hi PopupColor1 ctermbg=lightblue + hi PopupColor2 ctermbg=lightcyan +@@ -3531,6 +3532,7 @@ endfunc + + func Get_popupmenu_lines() + let lines =<< trim END ++ set mouse=a + set completeopt+=preview,popup + set completefunc=CompleteFuncDict + hi InfoPopup ctermbg=yellow +@@ -3792,6 +3794,7 @@ endfunc + func Test_popupmenu_info_align_item() + CheckScreendump + let lines =<< trim END ++ set mouse=a + func Omni_test(findstart, base) + if a:findstart + return col(".") +diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim +index 6693a76..3275324 100644 +--- a/src/testdir/test_startup.vim ++++ b/src/testdir/test_startup.vim +@@ -930,7 +930,7 @@ func Test_start_with_tabs() + CheckScreendump + CheckRunVimInTerminal + +- let buf = RunVimInTerminal('-p a b c', {}) ++ let buf = RunVimInTerminal('-c ":set mouse=a" -p a b c', {}) + call VerifyScreenDump(buf, 'Test_start_with_tabs', {}) + + " clean up +diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim +index 05c5669..436423f 100644 +--- a/src/testdir/test_tabpage.vim ++++ b/src/testdir/test_tabpage.vim +@@ -690,6 +690,7 @@ func Test_tabpage_cmdheight() + CheckScreendump + CheckRunVimInTerminal + call writefile([ ++ \ 'set mouse=a', + \ 'set laststatus=2', + \ 'set cmdheight=2', + \ 'tabnew', +diff --git a/src/testdir/test_tabpanel.vim b/src/testdir/test_tabpanel.vim +index 4959693..9306be0 100644 +--- a/src/testdir/test_tabpanel.vim ++++ b/src/testdir/test_tabpanel.vim +@@ -13,6 +13,7 @@ function Test_tabpanel_showtabpanel_eq_0() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set noruler + call setbufline(bufnr(), 1, ['aaa','bbb','ccc','ddd']) +@@ -40,6 +41,7 @@ function Test_tabpanel_showtabpanel_eq_1() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=1 + set noruler + END +@@ -491,6 +493,7 @@ function Test_tabpanel_tabline_and_tabpanel() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set tabpanelopt=columns:10,vert + set fillchars=tpl_vert:│ +@@ -513,6 +516,7 @@ function Test_tabpanel_dont_overflow_into_tabpanel() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set tabpanelopt=columns:10 + set showtabline=2 +@@ -643,6 +647,7 @@ function Test_tabpanel_eval_tabpanel_with_linebreaks() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + function Expr() + return "top\n$%=[%f]%=$\nbottom" + endfunction +@@ -670,6 +675,7 @@ function Test_tabpanel_tabonly() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + tabnew + set showtabpanel=1 + norm 100oasdf +@@ -689,6 +695,7 @@ function Test_tabpanel_equalalways() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + tabnew + set showtabpanel=1 + set tabpanelopt=columns:20 +@@ -714,6 +721,7 @@ function Test_tabpanel_quitall() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + tabnew + set showtabpanel=1 + set laststatus=2 +@@ -733,6 +741,7 @@ function Test_tabpanel_ruler() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + tabnew + set statusline& laststatus=0 + set rulerformat& ruler +@@ -770,6 +779,7 @@ function Test_tabpanel_with_msg_scrolled() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set noruler + tabnew +@@ -791,6 +801,7 @@ function Test_tabpanel_with_cmdline_pum() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set noruler + tabnew aaa +@@ -818,6 +829,7 @@ function Test_tabpanel_with_cmdline_no_pum() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set showtabpanel=2 + set noruler + tabnew aaa +diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim +index 02e6fcb..746a905 100644 +--- a/src/testdir/test_window_cmd.vim ++++ b/src/testdir/test_window_cmd.vim +@@ -2360,6 +2360,7 @@ func Test_resize_from_another_tabpage() + CheckScreendump + + let lines =<< trim END ++ set mouse=a + set laststatus=2 + vnew + let w = win_getid() diff --git a/vim-test-port-mismatch.patch b/vim-test-port-mismatch.patch new file mode 100644 index 00000000..ce931ae2 --- /dev/null +++ b/vim-test-port-mismatch.patch @@ -0,0 +1,36 @@ +diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim +index dcd0526..df85b41 100644 +--- a/src/testdir/test_channel.vim ++++ b/src/testdir/test_channel.vim +@@ -24,7 +24,7 @@ func SetUp() + let s:localhost = 'unix:Xtestsocket' + let s:testscript = 'test_channel_unix.py' + else +- let s:localhost = 'localhost:' ++ let s:localhost = '127.0.0.1:' + let s:testscript = 'test_channel.py' + endif + let s:chopt = {} +diff --git a/src/testdir/test_channel_lsp.py b/src/testdir/test_channel_lsp.py +index 887f697..e856c30 100644 +--- a/src/testdir/test_channel_lsp.py ++++ b/src/testdir/test_channel_lsp.py +@@ -358,4 +358,4 @@ def main(host, port, server_class=ThreadedTCPServer): + server.shutdown() + + if __name__ == "__main__": +- main("localhost", 0) ++ main("127.0.0.1", 0) +diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py +index 888a2d9..76bbf2d 100644 +--- a/src/testdir/test_netbeans.py ++++ b/src/testdir/test_netbeans.py +@@ -182,7 +182,7 @@ def writePortInFile(port): + f.close() + + if __name__ == "__main__": +- HOST, PORT = "localhost", 0 ++ HOST, PORT = "127.0.0.1", 0 + + addrs = socket.getaddrinfo(HOST, PORT, 0, 0, socket.IPPROTO_TCP) + # Each addr is a (family, type, proto, canonname, sockaddr) tuple diff --git a/vim.spec b/vim.spec index ae10b3b1..b9c2740b 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 2086 +%define patchlevel 2114 %define withnetbeans 1 %define withhunspell 0 @@ -92,6 +92,19 @@ Patch6: vim-python3-tests.patch Patch7: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch8: vim-8.0-copy-paste.patch +# upstream test suite expects mouse to be set in some tests... +Patch9: vim-9.1-copy-paste.patch +# since F42+, if you let glibc to give you random port, it will give you two random ports +# - one for IPv4 address, another for IPv6 address by default. Vim counts on the port being +# the same, because the fake server used for testing (python script simulating netbeans or +# another language server with language server procotol - LSP) saves the port into a file +# for Vim to pick it up and use the informantion when connecting to the server. However, +# the problem appears when client gets localhost resolved into IPv4 address, but used +# the port which is used by fake server for IPv6 address. +# Since such tests are only mocking the real life behavior and in the real life Vim gets +# connection information by a different way, enforcing IPv4 in the test to prevent mismatch +# is a viable solution. +Patch10: vim-test-port-mismatch.patch # patch only when hunspell is enabled @@ -392,6 +405,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 6 -p1 -b .python-tests %patch -P 7 -p1 -b .fips-warning %patch -P 8 -p1 -b .copypaste +%patch -P 9 -p1 -b .newcopy +%patch -P 10 -p1 -b .test-port-mismatch %if %{withhunspell} %patch -P 10000 -p1 @@ -748,7 +763,7 @@ rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ # Remove not UTF-8 manpages -for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1 tr.ISO8859-9; do +for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1 tr.ISO8859-9 sv.ISO8859-1; do rm -rf %{buildroot}/%{_mandir}/$i done @@ -756,7 +771,7 @@ done mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru # Remove duplicate man pages -for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8 tr.UTF-8; do +for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8 tr.UTF-8 sv.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done @@ -891,6 +906,7 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %lang(ja) %{_mandir}/ja/man1/* %lang(pl) %{_mandir}/pl/man1/* %lang(ru) %{_mandir}/ru/man1/* +%lang(sv) %{_mandir}/sv/man1/* %lang(tr) %{_mandir}/tr/man1/* %files minimal @@ -988,6 +1004,13 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Jan 30 2026 Zdenek Dohnal - 2:9.1.2114-1 +- patchlevel 2114 +- added Swedish translation + +* Fri Jan 30 2026 Zdenek Dohnal - 2:9.1.2086-2 +- fix some of test suite failures + * Fri Jan 16 2026 Zdenek Dohnal - 2:9.1.2086-1 - patchlevel 2086