diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-22 01:42:51 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-22 01:34:36 +0200 |
| commit | 52f2f7fa4c47dd53865ccc155d3441776bb85219 (patch) | |
| tree | 8c58f2f414a404dd679cab714b44cfdbc16a6233 | |
| parent | 512edc04d2e3e2e10b9cf9d8abb1fe87213ded49 (diff) | |
| download | aports-52f2f7fa4c47dd53865ccc155d3441776bb85219.tar.bz2 aports-52f2f7fa4c47dd53865ccc155d3441776bb85219.tar.xz | |
community/vim-editorconfig: upgrade to snapshot 20180620
| -rw-r--r-- | community/vim-editorconfig/APKBUILD | 10 | ||||
| -rw-r--r-- | community/vim-editorconfig/fix-config-parsing.patch | 46 |
2 files changed, 4 insertions, 52 deletions
diff --git a/community/vim-editorconfig/APKBUILD b/community/vim-editorconfig/APKBUILD index 937d779373..60c40ec243 100644 --- a/community/vim-editorconfig/APKBUILD +++ b/community/vim-editorconfig/APKBUILD @@ -1,15 +1,14 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=vim-editorconfig -pkgver=0_git20170721 -_gitrev=14ad5ced8b9daad219f1e48b121dbbd66c20d3a6 +pkgver=0_git20180620 +_gitrev=efc613f02a7499fd1c2348cf208f10c43a9c57bc pkgrel=0 pkgdesc="EditorConfig plugin for vim written in vimscript only" url="https://github.com/sgur/vim-editorconfig" arch="noarch" license="MIT" -source="$pkgname-$pkgver.tar.gz::https://github.com/sgur/$pkgname/archive/$_gitrev.tar.gz - fix-config-parsing.patch" +source="$pkgname-$_gitrev.tar.gz::https://github.com/sgur/$pkgname/archive/$_gitrev.tar.gz" builddir="$srcdir/$pkgname-$_gitrev" options="!check" # there are no tests @@ -21,5 +20,4 @@ package() { cp -r autoload doc ftdetect ftplugin plugin "$destdir"/ } -sha512sums="61deaedcb6034f6de2cb8bb28e23a1aba2ca74fdf482421078f50c832d2128663bb89279534e7b2e37a00ba7b2cd5dd1d080c452975761fcac7a29a07ce69576 vim-editorconfig-0_git20170721.tar.gz -d2b17733aa77d50326807d033cacffb74eb4fdf91721255ff58c1821e3488cb46f0014f73afc5630dc75c2a6ea3ee91c37699433326bf4ee9eed80a2ed709620 fix-config-parsing.patch" +sha512sums="a4843b7e6397a604246cf8d93682ccd936744595eae52db973768267cae0a3050a536187088c31b7746b3b6121a2714dae221c0439ced0effd3c96a88410b46f vim-editorconfig-efc613f02a7499fd1c2348cf208f10c43a9c57bc.tar.gz" diff --git a/community/vim-editorconfig/fix-config-parsing.patch b/community/vim-editorconfig/fix-config-parsing.patch deleted file mode 100644 index 806407d405..0000000000 --- a/community/vim-editorconfig/fix-config-parsing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 69f86d1077b226a7535b1dec06d5bbf0fb2a89cd Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 23 Oct 2017 18:23:33 +0200 -Subject: [PATCH] Fix trimming of empty comments - -For example this .editorconfig: - -``` -; Lorem ipsum -; -; dolor sit amet - -root = true -``` - -is parsed incorrectly: - -s:parse_properties(...) -> [], {} - s:trim(...) -> [';', 'root = true'] - s:remove_comment(';') -> ';' - -This commit fixes this issue. - -Patch-Source: https://github.com/sgur/vim-editorconfig/pull/15 ---- - autoload/editorconfig.vim | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/autoload/editorconfig.vim b/autoload/editorconfig.vim -index b0e4240..469172d 100644 ---- a/autoload/editorconfig.vim -+++ b/autoload/editorconfig.vim -@@ -203,9 +203,11 @@ endfunction "}}} - " - " >>> echo s:remove_comment('bar') - " bar -+" >>> echo s:remove_comment('#') -+" - - function! s:remove_comment(line) abort "{{{ -- let pos = match(a:line, '\s*[;#].\+') -+ let pos = match(a:line, '\s*[;#].*') - return pos == -1 ? a:line : pos == 0 ? '' : a:line[: pos-1] - endfunction "}}} - --- |