Author: glen Date: Wed Apr 7 06:02:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 7.2.411
- add gui bcond to disable all gui builds
- package datadir/vim/ftdetect
---- Files affected:
packages/vim:
vim.spec (1.501 -> 1.502) , 7.2.395 (NONE -> 1.1) (NEW), 7.2.396 (NONE ->
1.1) (NEW), 7.2.397 (NONE -> 1.1) (NEW), 7.2.398 (NONE -> 1.1) (NEW),
7.2.399 (NONE -> 1.1) (NEW), 7.2.400 (NONE -> 1.1) (NEW), 7.2.401 (NONE ->
1.1) (NEW), 7.2.402 (NONE -> 1.1) (NEW), 7.2.403 (NONE -> 1.1) (NEW),
7.2.404 (NONE -> 1.1) (NEW), 7.2.405 (NONE -> 1.1) (NEW), 7.2.406 (NONE ->
1.1) (NEW), 7.2.407 (NONE -> 1.1) (NEW), 7.2.408 (NONE -> 1.1) (NEW),
7.2.409 (NONE -> 1.1) (NEW), 7.2.410 (NONE -> 1.1) (NEW), 7.2.411 (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.501 packages/vim/vim.spec:1.502
--- packages/vim/vim.spec:1.501 Tue Mar 16 20:06:04 2010
+++ packages/vim/vim.spec Wed Apr 7 08:02:17 2010
@@ -6,6 +6,7 @@
%bcond_without gtk # don't build GTK+-based gvim support
%bcond_without gnome # don't build GNOME-based gvim support
%bcond_without heavy # don't build heavy (full-featured GNOME-based
gvim/vim)
+%bcond_without gui # don't build any GUI
%bcond_with perl # with Perl interp in vim package
%bcond_with python # with Python interp in vim package
%bcond_with ruby # with Ruby interp in vim package
@@ -13,11 +14,18 @@
%bcond_without selinux # without selinux support
%bcond_without home_etc # without home_etc support
+%if %{without gui}
+%undefine with_athena
+%undefine with_motif
+%undefine with_gtk
+%undefine with_gnome
+%endif
+
# Command to check for latest patch:
# wget -q -O - ftp://ftp.vim.org/pub/editors/vim/patches/7.2/MD5SUMS|grep -vF
.gz|tail -n1|awk '{print $2}'
%define ver 7.2
-%define patchlevel 394
+%define patchlevel 411
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -873,7 +881,7 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir}/vim,%{_bindir}} \
- $RPM_BUILD_ROOT{/bin,%{_mandir}/man1,%{_datadir}/vim} \
+ $RPM_BUILD_ROOT{/bin,%{_mandir}/man1,%{_datadir}/vim/ftdetect} \
$RPM_BUILD_ROOT%{_desktopdir}
%{__make} -j1 install \
@@ -1109,6 +1117,8 @@
%dir %{_datadir}/vim/autoload
%doc %{_datadir}/vim/autoload/README.txt
+%dir %{_datadir}/vim/ftdetect
+
%dir %{_datadir}/vim/ftplugin
%doc %{_datadir}/vim/ftplugin/README.txt
%{_datadir}/vim/ftplugin/*.vim
@@ -1360,6 +1370,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.502 2010/04/07 06:02:17 glen
+- up to 7.2.411
+- add gui bcond to disable all gui builds
+- package datadir/vim/ftdetect
+
Revision 1.501 2010/03/16 19:06:04 glen
- recognize files in /lib/udev/rules
================================================================
Index: packages/vim/7.2.395
diff -u /dev/null packages/vim/7.2.395:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.395 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,60 @@
+To: [email protected]
+Subject: Patch 7.2.395
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.395
+Problem: In help CTRL=] on g?g? escapes the ?, causing it to fail. (Tony
+ Mechelynck)
+Solution: Don't escape ? for a help command. (Sergey Khorev)
+Files: src/normal.c
+
+
+*** ../vim-7.2.394/src/normal.c 2010-01-19 15:23:38.000000000 +0100
+--- src/normal.c 2010-03-13 13:04:46.000000000 +0100
+***************
+*** 5526,5536 ****
+ break;
+
+ default:
+ if (curbuf->b_help)
+ STRCPY(buf, "he! ");
+ else
+ {
+- tag_cmd = TRUE;
+ if (g_cmd)
+ STRCPY(buf, "tj ");
+ else
+--- 5526,5536 ----
+ break;
+
+ default:
++ tag_cmd = TRUE;
+ if (curbuf->b_help)
+ STRCPY(buf, "he! ");
+ else
+ {
+ if (g_cmd)
+ STRCPY(buf, "tj ");
+ else
+*** ../vim-7.2.394/src/version.c 2010-03-10 17:14:07.000000000 +0100
+--- src/version.c 2010-03-17 13:05:11.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 395,
+ /**/
+
+--
+There are three kinds of people: Those who can count & those who can't.
+
+ /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.396
diff -u /dev/null packages/vim/7.2.396:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.396 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,51 @@
+To: [email protected]
+Subject: Patch 7.2.396
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.396
+Problem: Get E38 errors. (Dasn)
+Solution: Set cursor to line 1 instead of 0. (Dominique Pelle)
+Files: src/popupmnu.c
+
+
+*** ../vim-7.2.395/src/popupmnu.c 2010-01-19 18:05:05.000000000 +0100
+--- src/popupmnu.c 2010-03-17 12:59:01.000000000 +0100
+***************
+*** 640,646 ****
+
+ curbuf->b_changed = 0;
+ curbuf->b_p_ma = FALSE;
+! curwin->w_cursor.lnum = 0;
+ curwin->w_cursor.col = 0;
+
+ if (curwin != curwin_save && win_valid(curwin_save))
+--- 640,646 ----
+
+ curbuf->b_changed = 0;
+ curbuf->b_p_ma = FALSE;
+! curwin->w_cursor.lnum = 1;
+ curwin->w_cursor.col = 0;
+
+ if (curwin != curwin_save && win_valid(curwin_save))
+*** ../vim-7.2.395/src/version.c 2010-03-17 13:07:01.000000000 +0100
+--- src/version.c 2010-03-17 14:47:30.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 396,
+ /**/
+
+--
+There are 10 kinds of people: Those who understand binary and those who don't.
+
+ /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.397
diff -u /dev/null packages/vim/7.2.397:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.397 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,67 @@
+To: [email protected]
+Subject: Patch 7.2.397
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.397
+Problem: Redundant check for w_lines_valid.
+Solution: Remove the if. (Lech Lorens)
+Files: src/fold.c
+
+
+*** ../vim-7.2.396/src/fold.c 2010-02-24 14:34:10.000000000 +0100
+--- src/fold.c 2010-03-17 13:03:00.000000000 +0100
+***************
+*** 1053,1067 ****
+ {
+ int i;
+
+! if (win->w_lines_valid > 0)
+! for (i = 0; i < win->w_lines_valid; ++i)
+! if (win->w_lines[i].wl_valid)
+! {
+! if (lnum < win->w_lines[i].wl_lnum)
+! return -1;
+! if (lnum <= win->w_lines[i].wl_lastlnum)
+! return i;
+! }
+ return -1;
+ }
+
+--- 1053,1066 ----
+ {
+ int i;
+
+! for (i = 0; i < win->w_lines_valid; ++i)
+! if (win->w_lines[i].wl_valid)
+! {
+! if (lnum < win->w_lines[i].wl_lnum)
+! return -1;
+! if (lnum <= win->w_lines[i].wl_lastlnum)
+! return i;
+! }
+ return -1;
+ }
+
+*** ../vim-7.2.396/src/version.c 2010-03-17 14:47:56.000000000 +0100
+--- src/version.c 2010-03-17 16:43:34.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 397,
+ /**/
+
+--
+Did you ever stop to think... and forget to start again?
+ -- Steven Wright
+
+ /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.398
diff -u /dev/null packages/vim/7.2.398:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.398 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,152 @@
+To: [email protected]
+Subject: Patch 7.2.398
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.398
+Problem: When moving windows the cursor ends up in the wrong line.
+Solution: Set the window width and height properly. (Lech Lorens)
+Files: src/window.c
+
+
+*** ../vim-7.2.397/src/window.c 2010-01-27 20:26:41.000000000 +0100
+--- src/window.c 2010-03-17 16:40:06.000000000 +0100
+***************
+*** 991,1018 ****
+ wp->w_p_scr = curwin->w_p_scr;
+ if (need_status)
+ {
+! --oldwin->w_height;
+ oldwin->w_status_height = need_status;
+ }
+ if (flags & (WSP_TOP | WSP_BOT))
+ {
+ /* set height and row of new window to full height */
+ wp->w_winrow = tabline_height();
+! wp->w_height = curfrp->fr_height - (p_ls > 0);
+ wp->w_status_height = (p_ls > 0);
+ }
+ else
+ {
+ /* height and row of new window is same as current window */
+ wp->w_winrow = oldwin->w_winrow;
+! wp->w_height = oldwin->w_height;
+ wp->w_status_height = oldwin->w_status_height;
+ }
+ frp->fr_height = curfrp->fr_height;
+
+ /* "new_size" of the current window goes to the new window, use
+ * one column for the vertical separator */
+! wp->w_width = new_size;
+ if (before)
+ wp->w_vsep_width = 1;
+ else
+--- 991,1018 ----
+ wp->w_p_scr = curwin->w_p_scr;
+ if (need_status)
+ {
+! win_new_height(oldwin, oldwin->w_height - 1);
+ oldwin->w_status_height = need_status;
+ }
+ if (flags & (WSP_TOP | WSP_BOT))
+ {
+ /* set height and row of new window to full height */
+ wp->w_winrow = tabline_height();
+! win_new_height(wp, curfrp->fr_height - (p_ls > 0));
+ wp->w_status_height = (p_ls > 0);
+ }
+ else
+ {
+ /* height and row of new window is same as current window */
+ wp->w_winrow = oldwin->w_winrow;
+! win_new_height(wp, oldwin->w_height);
+ wp->w_status_height = oldwin->w_status_height;
+ }
+ frp->fr_height = curfrp->fr_height;
+
+ /* "new_size" of the current window goes to the new window, use
+ * one column for the vertical separator */
+! win_new_width(wp, new_size);
+ if (before)
+ wp->w_vsep_width = 1;
+ else
+***************
+*** 1049,1061 ****
+ if (flags & (WSP_TOP | WSP_BOT))
+ {
+ wp->w_wincol = 0;
+! wp->w_width = Columns;
+ wp->w_vsep_width = 0;
+ }
+ else
+ {
+ wp->w_wincol = oldwin->w_wincol;
+! wp->w_width = oldwin->w_width;
+ wp->w_vsep_width = oldwin->w_vsep_width;
+ }
+ frp->fr_width = curfrp->fr_width;
+--- 1049,1061 ----
+ if (flags & (WSP_TOP | WSP_BOT))
+ {
+ wp->w_wincol = 0;
+! win_new_width(wp, Columns);
+ wp->w_vsep_width = 0;
+ }
+ else
+ {
+ wp->w_wincol = oldwin->w_wincol;
+! win_new_width(wp, oldwin->w_width);
+ wp->w_vsep_width = oldwin->w_vsep_width;
+ }
+ frp->fr_width = curfrp->fr_width;
+***************
+*** 1111,1117 ****
+ }
+
+ /*
+! * make the new window the current window and redraw
+ */
+ if (do_equal || dir != 0)
+ win_equal(wp, TRUE,
+--- 1111,1117 ----
+ }
+
+ /*
+! * equalize the window sizes.
+ */
+ if (do_equal || dir != 0)
+ win_equal(wp, TRUE,
+***************
+*** 1143,1148 ****
+--- 1143,1152 ----
+ if (size != 0)
+ p_wh = size;
+ }
++
++ /*
++ * make the new window the current window
++ */
+ win_enter(wp, FALSE);
+ #ifdef FEAT_VERTSPLIT
+ if (flags & WSP_VERT)
+*** ../vim-7.2.397/src/version.c 2010-03-17 16:45:04.000000000 +0100
+--- src/version.c 2010-03-17 16:53:51.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 398,
+ /**/
+
+--
+It's not hard to meet expenses, they're everywhere.
+
+ /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.399
diff -u /dev/null packages/vim/7.2.399:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.399 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,63 @@
+To: [email protected]
+Subject: Patch 7.2.399 (extra)
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.399 (extra, after 7.2.388)
+Problem: Cannot compile on MingW.
+Solution: Move ifneq to separate line. (Vlad Sandrini, Dominique Pelle)
+Files: src/Make_ming.mak
+
+
+*** ../vim-7.2.398/src/Make_ming.mak 2010-03-10 13:19:28.000000000 +0100
+--- src/Make_ming.mak 2010-03-17 17:23:31.000000000 +0100
+***************
+*** 215,226 ****
+ ifndef RUBY_PLATFORM
+ ifeq ($(RUBY_VER), 16)
+ RUBY_PLATFORM = i586-mswin32
+! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)",
X)
+ RUBY_PLATFORM = i386-mingw32
+ else
+ RUBY_PLATFORM = i386-mswin32
+ endif
+ endif
+
+ ifndef RUBY_INSTALL_NAME
+ ifeq ($(RUBY_VER), 16)
+--- 215,228 ----
+ ifndef RUBY_PLATFORM
+ ifeq ($(RUBY_VER), 16)
+ RUBY_PLATFORM = i586-mswin32
+! else
+! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
+ RUBY_PLATFORM = i386-mingw32
+ else
+ RUBY_PLATFORM = i386-mswin32
+ endif
+ endif
++ endif
+
+ ifndef RUBY_INSTALL_NAME
+ ifeq ($(RUBY_VER), 16)
+*** ../vim-7.2.398/src/version.c 2010-03-17 16:54:51.000000000 +0100
+--- src/version.c 2010-03-17 17:23:40.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 399,
+ /**/
+
+--
+Life is a gift, living is an art. (Bram Moolenaar)
+
+ /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.400
diff -u /dev/null packages/vim/7.2.400:1.1
--- /dev/null Wed Apr 7 08:02:23 2010
+++ packages/vim/7.2.400 Wed Apr 7 08:02:17 2010
@@ -0,0 +1,454 @@
+To: [email protected]
+Subject: Patch 7.2.400
+Fcc: outbox
+From: Bram Moolenaar <[email protected]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.400 (after 7.2.387)
+Problem: Dynamic Ruby is not initialised properly for version 1.9.1.
+ Ruby cannot create strings from NULL.
+Solution: Cleanup #ifdefs. Handle NULL like an empty string. Add
+ ruby_init_stack. (Sergey Khorev)
+Files: src/if_ruby.c
+
+
+*** ../vim-7.2.399/src/if_ruby.c 2010-03-10 12:46:38.000000000 +0100
+--- src/if_ruby.c 2010-03-17 17:37:53.000000000 +0100
+***************
+*** 53,58 ****
+--- 53,63 ----
+ # undef _WIN32_WINNT
+ #endif
+
++ #if (defined(RUBY_VERSION) && RUBY_VERSION >= 19) \
++ || (defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19)
++ # define RUBY19_OR_LATER 1
++ #endif
++
+ #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+ /* Ruby 1.9 defines a number of static functions which use rb_num2long and
+ * rb_int2big */
+***************
+*** 61,67 ****
+ #endif
+
+ #include <ruby.h>
+! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+ # include <ruby/encoding.h>
+ #endif
+
+--- 66,72 ----
+ #endif
+
+ #include <ruby.h>
+! #ifdef RUBY19_OR_LATER
+ # include <ruby/encoding.h>
+ #endif
+
+***************
+*** 172,179 ****
+ # define rb_ary_new dll_rb_ary_new
+ # define rb_ary_push dll_rb_ary_push
+ #endif
+! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+ # define rb_errinfo dll_rb_errinfo
+ #else
+ # define ruby_errinfo (*dll_ruby_errinfo)
+--- 177,183 ----
+ # define rb_ary_new dll_rb_ary_new
+ # define rb_ary_push dll_rb_ary_push
+ #endif
+! #ifdef RUBY19_OR_LATER
+ # define rb_errinfo dll_rb_errinfo
+ #else
+ # define ruby_errinfo (*dll_ruby_errinfo)
+***************
+*** 185,196 ****
+ # define rb_w32_snprintf dll_rb_w32_snprintf
+ #endif
+
+! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19
+ # define ruby_script dll_ruby_script
+ # define rb_enc_find_index dll_rb_enc_find_index
+ # define rb_enc_find dll_rb_enc_find
+ # define rb_enc_str_new dll_rb_enc_str_new
+ # define rb_sprintf dll_rb_sprintf
+ #endif
+
+ /*
+--- 189,201 ----
+ # define rb_w32_snprintf dll_rb_w32_snprintf
+ #endif
+
+! #ifdef RUBY19_OR_LATER
+ # define ruby_script dll_ruby_script
+ # define rb_enc_find_index dll_rb_enc_find_index
+ # define rb_enc_find dll_rb_enc_find
+ # define rb_enc_str_new dll_rb_enc_str_new
+ # define rb_sprintf dll_rb_sprintf
++ # define ruby_init_stack dll_ruby_init_stack
+ #endif
+
+ /*
+***************
+*** 240,247 ****
+ static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
+ static VALUE (*dll_rb_str_new) (const char*, long);
+ static VALUE (*dll_rb_str_new2) (const char*);
+! #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 \
+! || defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19
+ static VALUE (*dll_rb_errinfo) (void);
+ #else
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.501&r2=1.502&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
