diff --git a/.gitignore b/.gitignore index ecc7659..56606b1 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /vim-8.0-342.tar.bz2 /vim-8.0-344.tar.bz2 /vim-8.0-347.tar.bz2 +/vim-8.0-363.tar.bz2 diff --git a/README.patches b/README.patches index ddb9152..4881acf 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,154 @@ +commit 3834e3d039777e0144914a86289870bee147c0a2 +Author: Bram Moolenaar +Date: Thu Feb 23 20:20:53 2017 +0100 + + patch 8.0.0363: Travis is too slow to keep up with patches + + Problem: Travis is too slow to keep up with patches. + Solution: Increase git depth to 20 + +commit 10c6029e28ab666a42190fcceb0bb098a4ebf724 +Author: Bram Moolenaar +Date: Thu Feb 23 20:17:13 2017 +0100 + + patch 8.0.0362: tests fail on MS-Windows + + Problem: Tests fail on MS-Windows. + Solution: Use $*.vim instead of $<. + +commit 8be2fbb6705dfb41d06d688701803d206c968404 +Author: Bram Moolenaar +Date: Thu Feb 23 19:32:47 2017 +0100 + + patch 8.0.0361: GUI initialisation is not sufficiently tested + + Problem: GUI initialisation is not sufficiently tested. + Solution: Add the gui_init test. (Kazuki Kuriyama) + +commit b544f3c81f1e6a50322855681ac266ffaa8e313c +Author: Bram Moolenaar +Date: Thu Feb 23 19:03:28 2017 +0100 + + patch 8.0.0360: sometimes VimL is used instead of "Vim script" + + Problem: Sometimes VimL is used, which is confusing. + Solution: Consistently use "Vim script". (Hirohito Higashi) + +commit dc9a081712ec8c140e6d4909e9f6b03a629d32d3 +Author: Bram Moolenaar +Date: Thu Feb 23 18:46:50 2017 +0100 + + patch 8.0.0359: 'number' and 'relativenumber' are not properly tested + + Problem: 'number' and 'relativenumber' are not properly tested. + Solution: Add tests, change old style to new style tests. (Ozaki Kiichi, + closes #1447) + +commit 60629d642541a089c322e65963c0a77e5f77eb79 +Author: Bram Moolenaar +Date: Thu Feb 23 18:08:56 2017 +0100 + + patch 8.0.0358: invalid memory access in C-indent code + + Problem: Invalid memory access in C-indent code. + Solution: Don't go over end of empty line. (Dominique Pelle, closes #1492) + +commit 24922ec23360e7ea7c5a803c9edf476bb6395b32 +Author: Bram Moolenaar +Date: Thu Feb 23 17:59:22 2017 +0100 + + patch 8.0.0357: crash when setting 'guicursor' to weird value + + Problem: Crash when setting 'guicursor' to weird value. + Solution: Avoid negative size. (Dominique Pelle, closes #1465) + +commit 354796c19a0a4a048017059a0281938cc0b8f09a +Author: Bram Moolenaar +Date: Thu Feb 23 17:18:37 2017 +0100 + + patch 8.0.0356: leaking memory when setting 'ttytype' + + Problem: Leaking memory when setting 'ttytype'. + Solution: Get free_oldval from the right option entry. + +commit 187a4f28140f10ff833862be7e3ef823d317e1c7 +Author: Bram Moolenaar +Date: Thu Feb 23 17:07:14 2017 +0100 + + patch 8.0.0355: using uninitialized memory when 'isfname' is empty + + Problem: Using uninitialized memory when 'isfname' is empty. + Solution: Don't call getpwnam() without an argument. (Dominique Pelle, + closes #1464) + +commit 1c410400fad79068b16dc4c6c7a023463a0858cf +Author: Bram Moolenaar +Date: Thu Feb 23 15:20:03 2017 +0100 + + patch 8.0.0354: test to check that setting termcap key fails sometimes + + Problem: Test to check that setting termcap key fails sometimes. + Solution: Check for "t_k1" to exist. (Christian Brabandt, closes #1459) + +commit 3457d295f4035293a78f9a9851ea416f923dd59e +Author: Bram Moolenaar +Date: Thu Feb 23 14:55:59 2017 +0100 + + patch 8.0.0353: if [RO] is translated it may be truncated + + Problem: If [RO] in the status line is translated to a longer string, it is + trunctted to 4 bytes. + Solution: Skip over the resulting string. (Jente Hidskes, closes #1499) + +commit f06e5a549f42396be3478ccc1b5f03be64e1173e +Author: Bram Moolenaar +Date: Thu Feb 23 14:25:17 2017 +0100 + + patch 8.0.0352: not easy to see when a typval needs to be cleared + + Problem: The condition for when a typval needs to be cleared is too + complicated. + Solution: Init the type to VAR_UNKNOWN and clear it always. + +commit 218426896cbb2129aa4e85803ea97c5b57df1eaa +Author: Bram Moolenaar +Date: Thu Feb 23 13:50:38 2017 +0100 + + patch 8.0.0351: no test for concatenating an empty string + + Problem: No test for concatenating an empty string that results from out of + bounds indexing. + Solution: Add a simple test. + +commit ae177b716626c8d517b7c6c7d77f8b1aec6ba5f9 +Author: Bram Moolenaar +Date: Thu Feb 23 13:45:57 2017 +0100 + + patch 8.0.0350: not enough test coverage for Perl + + Problem: Not enough test coverage for Perl. + Solution: Add more Perl tests. (Dominique Perl, closes #1500) + +commit fe344a9875667537ce32fc11936dc56ad51f2139 +Author: Bram Moolenaar +Date: Thu Feb 23 12:20:35 2017 +0100 + + patch 8.0.0349: redrawing errors with GTK 3 + + Problem: Redrawing errors with GTK 3. + Solution: When updating, first clear all rectangles and then draw them. + (Kazunobu Kuriyama, Christian Ludwig, closes #848) + +commit b7a59906d7ce41b7e74ec31b910375c21e427c0a +Author: Bram Moolenaar +Date: Wed Feb 22 22:04:04 2017 +0100 + + patch 8.0.0348: using shadow dir on Mac lack +clipboard + + Problem: When building with a shadow directory on macOS lacks the + +clipboard feature. + Solution: Link *.m files, specifically os_macosx.m. (Kazunobu Kuriyama) + commit d099e033703ce0772f152b8df8a763f0b65303ee Author: Bram Moolenaar Date: Tue Feb 21 23:00:36 2017 +0100 diff --git a/sources b/sources index cb0b73d..4bd4da3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.0-347.tar.bz2) = 2e1cc927c154db7a3200cf8b0ba3f2b7054ed971dd438efa1e157260d646b52e895f721b5ebe056e81c90e8299b74a7db58a2e3af7286150636748fcbbc0492d +SHA512 (vim-8.0-363.tar.bz2) = 4f102287119aa1f891389d0f20a5d4f489ef879893312d06e9b1552ad15a717d953688450d7ae8562e46012a8a269407d889b803ed6833a235c669e4a4268bcb diff --git a/vim-8.0-gtk3-render.patch b/vim-8.0-gtk3-render.patch deleted file mode 100644 index b2fc237..0000000 --- a/vim-8.0-gtk3-render.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up vim80/src/gui_gtk_x11.c.gtk3-render vim80/src/gui_gtk_x11.c ---- vim80/src/gui_gtk_x11.c.gtk3-render 2017-02-22 10:38:37.935193240 +0100 -+++ vim80/src/gui_gtk_x11.c 2017-02-22 10:53:22.847435530 +0100 -@@ -688,8 +688,13 @@ draw_event(GtkWidget *widget UNUSED, - { - const cairo_rectangle_t rect = list->rectangles[i]; - -- gui_mch_clear_block(Y_2_ROW(rect.y), 1, -- Y_2_ROW(rect.y + rect.height - 1), Columns); -+ gui_mch_clear_block(Y_2_ROW((int)rect.y), 0, -+ Y_2_ROW((int)(rect.y + rect.height)) - 1, Columns - 1); -+ } -+ -+ for (i = 0; i < list->num_rectangles; i++) -+ { -+ const cairo_rectangle_t rect = list->rectangles[i]; - - if (blink_mode) - gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height); -@@ -6723,6 +6728,11 @@ gui_mch_clear_block(int row1, int col1, - color.pixel = gui.back_pixel; - #endif - -+ col1 = check_col(col1); -+ col2 = check_col(col2); -+ row1 = check_row(row1); -+ row2 = check_row(row2); -+ - #if GTK_CHECK_VERSION(3,0,0) - { - /* Add one pixel to the far right column in case a double-stroked diff --git a/vim.spec b/vim.spec index 127a45c..0ce129a 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 347 +%define patchlevel 363 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -68,7 +68,6 @@ Patch3013: vim-7.4-globalsyntax.patch Patch3014: vim-7.4-releasestring-1318991.patch Patch3015: vim-8.0-rhbz1365258.patch Patch3016: vim-8.0-copy-paste.patch -Patch3017: vim-8.0-gtk3-render.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel @@ -224,7 +223,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3015 -p1 %patch3016 -p1 -%patch3017 -p1 %build cp -f %{SOURCE6} . @@ -770,7 +768,10 @@ rm -rf %{buildroot} %{_datadir}/icons/locolor/*/apps/* %changelog -* Wed Feb 22 2017 Karsten Hopp 8.0.347-2 +* Fri Feb 24 2017 Karsten Hopp 8.0.363-1 +- patchlevel 363 + +* Fri Feb 24 2017 Karsten Hopp 8.0.347-1 - patchlevel 347 - 1405234 - Gvim fails to properly render after Openbox desktop switch - 1426296 - vim: FTBFS with python3-3.6.0-18.fc26