[packages/vim] - up to 8.1.0474
arekm
arekm at pld-linux.org
Sun Oct 14 18:00:48 CEST 2018
commit 079815b642f5f91e1d1fb44750558a5511a91447
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Oct 14 18:00:40 2018 +0200
- up to 8.1.0474
vim-autopaste.patch | 6 +--
vim-man_installation.patch | 99 +---------------------------------------------
vim.spec | 6 +--
3 files changed, 7 insertions(+), 104 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index 50f2a03..2cd7020 100644
--- a/vim.spec
+++ b/vim.spec
@@ -29,8 +29,8 @@
# 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.0250
-%define rel 2
+%define ver 8.1.0474
+%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -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: 5a54e06e6867ddb9e44145313334bdbb
+# Source0-md5: a97763c544f1df6d0633f24392f32c69
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-autopaste.patch b/vim-autopaste.patch
index ba00b38..5314948 100644
--- a/vim-autopaste.patch
+++ b/vim-autopaste.patch
@@ -44,13 +44,13 @@ diff -cr vim70.orig/src/getchar.c vim70/src/getchar.c
@@ -535,6 +535,9 @@
{"autoindent", "ai", P_BOOL|P_VI_DEF,
(char_u *)&p_ai, PV_AI,
- {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+ {"autopaste", "apa", P_BOOL|P_VI_DEF,
+ (char_u *)&p_apa, PV_NONE,
-+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
++ {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
{"autoprint", "ap", P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE,
- {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ {(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
diff --git a/vim-man_installation.patch b/vim-man_installation.patch
index bfd014f..f40acb7 100644
--- a/vim-man_installation.patch
+++ b/vim-man_installation.patch
@@ -137,101 +137,4 @@
-rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl
-rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-??
-rm -f $(SYS_RGB_FILE)
---- vim70/src/main.aap~ 2006-06-06 14:59:26.000000000 +0200
-+++ vim70/src/main.aap 2006-06-06 14:59:26.000000000 +0200
-@@ -658,9 +658,11 @@
- DEST_MAN_IT = $(DEST_MAN_TOP)/it$(MAN1DIR)
- DEST_MAN_IT_I = $(DEST_MAN_TOP)/it.ISO8859-1$(MAN1DIR)
- DEST_MAN_IT_U = $(DEST_MAN_TOP)/it.UTF-8$(MAN1DIR)
--DEST_MAN_PL = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
-+DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
-+DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
- DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
--DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
-+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
-+DEST_MAN_RU_K = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
- DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
-
- # These are directories, create them when needed.
-@@ -671,8 +673,8 @@
- $DEST_SCRIPT $DEST_PRINT $DEST_MAN $DEST_SPELL
- $DEST_MAN_FR $DEST_MAN_FR_I $DEST_MAN_FR_U $DEST_MAN_IT
- $DEST_MAN_IT_I $DEST_MAN_IT_U
-- $DEST_MAN_PL $DEST_MAN_PL_U
-- $DEST_MAN_RU $DEST_MAN_RU_U
-+ $DEST_MAN_PL $DEST_MAN_PL_I $DEST_MAN_PL_U
-+ $DEST_MAN_RU $DEST_MAN_RU_K $DEST_MAN_RU_U
-
- #
- # I N S T A L L
-@@ -904,8 +906,10 @@
- :sys ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
- :sys ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- :sys ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
-+ :sys ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
- :sys ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- :sys ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
-+ :sys ./installman.sh xxd $(DEST_MAN_RU_K) "-ru" $(INSTALLMANARGS)
- :sys ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
-
- # install the language specific files, if they were unpacked
-@@ -918,8 +922,10 @@
- :sys ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
- :sys ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- :sys ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
-+ :sys ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
- :sys ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- :sys ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
-+ :sys ./installman.sh install $(DEST_MAN_RU_K) "-ru" $(INSTALLMANARGS)
- :sys ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
- :chmod 755 installml.sh
- :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
-@@ -937,10 +943,14 @@
- :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_PL) $(INSTALLMLARGS)
- :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
-+ $(DEST_MAN_PL_I) $(INSTALLMLARGS)
-+ :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
- :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_RU) $(INSTALLMLARGS)
- :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
-+ $(DEST_MAN_RU_K) $(INSTALLMLARGS)
-+ :sys ./installml.sh install "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
-
- @if _no.MAKEMO:
-@@ -1072,8 +1082,10 @@
- :sys ./installman.sh uninstall $(DEST_MAN_IT_I) "" $(INSTALLMANARGS)
- :sys ./installman.sh uninstall $(DEST_MAN_IT_U) "" $(INSTALLMANARGS)
- :sys ./installman.sh uninstall $(DEST_MAN_PL) "" $(INSTALLMANARGS)
-+ :sys ./installman.sh uninstall $(DEST_MAN_PL_I) "" $(INSTALLMANARGS)
- :sys ./installman.sh uninstall $(DEST_MAN_PL_U) "" $(INSTALLMANARGS)
- :sys ./installman.sh uninstall $(DEST_MAN_RU) "" $(INSTALLMANARGS)
-+ :sys ./installman.sh uninstall $(DEST_MAN_RU_K) "" $(INSTALLMANARGS)
- :sys ./installman.sh uninstall $(DEST_MAN_RU_U) "" $(INSTALLMANARGS)
- :chmod 755 installml.sh
- :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
-@@ -1093,16 +1105,20 @@
- :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_PL) $(INSTALLMLARGS)
- :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
-+ $(DEST_MAN_PL_I) $(INSTALLMLARGS)
-+ :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
- :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_RU) $(INSTALLMLARGS)
- :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
-+ $(DEST_MAN_RU_K) $(INSTALLMLARGS)
-+ :sys ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
- :del {force} $DEST_MAN/xxd.1
- :del {force} $(DEST_MAN_FR)/xxd.1 $(DEST_MAN_FR_I)/xxd.1 $(DEST_MAN_FR_U)/xxd.1
- :del {force} $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_I)/xxd.1 $(DEST_MAN_IT_U)/xxd.1
-- :del {force} $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_U)/xxd.1
-- :del {force} $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
-+ :del {force} $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1 $(DEST_MAN_PL_U)/xxd.1
-+ :del {force} $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_K)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
-
- :del {force} $DEST_HELP/*.txt $DEST_HELP/tags $DEST_HELP/*.pl
- :del {force} $SYS_MENU_FILE $SYS_SYNMENU_FILE $SYS_DELMENU_FILE
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/079815b642f5f91e1d1fb44750558a5511a91447
More information about the pld-cvs-commit
mailing list