OBS User unknown 2007-02-04 17:23:52 +00:00 committed by Git OBS Bridge
parent a6a361b09d
commit 1c77d5b3dd
4 changed files with 21 additions and 14 deletions

11
vim-7.0-flex-array.diff Normal file
View File

@ -0,0 +1,11 @@
--- src/structs.h.sav 2007-02-02 11:31:05.000000000 +0100
+++ src/structs.h 2007-02-02 11:31:14.000000000 +0100
@@ -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[]; /* key (actually longer!) */
};
typedef struct dictitem_S dictitem_T;

View File

@ -1,11 +0,0 @@
--- vim70/src/eval.c.orig 2006-07-11 12:02:34.000000000 +0200
+++ vim70/src/eval.c 2006-07-11 12:03:32.000000000 +0200
@@ -19670,7 +19670,7 @@
* some compiler that checks the destination size. */
v = &fc.fixvar[fixvar_idx++].var;
name = v->di_key;
- STRCPY(name, "self");
+ // STRCPY(name, "self");
v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
v->di_tv.v_type = VAR_DICT;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 2 23:49:38 CET 2007 - dmueller@suse.de
- fix fortify workaround
-------------------------------------------------------------------
Wed Jan 24 16:53:04 CET 2007 - mkoenig@suse.de

View File

@ -18,7 +18,7 @@ Group: Productivity/Editors/Vi
Provides: vi_clone
Autoreqprov: on
Version: 7.0
Release: 48
Release: 49
%define VIM_SUBDIR vim70
Summary: Vi IMproved
URL: http://www.vim.org/
@ -42,7 +42,6 @@ Source16: gvim.png
Source17: apparmor.vim
Patch0: %{name}-7.0-official_patches_001-%{official_ptchlvl}.bz2
Patch1: %{name}-7.0-no_nb.patch
Patch2: %{name}-7.0-gcc_overflow_check.patch
Patch3: %{name}-7.0-filetype_ycp.patch
Patch4: %{name}-7.0-gvimrc_fontset.patch
Patch5: %{name}-7.0-highlight_fstab.patch
@ -56,6 +55,7 @@ Patch12: %{name}-7.0-ruby_ldflags_configure.patch
Patch13: %{name}-7.0-fstab_match_uuid.patch
Patch14: %{name}-7.0-grub.patch
Patch15: %{name}-7.0-apparmor.patch
Patch16: %{name}-7.0-flex-array.diff
# tbd??? %name-6.3-ga-utf8.diff
# tbd??? %name-6.3-initvals.diff
# tbd??? vim64-svn-crash.patch
@ -133,7 +133,6 @@ Authors:
%setup -q -n %{VIM_SUBDIR} -b 1 -b 2
%patch
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@ -147,6 +146,7 @@ Authors:
%patch13
%patch14
%patch15 -p1
%patch16
cp $RPM_SOURCE_DIR/vimrc_example* .
cp $RPM_SOURCE_DIR/ANNOUNCEMENT* .
rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
@ -339,6 +339,8 @@ rm -rf $RPM_BUILD_ROOT;
/usr/bin/vim-enhanced
%changelog -n vim
* Fri Feb 02 2007 - dmueller@suse.de
- fix fortify workaround
* Wed Jan 24 2007 - mkoenig@suse.de
- move gvim and related stuff from /usr/X11R6/bin to /usr/bin
* Tue Jan 23 2007 - mkoenig@suse.de