rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f23

Browse Source
This commit is contained in:
Karsten Hopp 2016-04-08 16:06:34 +02:00
commit e57c7a17ce
8 changed files with 4997 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -20,3 +20,7 @@ vim-7.2.tar.bz2
/vim-7.4-979.tar.bz2
/vim-7.4-1087.tar.bz2
/vim-7.4-1142.tar.bz2
/vim-7.4-1229.tar.bz2
/vim-7.4-1344.tar.bz2
/vim-7.4-1570.tar.bz2
/vim-7.4-1718.tar.bz2

4955
README.patches
View File

File diff suppressed because it is too large Load Diff

2
sources
View File

@ -1 +1 @@
16d39b36ad3fca8055dbdd1b558528d8 vim-7.4-1142.tar.bz2
47f1f3468b5ee8fe59a8df97bbe8e6c5 vim-7.4-1718.tar.bz2

11
vim-7.0-warning.patch
View File

@ -1,11 +0,0 @@
--- vim70c/src/structs.h.warning1 2006-04-04 15:58:16.000000000 +0200
+++ vim70c/src/structs.h 2006-04-04 15:58:20.000000000 +0200
@@ -1082,7 +1082,7 @@
{
typval_T di_tv; /* type and value of the variable */
char_u di_flags; /* flags (only used for variable) */
- char_u di_key[1]; /* key (actually longer!) */
+ char_u di_key[10]; /* key (actually longer!) */
};
typedef struct dictitem_S dictitem_T;

10
vim-7.1-nowarnings.patch
View File

@ -1,10 +0,0 @@
--- vim71/src/ex_docmd.c.nowarnings 2007-06-04 14:43:26.000000000 +0200
+++ vim71/src/ex_docmd.c 2007-06-04 14:43:43.000000000 +0200
@@ -3993,6 +3993,7 @@ get_flags(eap)
ex_ni(eap)
exarg_T *eap;
{
+ return;
if (!eap->skip)
eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
}

11
vim-7.4-nowarnings.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up vim74/src/ex_docmd.c.e319 vim74/src/ex_docmd.c
--- vim74/src/ex_docmd.c.e319 2016-02-17 14:48:23.033995923 +0100
+++ vim74/src/ex_docmd.c 2016-02-17 14:48:03.712890575 +0100
@@ -4630,6 +4630,7 @@ get_flags(exarg_T *eap)
void
ex_ni(exarg_T *eap)
{
+ return;
if (!eap->skip)
eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
}

40
vim.spec
View File

@ -1,4 +1,4 @@
%define patchlevel 1142
%define patchlevel 1718
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
%define WITH_SELINUX 1
%endif
@ -48,18 +48,16 @@ BuildRequires: hunspell-devel
%endif
Patch3000: vim-7.4-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
Patch3002: vim-7.4-nowarnings.patch
Patch3004: vim-7.0-rclocation.patch
Patch3006: vim-7.4-checkhl.patch
Patch3007: vim-7.4-fstabsyntax.patch
Patch3008: vim-7.0-warning.patch
Patch3009: vim-7.4-syncolor.patch
Patch3010: vim-7.0-specedit.patch
Patch3011: vim72-rh514717.patch
Patch3012: vim-7.3-manpage-typo-668894-675480.patch
Patch3013: vim-manpagefixes-948566.patch
Patch3014: vim-7.4-licensemacro-1151450.patch
Patch3015: vim-7.4-globalsyntax.patch
Patch3008: vim-7.4-syncolor.patch
Patch3009: vim-7.0-specedit.patch
Patch3010: vim-7.3-manpage-typo-668894-675480.patch
Patch3011: vim-manpagefixes-948566.patch
Patch3012: vim-7.4-licensemacro-1151450.patch
Patch3013: vim-7.4-globalsyntax.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@ -206,13 +204,11 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3006 -p1
%patch3007 -p1
%patch3008 -p1
%patch3009 -p1
#patch3010 -p1
#patch3009 -p1
%patch3010 -p1
%patch3011 -p1
%patch3012 -p1
%patch3013 -p1
%patch3015 -p1
%build
cp -f %{SOURCE5} .
@ -559,6 +555,7 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/%{vimdir}/autoload
%{_datadir}/%{name}/%{vimdir}/colors
%{_datadir}/%{name}/%{vimdir}/compiler
%{_datadir}/%{name}/%{vimdir}/pack
%{_datadir}/%{name}/%{vimdir}/doc
%{_datadir}/%{name}/%{vimdir}/*.vim
%{_datadir}/%{name}/%{vimdir}/ftplugin
@ -756,6 +753,21 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Fri Apr 08 2016 Karsten Hopp <karsten@redhat.com> 7.4.1718-1
- patchlevel 1718
* Tue Mar 15 2016 Karsten Hopp <karsten@redhat.com> 7.4.1570-1
- patchlevel 1570
* Wed Feb 17 2016 Karsten Hopp <karsten@redhat.com> 7.4.1344-1
- patchlevel 1344
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.4.1229-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Feb 01 2016 Karsten Hopp <karsten@redhat.com> 7.4.1229-1
- patchlevel 1229
* Tue Jan 19 2016 Karsten Hopp <karsten@redhat.com> 7.4.1142-1
- patchlevel 1142

30
vim72-rh514717.patch
View File

@ -1,30 +0,0 @@
diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c
--- vim72/src/eval.c.rh514717 2009-08-03 16:15:42.882375154 +0200
+++ vim72/src/eval.c 2009-08-03 16:34:14.863381780 +0200
@@ -286,13 +286,12 @@ typedef struct
#define VV_RO 2 /* read-only */
#define VV_RO_SBX 4 /* read-only in the sandbox */
-#define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}, {0}
+#define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}
static struct vimvar
{
char *vv_name; /* name of variable, without v: */
dictitem_T vv_di; /* value and name for key */
- char vv_filler[16]; /* space for LONGEST name below!!! */
char vv_flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */
} vimvars[VV_LEN] =
{
diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h
--- vim72/src/structs.h.rh514717 2009-08-03 16:33:35.274870950 +0200
+++ vim72/src/structs.h 2009-08-03 16:33:48.607436706 +0200
@@ -1095,7 +1095,7 @@ struct dictitem_S
{
typval_T di_tv; /* type and value of the variable */
char_u di_flags; /* flags (only used for variable) */
- char_u di_key[10]; /* key (actually longer!) */
+ char_u di_key[18]; /* key */
};
typedef struct dictitem_S dictitem_T;