From 270d9c19a6e37b4bb5af0f50ab67947e79a8d96d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 13 May 2013 15:47:17 +0200 Subject: [PATCH 1/4] fix path to xsubpp script --- vim-7.3-xsubpp-path.patch | 12 ++++++++++++ vim.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 vim-7.3-xsubpp-path.patch diff --git a/vim-7.3-xsubpp-path.patch b/vim-7.3-xsubpp-path.patch new file mode 100644 index 00000000..971b10a5 --- /dev/null +++ b/vim-7.3-xsubpp-path.patch @@ -0,0 +1,12 @@ +diff -up vim73/src/Makefile.xsubpp vim73/src/Makefile +--- vim73/src/Makefile.xsubpp 2013-05-13 15:02:15.894805644 +0200 ++++ vim73/src/Makefile 2013-05-13 15:07:03.922821257 +0200 +@@ -2416,7 +2416,7 @@ lintinstall: + + auto/if_perl.c: if_perl.xs + $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ +- $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ ++ $(PERL) $(PERLLIB)/vendor_perl/ExtUtils/xsubpp -prototypes -typemap \ + $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ + + auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in diff --git a/vim.spec b/vim.spec index ed1652df..9aecdd96 100644 --- a/vim.spec +++ b/vim.spec @@ -1012,6 +1012,7 @@ Patch3011: vim72-rh514717.patch Patch3012: vim-7.3-bug816848.patch Patch3013: vim-7.3-manpage-typo-668894-675480.patch Patch3014: vim-7.3-rubyversion.patch +Patch3015: vim-7.3-xsubpp-path.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel ncurses-devel gettext perl-devel @@ -2107,6 +2108,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3012 -p1 %patch3013 -p1 %patch3014 -p1 +%patch3015 -p1 %build cp -f %{SOURCE5} . @@ -2566,6 +2568,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon May 13 2013 Karsten Hopp 7.3.943-2 - add BR perl(ExtUtils::ParseXS) +- fix path to xsubpp script * Mon May 13 2013 Karsten Hopp 7.3.943-1 - patchlevel 943 From 726954caa162dafd034c29f1501e37d51902acd6 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 14 May 2013 14:59:15 +0200 Subject: [PATCH 2/4] - patchlevel 944 --- 7.3.944 | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 7.3.944 diff --git a/7.3.944 b/7.3.944 new file mode 100644 index 00000000..f5bbc972 --- /dev/null +++ b/7.3.944 @@ -0,0 +1,69 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.944 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.944 +Problem: External program receives the termrespone. +Solution: Insert a delay and discard input. (Hayaki Saito) +Files: src/term.c + + +*** ../vim-7.3.943/src/term.c 2013-04-06 14:30:35.000000000 +0200 +--- src/term.c 2013-05-13 20:24:14.000000000 +0200 +*************** +*** 3253,3261 **** + if (!gui.in_use && !gui.starting) + # endif + { +! /* May need to check for T_CRV response. */ + if (crv_status == CRV_SENT || u7_status == U7_SENT) +! (void)vpeekc_nomap(); + /* Check for termcodes first, otherwise an external program may + * get them. */ + check_for_codes_from_term(); +--- 3253,3271 ---- + if (!gui.in_use && !gui.starting) + # endif + { +! /* May need to discard T_CRV or T_U7 response. */ + if (crv_status == CRV_SENT || u7_status == U7_SENT) +! { +! # ifdef UNIX +! /* Give the terminal a chance to respond. */ +! mch_delay(100L, FALSE); +! # endif +! # ifdef TCIFLUSH +! /* Discard data received but not read. */ +! if (exiting) +! tcflush(fileno(stdin), TCIFLUSH); +! # endif +! } + /* Check for termcodes first, otherwise an external program may + * get them. */ + check_for_codes_from_term(); +*** ../vim-7.3.943/src/version.c 2013-05-12 21:16:17.000000000 +0200 +--- src/version.c 2013-05-13 20:24:29.000000000 +0200 +*************** +*** 730,731 **** +--- 730,733 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 944, + /**/ + +-- +DENNIS: Listen -- strange women lying in ponds distributing swords is no + basis for a system of government. Supreme executive power derives + from a mandate from the masses, not from some farcical aquatic + ceremony. + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From 0a58aceceb59f05d8d11071bf2c436026b2a6fd1 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 14 May 2013 14:59:16 +0200 Subject: [PATCH 3/4] - patchlevel 944 --- README.patches | 1 + vim.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.patches b/README.patches index e7e5ab78..ad55b60a 100644 --- a/README.patches +++ b/README.patches @@ -975,3 +975,4 @@ Individual patches for Vim 7.3: 32095 7.3.941 Python: Stuff in if_py_both.h is ordered badly 5470 7.3.942 Python: SEGV in Buffer functions 6867 7.3.943 Python: Negative indices were failing + 2283 7.3.944 external program receives the termrespone diff --git a/vim.spec b/vim.spec index 9aecdd96..8ce1ab58 100644 --- a/vim.spec +++ b/vim.spec @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim73%{?beta} -%define patchlevel 943 +%define patchlevel 944 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -999,6 +999,7 @@ Patch940: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.940 Patch941: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.941 Patch942: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.942 Patch943: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.943 +Patch944: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.944 Patch3000: vim-7.3-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -2089,6 +2090,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch941 -p0 %patch942 -p0 %patch943 -p0 +%patch944 -p0 # install spell files @@ -2566,6 +2568,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue May 14 2013 Karsten Hopp 7.3.944-1 +- patchlevel 944 + * Mon May 13 2013 Karsten Hopp 7.3.943-2 - add BR perl(ExtUtils::ParseXS) - fix path to xsubpp script From b3a77559032cc8328aa0a48d8486d081d5bac2ef Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 14 May 2013 15:09:45 +0200 Subject: [PATCH 4/4] fix path to xsubpp script --- vim-7.3-xsubpp-path.patch | 12 ------------ vim.spec | 5 +---- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 vim-7.3-xsubpp-path.patch diff --git a/vim-7.3-xsubpp-path.patch b/vim-7.3-xsubpp-path.patch deleted file mode 100644 index 971b10a5..00000000 --- a/vim-7.3-xsubpp-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vim73/src/Makefile.xsubpp vim73/src/Makefile ---- vim73/src/Makefile.xsubpp 2013-05-13 15:02:15.894805644 +0200 -+++ vim73/src/Makefile 2013-05-13 15:07:03.922821257 +0200 -@@ -2416,7 +2416,7 @@ lintinstall: - - auto/if_perl.c: if_perl.xs - $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ -- $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ -+ $(PERL) $(PERLLIB)/vendor_perl/ExtUtils/xsubpp -prototypes -typemap \ - $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ - - auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in diff --git a/vim.spec b/vim.spec index e4bffe28..1aff1e72 100644 --- a/vim.spec +++ b/vim.spec @@ -1013,7 +1013,6 @@ Patch3011: vim72-rh514717.patch Patch3012: vim-7.3-bug816848.patch Patch3013: vim-7.3-manpage-typo-668894-675480.patch Patch3014: vim-7.3-rubyversion.patch -Patch3015: vim-7.3-xsubpp-path.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel ncurses-devel gettext perl-devel @@ -2110,7 +2109,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3012 -p1 %patch3013 -p1 %patch3014 -p1 -%patch3015 -p1 %build cp -f %{SOURCE5} . @@ -2576,7 +2574,6 @@ rm -rf $RPM_BUILD_ROOT * Mon May 13 2013 Karsten Hopp 7.3.943-2 - add BR perl(ExtUtils::ParseXS) -- fix path to xsubpp script * Mon May 13 2013 Karsten Hopp 7.3.943-1 - patchlevel 943 @@ -2608,7 +2605,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Nov 20 2012 Karsten Hopp 7.3.715-1 - patchlevel 715 -* + * Mon Nov 12 2012 Karsten Hopp 7.3.712-1 - patchlevel 712