[packages/vim] - up to 7.4.1236
arekm
arekm at pld-linux.org
Mon Feb 1 23:38:19 CET 2016
commit 4ca24e06c2cd9b3cc427145959cf7606e3b2e624
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Feb 1 23:38:12 2016 +0100
- up to 7.4.1236
vim-home_etc.patch | 31 ++++++++++++++++---------------
vim-localedir.patch | 11 ++++++-----
vim.spec | 6 +++---
3 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index 9b57c52..d85ff4e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -28,8 +28,8 @@
# tail -n1 sources | awk '{print $2}'
# VCS Commits: https://github.com/vim/vim/commits/master
-%define ver 7.4.979
-%define rel 4
+%define ver 7.4.1236
+%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -49,7 +49,7 @@ License: Charityware
Group: Applications/Editors/Vim
#Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: dc289e3d5dd1b25e1e976ce7e704b47c
+# Source0-md5: bca123584eb843c485c687861d54ad27
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip
diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 57497c1..cf2eb79 100644
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -60,24 +60,25 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
# endif
# endif
# if !defined(VIMINFO_FILE2) && defined(OS2)
-@@ -373,7 +373,7 @@
- # ifdef VMS
- # define DFLT_VDIR "sys$login:vimfiles/view"
- # else
--# define DFLT_VDIR "$HOME/.vim/view" /* default for 'viewdir' */
-+# define DFLT_VDIR "$HOME_ETC/.vim/view" /* default for 'viewdir' */
- # endif
+@@ -362,7 +362,7 @@ typedef struct dsc$descriptor DESC;
+ # ifdef VMS
+ # define DFLT_VDIR "sys$login:vimfiles/view"
+ # else
+-# define DFLT_VDIR "$HOME/.vim/view" /* default for 'viewdir' */
++# define DFLT_VDIR "$HOME_ETC/.vim/view" /* default for 'viewdir' */
# endif
#endif
+
@@ -387,9 +387,9 @@
- # define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+ # define DFLT_RUNTIMEPATH "sys$login:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,sys$login:vimfiles/after"
+ #else
+ # ifdef RUNTIME_GLOBAL
+-# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
++# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
# else
- # ifdef RUNTIME_GLOBAL
--# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.vim/after"
-+# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$HOME_ETC/.vim/after"
- # else
--# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
-+# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
- # endif
+-# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
++# define DFLT_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME_ETC/.vim/after"
# endif
#endif
+
+ #ifndef VMS
diff --git a/vim-localedir.patch b/vim-localedir.patch
index 67f6a27..0a24c44 100644
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -1,6 +1,6 @@
--- vim72/src/main.c~ 2009-04-15 01:00:47.000000000 +0300
+++ vim72/src/main.c 2009-04-15 01:11:33.555899981 +0300
-@@ -1382,23 +1382,10 @@
+@@ -1573,24 +1573,10 @@ init_locale(void)
# ifdef FEAT_GETTEXT
{
@@ -9,10 +9,10 @@
-
# ifdef DYNAMIC_GETTEXT
/* Initialize the gettext library */
- dyn_libintl_init(NULL);
+ dyn_libintl_init();
# endif
-- /* expand_env() doesn't work yet, because chartab[] is not initialized
-- * yet, call vim_getenv() directly */
+- /* expand_env() doesn't work yet, because g_chartab[] is not
+- * initialized yet, call vim_getenv() directly */
- p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
- if (p != NULL && *p != NUL)
- {
@@ -21,9 +21,10 @@
- }
- if (mustfree)
- vim_free(p);
- textdomain(VIMPACKAGE);
+- textdomain(VIMPACKAGE);
}
# endif
+ }
--- vim72/src/misc1.c~ 2009-04-15 01:00:48.000000000 +0300
+++ vim72/src/misc1.c 2009-04-15 01:13:00.319209732 +0300
@@ -4215,22 +4215,6 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/4ca24e06c2cd9b3cc427145959cf7606e3b2e624
More information about the pld-cvs-commit
mailing list