- updated to 8.1.2084

diff --git a/desktop.patch b/desktop.patch
index f4ebd27de31fd393fe001e48a11f6ab4a2342013..dbe9c324d94f33851f7b197ec3d40373821445d1 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -11,12 +11,14 @@
 --- vim-7.4.979/gvim-athena.desktop~   2015-12-19 16:28:18.000000000 +0200
 +++ vim-7.4.979/gvim-athena.desktop    2015-12-28 08:24:02.106735918 +0200
 @@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim Athena
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim Athena
+ # Translators: This is the Generic Application Name used in the Vim desktop file
  GenericName[de]=Texteditor
+ GenericName[eo]=Tekstoredaktilo
 @@ -71,7 +71,7 @@
  Comment[zh_CN]=编辑文本文件
  Comment[zh_TW]=編輯文字檔
@@ -29,21 +31,24 @@
  Icon=gvim
 --- vim-7.4.979/gvim-gnome.desktop~    2015-12-28 08:32:38.000000000 +0200
 +++ vim-7.4.979/gvim-gnome.desktop     2015-12-28 08:33:14.285396908 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim GNOME
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim GNOME
+ # Translators: This is the Generic Application Name used in the Vim desktop file
  GenericName[de]=Texteditor
  GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
 -Comment=Edit text files
 +Comment=The vi editor for X Window System with GNOME L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
 @@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
  Comment[no]=Rediger tekstfiler
  Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
@@ -70,21 +75,24 @@
  MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 --- vim-7.4.979/gvim-gtk.desktop~      2015-12-19 16:28:18.000000000 +0200
 +++ vim-7.4.979/gvim-gtk.desktop       2015-12-28 08:29:28.577015888 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim GTK
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim GTK
+ # Translators: This is the Generic Application Name used in the Vim desktop file
  GenericName[de]=Texteditor
  GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14 @@
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
 -Comment=Edit text files
 +Comment=The vi editor for X Window System with GTK L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
 @@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
  Comment[no]=Rediger tekstfiler
  Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
@@ -111,21 +119,24 @@
  MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 --- vim-7.4.979/gvim-motif.desktop~    2015-12-19 16:28:18.000000000 +0200
 +++ vim-7.4.979/gvim-motif.desktop     2015-12-28 08:31:11.245677767 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Name=gVim
-+Name=gVim Motif
- GenericName=Text Editor
- GenericName[da]=Teksteditor
+@@ -1,5 +1,5 @@
+ # Translators: This is the Application Name used in the GVim desktop file
+ Name[de]=GVim
+ Name[eo]=GVim
+-Name=GVim
++Name=GVim Motif
+ # Translators: This is the Generic Application Name used in the Vim desktop file
  GenericName[de]=Texteditor
  GenericName[eo]=Tekstoredaktilo
- GenericName[fr]=Éditeur de texte
- GenericName[pl]=Edytor tekstu
+@@ -1,14 +1,14 @@
+ Comment[de]=Textdateien bearbeiten
+ Comment[eo]=Redakti tekstajn dosierojn
+ Comment[ja]=テキストファイルを編集します
 -Comment=Edit text files
 +Comment=The vi editor for X Window System with Motif L&F
- Comment[af]=Redigeer tekslêers
- Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
- Comment[ar]=حرّر ملفات نصية
+ # The translations should come from the po file. Leave them here for now, they will
+ # be overwritten by the po file when generating the desktop.file!
+ GenericName[da]=Teksteditor
 @@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
  Comment[no]=Rediger tekstfiler
  Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ

diff --git a/vim-autopaste.patch b/vim-autopaste.patch
index 5314948dfebbc3278b055a99a93042b0f149a3dd..ac5148c7b03cb3f1bfdf6a5f8c26c505db949439 100644 (file)
--- a/vim-autopaste.patch
+++ b/vim-autopaste.patch
@@ -39,9 +39,9 @@ diff -cr vim70.orig/src/getchar.c vim70/src/getchar.c
       /*
        * If a character was put back with vungetc, it was already processed.
        * Return it directly.
---- vim72/src/option.c~        2009-05-18 22:23:40.000000000 +0300
-+++ vim72/src/option.c 2009-05-18 22:30:25.277259155 +0300
-@@ -535,6 +535,9 @@
+--- vim72/src/optiondefs.h~    2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/optiondefs.h     2009-05-18 22:30:25.277259155 +0300
+@@ -377,6 +377,9 @@
      {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
                            (char_u *)&p_ai, PV_AI,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
@@ -51,16 +51,13 @@ diff -cr vim70.orig/src/getchar.c vim70/src/getchar.c
      {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
                            (char_u *)NULL, PV_NONE,
                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
-diff -cr vim70.orig/src/option.h vim70/src/option.h
-*** vim70.orig/src/option.h    2006-09-12 21:47:30.000000000 -0400
---- vim70/src/option.h 2006-09-12 21:54:23.000000000 -0400
-***************
-*** 312,317 ****
---- 312,318 ----
-  #if defined(FEAT_GUI) && defined(MACOS_X)
-  EXTERN int   *p_antialias;   /* 'antialias' */
-  #endif
-+ EXTERN int      p_apa;          /* 'autopaste' */
-  EXTERN int   p_ar;           /* 'autoread' */
-  EXTERN int   p_aw;           /* 'autowrite' */
-  EXTERN int   p_awa;          /* 'autowriteall' */
+--- vim72/src/option.h~        2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300
+@@ -312,6 +312,7 @@
+ #if defined(FEAT_GUI) && defined(MACOS_X)
+ EXTERN int    *p_antialias;   // 'antialias'
+ #endif
++EXTERN int      p_apa;          /* 'autopaste' */
+ EXTERN int    p_ar;           // 'autoread'
+ EXTERN int    p_aw;           // 'autowrite'
+ EXTERN int    p_awa;          // 'autowriteall'

diff --git a/vim-filetypes.patch b/vim-filetypes.patch
index b6367dbc7f3983c9537755f091375fa9390e8ccc..b9f2e2446e46c289fe16cf873a0184f91e10ef7e 100644 (file)
--- a/vim-filetypes.patch
+++ b/vim-filetypes.patch
@@ -1,11 +1,11 @@
 --- vim-7.0/runtime/filetype.vim~      2006-04-29 14:54:54.702689335 +0300
 +++ vim-7.0/runtime/filetype.vim       2006-04-29 14:56:07.254310876 +0300
-@@ -99,7 +99,7 @@
- au BufNewFile,BufRead build.xml                       setf ant
+@@ -1974,7 +1974,7 @@
  
- " Apache style config file
--au BufNewFile,BufRead proftpd.conf*           call s:StarSetf('apachestyle')
+ " More Apache style config files
+ au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*    call s:StarSetf('apachestyle')
+-au BufNewFile,BufRead proftpd.conf*                                   call s:StarSetf('apachestyle')
 +au BufNewFile,BufRead /etc/ftpd/conf.d/*.conf,proftpd*.conf*          call s:StarSetf('apachestyle')
  
- " Apache config file
- au BufNewFile,BufRead .htaccess                        setf apache
+ " More Apache config files
+ au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*   call s:StarSetf('apache')

diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 80d89a4d50f67b021521f0db24d9bbce08c3d534..25db1d6750be79cf9db027f09a657ddb2af4f70b 100644 (file)
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -1,27 +1,26 @@
 diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
 --- vim62.orig/src/misc1.c     2003-11-11 18:53:52.000000000 +0100
 +++ vim62/src/misc1.c  2003-11-11 19:29:32.000000000 +0100
-@@ -3333,7 +3333,7 @@
-     if (STRCMP(name, "HOME") == 0)
-       return homedir;
- #endif
--
+@@ -2220,12 +2220,19 @@
+       return p;
+     }
+ #else
 +first_test:
      p = mch_getenv(name);
-     if (p != NULL && *p == NUL)           /* empty is the same as not set */
+     if (p != NULL && *p == NUL)           // empty is the same as not set
        p = NULL;
-@@ -3341,6 +3341,11 @@
+ 
      if (p != NULL)
        return p;
- 
++
 +    if (strcmp(name, "HOME_ETC") == 0) {
-+      name = "HOME";
-+      goto first_test;
++      name = "HOME";
++      goto first_test;
 +    }
 +
-     vimruntime = (STRCMP(name, "VIMRUNTIME") == 0);
-     if (!vimruntime && STRCMP(name, "VIM") != 0)
-       return NULL;
+ #endif
+ 
+     // handling $VIMRUNTIME and $VIM is below, bail out if it's another name.
 --- vim62.orig/src/os_unix.h   2003-11-11 18:53:52.000000000 +0100
 +++ vim62/src/os_unix.h        2003-11-11 19:53:54.000000000 +0100
 @@ -264,7 +264,7 @@

diff --git a/vim.spec b/vim.spec
index 89ff8abf71c2e0acaf08dc05668c6267531a27f9..8b0ea2bffbf3be42487ab59ee86d3e8df44b15fe 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -29,7 +29,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define                ver             8.1.1005
+%define                ver             8.1.2084
 %define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
@@ -50,7 +50,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: 66228b5c4c1a3e0892bd24a3f08a5ea3
+# Source0-md5: b791e84cdf321c6fea5942120c962b75
 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