Accepting request 743826 from editors

- Updated to version 8.1.2233, fixes the following problems
- dropped python38-config.patch (upstream merged)
- refreshed  disable-unreliable-tests.patch and vim-8.0.1568-defaults.patch
  * No test for right click extending Visual area.
  * Crash when running out of memory very early.
  * No test for 'ttymouse' set from xterm version response.
  * State test is a bit flaky.
  * Combining text property and syntax highlight is wrong. (Nick Jensen)
  * Quickfix window height wrong when there is a tabline. (Daniel Hahler)
  * In a terminal window 'cursorlineopt' does not work properly.
  * First character after Tab is not highlighted.
  * Libvterm source files missing from distribution.
  * Terminal attributes missing in Terminal-normal mode.
  * Some mappings are listed twice.
  * Cannot build with +syntax but without +terminal.
  * Mapping test fails.
  * Popup resize test is flaky. (Christian Brabandt)
  * Cannot build with +spell but without +syntax.
  * Stuck when using "j" in a popupwin with popup_filter_menu if a line wraps.
  * Rubyeval() not tested as a method.
  * Mapping test fails on MS-Windows.
  * Heredoc assignment not skipped in if block.
  * Terminal flags are never reset.
  * Cannot build without the +termresponse feature.
  * Mouse support not always available.
  * Spell highlight is wrong at start of the line.
  * Searchit() has too many arguments.
  * Screen not recognized as supporting "sgr" mouse codes.
  * Meson files are not recognized.
  * Syntax attributes not combined with Visual highlighting. (Arseny Nasokin)

OBS-URL: https://build.opensuse.org/request/show/743826
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=245

disable-unreliable-tests.patch

@@ -1,15 +1,8 @@
-Index: vim-8.1.2052/src/testdir/test_alot.vim
+Index: vim-8.1.2233/src/testdir/test_alot.vim
 ===================================================================
---- vim-8.1.2052.orig/src/testdir/test_alot.vim
+--- vim-8.1.2233.orig/src/testdir/test_alot.vim
-+++ vim-8.1.2052/src/testdir/test_alot.vim
++++ vim-8.1.2233/src/testdir/test_alot.vim
-@@ -38,14 +38,12 @@ source test_join.vim
+@@ -44,7 +44,6 @@ source test_messages.vim
- source test_jumps.vim
- source test_lambda.vim
- source test_lispwords.vim
--source test_mapping.vim
- source test_match.vim
- source test_menu.vim
- source test_messages.vim
  source test_modeline.vim
  source test_move.vim
  source test_partial.vim
@@ -17,7 +10,7 @@ Index: vim-8.1.2052/src/testdir/test_alot.vim
  source test_put.vim
  source test_recover.vim
  source test_reltime.vim
-@@ -65,7 +63,6 @@ source test_tagcase.vim
+@@ -64,7 +63,6 @@ source test_tagcase.vim
  source test_tagfunc.vim
  source test_tagjump.vim
  source test_taglist.vim
@@ -25,10 +18,10 @@ Index: vim-8.1.2052/src/testdir/test_alot.vim
  source test_true_false.vim
  source test_unlet.vim
  source test_virtualedit.vim
-Index: vim-8.1.2052/src/testdir/Make_all.mak
+Index: vim-8.1.2233/src/testdir/Make_all.mak
 ===================================================================
---- vim-8.1.2052.orig/src/testdir/Make_all.mak
+--- vim-8.1.2233.orig/src/testdir/Make_all.mak
-+++ vim-8.1.2052/src/testdir/Make_all.mak
++++ vim-8.1.2233/src/testdir/Make_all.mak
 @@ -64,7 +64,6 @@ NEW_TESTS = \
  	test_autoload \
  	test_backspace_opt \
@@ -53,10 +46,10 @@ Index: vim-8.1.2052/src/testdir/Make_all.mak
  	test_balloon_gui.res \
  	test_blob.res \
  	test_blockedit.res \
-Index: vim-8.1.2052/src/testdir/Makefile
+Index: vim-8.1.2233/src/testdir/Makefile
 ===================================================================
---- vim-8.1.2052.orig/src/testdir/Makefile
+--- vim-8.1.2233.orig/src/testdir/Makefile
-+++ vim-8.1.2052/src/testdir/Makefile
++++ vim-8.1.2233/src/testdir/Makefile
 @@ -36,8 +36,6 @@ SCRIPTS = $(SCRIPTS_ALL) \
  # Explicit dependencies.
  test49.out: test49.vim

python38-config.patch

@@ -1,47 +0,0 @@
---- a/src/if_python3.c
-+++ b/src/if_python3.c
-@@ -600,6 +600,44 @@ static struct
-     {"", NULL},
- };
- 
-+# if PY_VERSION_HEX >= 0x030800f0
-+    static inline void
-+py3__Py_DECREF(const char *filename, int lineno, PyObject *op)
-+{
-+    (void)filename; /* may be unused, shut up -Wunused-parameter */
-+    (void)lineno; /* may be unused, shut up -Wunused-parameter */
-+    _Py_DEC_REFTOTAL;
-+    if (--op->ob_refcnt != 0)
-+    {
-+#  ifdef Py_REF_DEBUG
-+	if (op->ob_refcnt < 0)
-+	{
-+	    _Py_NegativeRefcount(filename, lineno, op);
-+	}
-+#  endif
-+    }
-+    else
-+    {
-+	_Py_Dealloc(op);
-+    }
-+}
-+
-+#  undef Py_DECREF
-+#  define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
-+
-+    static inline void
-+py3__Py_XDECREF(PyObject *op)
-+{
-+    if (op != NULL)
-+    {
-+	Py_DECREF(op);
-+    }
-+}
-+
-+#  undef Py_XDECREF
-+#  define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op))
-+# endif
-+
- /*
-  * Free python.dll
-  */

vim-8.0.1568-defaults.patch

@@ -1,18 +1,26 @@
-Index: vim-8.0.1568/runtime/defaults.vim
+Index: vim-8.1.2233/runtime/defaults.vim
 ===================================================================
---- vim-8.0.1568.orig/runtime/defaults.vim
+--- vim-8.1.2233.orig/runtime/defaults.vim
-+++ vim-8.0.1568/runtime/defaults.vim
++++ vim-8.1.2233/runtime/defaults.vim
-@@ -75,9 +75,11 @@ inoremap <C-U> <C-G>u<C-U>
+@@ -77,13 +77,15 @@ inoremap <C-U> <C-G>u<C-U>
- 
- " In many terminal emulators the mouse works just fine.  By enabling it you
  " can position the cursor, Visually select and scroll with the mouse.
+ " Only xterm can grab the mouse events when using the shift key, for other
+ " terminals use ":", select text and press Esc.
 -if has('mouse')
--  set mouse=a
+-  if &term =~ 'xterm'
+-    set mouse=a
+-  else
+-    set mouse=nvi
+-  endif
 -endif
-+" disabled in (open)SUSE to make copy&paste work as most people
++" disabled in (open)SUSE to make copy&pase work as most people
-+" expect it bsc#1079185
++" except it boo#1079185
 +"if has('mouse')
-+"  set mouse=a
++"  if &term =~ 'xterm'
++"    set mouse=a
++"  else
++"    set mouse=nvi
++"  endif
 +"endif
  
  " Switch syntax highlighting on when the terminal has colors or when using the

vim-8.1.2148.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9479b9df2a99aa87fd75f7795f928ed3c08143ea7a72661354a7bbcf27a2b51
-size 14507408

vim-8.1.2233.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d27da89a918418f423d0651d21e61fcda8b1fa18cdcb80baced2ad7468b5a836
+size 14583709

vim.changes

@@ -1,3 +1,91 @@
+-------------------------------------------------------------------
+Tue Oct 29 12:32:18 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- Updated to version 8.1.2233, fixes the following problems
+- dropped python38-config.patch (upstream merged)
+- refreshed  disable-unreliable-tests.patch and vim-8.0.1568-defaults.patch
+  * No test for right click extending Visual area.
+  * Crash when running out of memory very early.
+  * No test for 'ttymouse' set from xterm version response.
+  * State test is a bit flaky.
+  * Combining text property and syntax highlight is wrong. (Nick Jensen)
+  * Quickfix window height wrong when there is a tabline. (Daniel Hahler)
+  * In a terminal window 'cursorlineopt' does not work properly.
+  * First character after Tab is not highlighted.
+  * Libvterm source files missing from distribution.
+  * Terminal attributes missing in Terminal-normal mode.
+  * Some mappings are listed twice.
+  * Cannot build with +syntax but without +terminal.
+  * Mapping test fails.
+  * Popup resize test is flaky. (Christian Brabandt)
+  * Cannot build with +spell but without +syntax.
+  * Stuck when using "j" in a popupwin with popup_filter_menu if a line wraps.
+  * Rubyeval() not tested as a method.
+  * Mapping test fails on MS-Windows.
+  * Heredoc assignment not skipped in if block.
+  * Terminal flags are never reset.
+  * Cannot build without the +termresponse feature.
+  * Mouse support not always available.
+  * Spell highlight is wrong at start of the line.
+  * Searchit() has too many arguments.
+  * Screen not recognized as supporting "sgr" mouse codes.
+  * Meson files are not recognized.
+  * Syntax attributes not combined with Visual highlighting. (Arseny Nasokin)
+  * Dart files are not recognized.
+  * Accessing uninitialized memory in test.
+  * Pressing "q" at the more prompt doesn't stop Python output. (Daniel Hahler)
+  * Error E303 is not useful when 'directory' is empty.
+  * Highlighting wrong when item follows tab.
+  * Test42 seen as binary by git diff.
+  * Running a test is a bit verbose.
+  * Option context is not copied when splitting a window. (Daniel Hahler)
+  * Syntax test fails.
+  * Cannot build without the +eval feature.
+  * Error for bad regexp even though regexp is not used when writing a
+  file. (Arseny Nasokin)
+  * Build error for missing define.
+  * Syntax highlighting wrong for tab.
+  * Syntax test fails on Mac.
+  * When using modifyOtherKeys CTRL-X mode may not work.
+  * Cannot easily fill the info popup asynchronously.
+  * Popup_setoptions(popup_getoptions()) does not work.
+  * ModifyOtherKeys is not enabled by default.
+  * Vim does not exit when closing a terminal window and it is the last window.
+  * ExitPre autocommand may cause accessing freed memory.
+  * Crash when using :center in autocommand.
+  * Build failure when using normal features without GUI and EXITFREE defined.
+  * Crash when memory allocation fails.
+  * Cannot build with dynamically linked Python 3.8.
+  * Running libvterm tests without the +terminal feature.
+  * Crash on exit when closing terminals. (Corey Hickey)
+  * Sign entry structure has confusing name.
+  * No test for fixed issue #3893.
+  * "gn" doesn't work quite right. (Jaehwang Jerry Jung)
+  * Unix: Tabs in output might be expanded to spaces.
+  * LF in escape codes may be expanded to CR-LF.
+  * Using negative offset for popup_create() does not work.
+  * Listener callback "added" argument is not the total. (Andy Massimino)
+  * Cannot see the selection type in :reg output. (Ayberk Aydın)
+  * Popup_textprop tests fail.
+  * Too much is redrawn when 'cursorline' is set.
+  * Unreachable code in adjusting text prop columns.
+  * Text property in wrong place after :substitute.
+  * Compiler warning for unused variable.
+  * "gN" is off by one in Visual mode.
+  * No autocommand for open window with terminal.
+  * :cfile does not abort like other quickfix commands.
+  * Cannot filter :disp output.
+  * Accessing invalid memory. (Dominique Pelle)
+  * Cannot see what buffer an ml_get error is for.
+  * Cannot build Amiga version.
+  * The "last used" info of a buffer is under used.
+  * Cannot use system copy/paste in non-xterm terminals.
+  * Layout wrong if 'lines' changes while cmdline window is open.
+  * screenpos() returns wrong values when 'number' is set. (Ben Jackson)
+  * Cannot color number column above/below cursor differently.
+  * Not easy to move to the middle of a text line.
+  * Cannot get the Vim command line arguments.
+
 -------------------------------------------------------------------
 Wed Oct 23 12:35:39 CEST 2019 - Matej Cepl <mcepl@suse.com>
 

vim.spec

@@ -17,7 +17,7 @@
 
 
 %define pkg_version 8.1
-%define patchlevel 2148
+%define patchlevel 2233
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim81
 %define site_runtimepath %{_datadir}/vim/site
@@ -69,8 +69,6 @@ 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
-# https://github.com/vim/vim/issues/4080
-Patch103:       python38-config.patch
 BuildRequires:  autoconf
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -177,7 +175,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
 
 # Unreliable tests