diff --git a/bsc-1008800.patch b/bsc-1008800.patch deleted file mode 100644 index c643028..0000000 --- a/bsc-1008800.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: vim-8.0.0045/src/gui_gtk_x11.c -=================================================================== ---- vim-8.0.0045.orig/src/gui_gtk_x11.c -+++ vim-8.0.0045/src/gui_gtk_x11.c -@@ -3099,6 +3099,9 @@ drawarea_configure_event_cb(GtkWidget - if (event->width == cur_width && event->height == cur_height) - return TRUE; - -+ if (!gtk_check_version(3, 22, 2) && event->send_event == FALSE) -+ return TRUE; -+ - cur_width = event->width; - cur_height = event->height; - -@@ -4429,6 +4432,10 @@ form_configure_event(GtkWidget *widget U - { - int usable_height = event->height; - -+ if (!gtk_check_version(3, 22, 2) && -+ event->window != gtk_widget_get_window(gui.formwin)) -+ return TRUE; -+ - /* When in a GtkPlug, we can't guarantee valid heights (as a round - * no. of char-heights), so we have to manually sanitise them. - * Widths seem to sort themselves out, don't ask me why. diff --git a/v8.0.0045.tar.gz b/v8.0.0045.tar.gz deleted file mode 100644 index d06e6cb..0000000 --- a/v8.0.0045.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31cf8e56f1af025ba7ad597c89bcd9d9c1d5bf1c5414c11792a7f7f5fdb1787e -size 12922965 diff --git a/v8.0.0092.tar.gz b/v8.0.0092.tar.gz new file mode 100644 index 0000000..525eca7 --- /dev/null +++ b/v8.0.0092.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cfef722ca09619b1f9c62fa929177eb6bf16b8dc36c6c12fe778cde3d150b95 +size 12944948 diff --git a/vim.changes b/vim.changes index 5e175fa..5622f1f 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Mon Nov 21 16:01:17 UTC 2016 - dimstar@opensuse.org + +- Export "TERM=linux" before running the test suite: vim does quite + an extensive test relying on a full fledged terminal inside OBS, + stdio is redirected to a serial console (where the build log is + being recorded/extracted. Systemd set non-local tty by default to + vt220 in upcoming versions (which the vi test suite fails to + run on; this should be considered a vim bug). + +------------------------------------------------------------------- +Fri Nov 18 08:47:34 UTC 2016 - idonmez@suse.com + +- Updated to revision 92, fixes the following problems + * Using NUL instead of NULL. + * Crash when using the preview window from an unnamed buffer. (lifepillar) + * On Windows job_stop() stops cmd.exe, not the processes it runs. (Linwei) + * When a match ends in part of concealed text highlighting, it might mess + up concealing by resetting prev_syntax_id. + * An exiting job is detected with a large latency. + * New code for job_stop() breaks channel test on AppVeyor. + * Conceal test passes even without the bug fix. + * No test for what 8.0.0047 fixes. + * On Windows job_stop() stops cmd.exe, not the processes it runs. (Linwei) + * Minor comment and style deficiencies. + * When setting 'filetype' there is no check for a valid name. + * Tests fail without the 'keymap' features. + * Positioning of the popup menu is not good. + * Vim does not build on VMS systems. + * When using an Ex command for 'keywordprg' it is escaped as with a shell + command. (Romain Lafourcade) + * Compiler warning for unused variable. + * No digraph for HORIZONTAL ELLIPSIS. + * Compiler warning for comparing with unsigned. (Zoltan Arpadffy) + * Normal test fails on MS-Windows. + * Compiler warning for unused function in tiny build. (Tony Mechelynck) + * when calling an operator function when 'linebreak' is set, it is internally + reset before calling the operator function. + * VMS has a problem with infinity. + * Checking did_throw after executing autocommands is wrong. (Daniel Hahler) + * Compiler warning for self-comparison. + * Tests referred in Makefile that no longer exist. + * Exit value from a shell command is wrong. (Hexchain Tong) + * MS-Windows: Crash with long font name. (Henry Hu) + * More comparisons between firstwin and lastwin. + * Cannot make Vim fail on an internal error. + * Using number for exception type lacks type checking. + * Channel log has double parens ()(). + * The GUI code is not tested by Travis. + * Accessing freed memory in quickfix. + * Accessing freed memory in quickfix. (Domenique Pelle) + * The OS X build fails on Travis. + * Inconsistent function names. + * Extension for configure should be ".ac". + * Using freed memory with win_getid(). (Domenique Pelle) + * Using freed memory when adding to a quickfix list. (Domenique Pelle) + * Using freed memory with recursive function call. (Dominique Pelle) + * Cannot add a comment after ":hide". (Norio Takagi) + * When the channel callback gets job info the job may already have been + deleted. (lifepillar) + * When a test fails in Setup or Teardown the problem is not reported. + * Various problems with GTK 3.22.2. + * Cursor moved after last character when using 'breakindent'. + * Test_help_complete sometimes fails in MS-Windows console. + * C indenting does not support nested namespaces that C++ 17 has. +- Drop bsc-1008800.patch, fixed upstream. + ------------------------------------------------------------------- Mon Nov 7 12:51:19 UTC 2016 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index f5062d5..e82710d 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 8.0 -%define patchlevel 0045 -%define patchlevel_compact 45 +%define patchlevel 0092 +%define patchlevel_compact 92 %define VIM_SUBDIR vim80 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -92,7 +92,6 @@ Patch15: %{name}-7.4-filetype_apparmor.patch Patch18: %{name}-7.3-filetype_spec.patch Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch -Patch23: bsc-1008800.patch Patch100: vim73-no-static-libpython.patch %description @@ -167,7 +166,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch18 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 %patch100 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . @@ -332,6 +330,11 @@ mkdir -p %{buildroot}/var/run/vi.recover %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin %check +# vim does quite an extensive test relying on a full fledged terminal +# inside OBS, stdio is redirected to a serial console (where the build log +# is being recorded/extracted. Systemd set non-local tty by default to vt220 +# in upcoming versions +export TERM=linux # Reset the terminal scrolling region left behind by the testsuite trap "printf '\e[r'" EXIT # Look for "TEST FAILURE" in the build log diff --git a/vim73-no-static-libpython.patch b/vim73-no-static-libpython.patch index 13bfb33..9bf64b3 100644 --- a/vim73-no-static-libpython.patch +++ b/vim73-no-static-libpython.patch @@ -1,7 +1,7 @@ -Index: vim-8.0.0000/src/configure.in +Index: vim-8.0.0092/src/configure.ac =================================================================== ---- vim-8.0.0000.orig/src/configure.in -+++ vim-8.0.0000/src/configure.in +--- vim-8.0.0092.orig/src/configure.ac ++++ vim-8.0.0092/src/configure.ac @@ -1203,7 +1203,7 @@ eof if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"