From 496411e61d0c598adc6d9662a93402c3e1e73759 Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Sun, 18 Feb 2018 13:34:48 -0800 Subject: [PATCH] vim-youcompleteme remove argparse submodule, update package version --- vim-youcompleteme-git/.SRCINFO | 4 +--- vim-youcompleteme-git/PKGBUILD | 11 +++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/vim-youcompleteme-git/.SRCINFO b/vim-youcompleteme-git/.SRCINFO index 91b5c15..fe63c2c 100644 --- a/vim-youcompleteme-git/.SRCINFO +++ b/vim-youcompleteme-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = vim-youcompleteme-git pkgdesc = A code-completion engine for Vim - pkgver = 2229.ad41dfb8 + pkgver = 2264.92405cb0 pkgrel = 1 url = http://valloric.github.com/YouCompleteMe/ install = install @@ -31,7 +31,6 @@ pkgbase = vim-youcompleteme-git source = git+https://github.com/ross/requests-futures.git source = git+https://github.com/Valloric/ycmd.git source = git+https://github.com/kennethreitz/requests.git - source = git+https://github.com/bewest/argparse.git source = git+https://github.com/bottlepy/bottle.git source = git+https://github.com/slezica/python-frozendict.git source = git+https://github.com/PythonCharmers/python-future.git @@ -60,7 +59,6 @@ pkgbase = vim-youcompleteme-git sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP pkgname = vim-youcompleteme-git diff --git a/vim-youcompleteme-git/PKGBUILD b/vim-youcompleteme-git/PKGBUILD index d8c7aca..398fc7a 100644 --- a/vim-youcompleteme-git/PKGBUILD +++ b/vim-youcompleteme-git/PKGBUILD @@ -33,7 +33,7 @@ _completer="ON" ########################################################################################################### pkgname=vim-youcompleteme-git -pkgver=2229.ad41dfb8 +pkgver=2264.92405cb0 pkgver() { cd "YouCompleteMe" || exit echo "$(git rev-list --count master).$(git rev-parse --short master)" @@ -63,7 +63,6 @@ source=('git+https://github.com/Valloric/YouCompleteMe.git' #ycm 'git+https://github.com/ross/requests-futures.git' #ycm 'git+https://github.com/Valloric/ycmd.git' #ycm 'git+https://github.com/kennethreitz/requests.git' #ycmd - 'git+https://github.com/bewest/argparse.git' #ycmd 'git+https://github.com/bottlepy/bottle.git' #ycmd 'git+https://github.com/slezica/python-frozendict.git' #ycmd 'git+https://github.com/PythonCharmers/python-future.git' #ycmd @@ -81,7 +80,7 @@ source=('git+https://github.com/Valloric/YouCompleteMe.git' #ycm [[ "$_gocode" = "y" ]] && source+=('git+https://github.com/nsf/gocode.git' #ycmd 'git+https://github.com/Manishearth/godef.git' #ycmd ) -sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') +sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') [[ "$_omnisharp" = "y" ]] && sha256sums+=('SKIP' 'SKIP' 'SKIP') [[ "$_rust" = "y" ]] && sha256sums+=('SKIP') @@ -95,13 +94,13 @@ prepare() { YouCompleteMe=("requests-futures" "ycmd") gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}" - ycmd=("argparse" "bottle" "python-frozendict" "python-future" "JediHTTP" "waitress" "requests") + ycmd=("bottle" "python-frozendict" "python-future" "JediHTTP" "waitress" "requests") [[ "$_omnisharp" = "y" ]] && ycmd+=("OmniSharpServer") [[ "$_rust" = "y" ]] && ycmd+=("racerd") [[ "$_gocode" = "y" ]] && ycmd+=("gocode" "godef") gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}" - JediHTTP=("argparse" "waitress" "jedi" "bottle") + JediHTTP=("waitress" "jedi" "bottle") gitprepare "YouCompleteMe/third_party/ycmd/third_party/JediHTTP" "vendor/" "${JediHTTP[@]}" if [ "$_omnisharp" = "y" ]; then @@ -185,7 +184,7 @@ package() { "$pkgdir/usr/share/vim/vimfiles/third_party" cp -r "$srcdir/YouCompleteMe/third_party/ycmd/"{ycmd,ycm_core.so,CORE_VERSION,cpp,clang_includes} \ "$pkgdir/usr/share/vim/vimfiles/third_party/ycmd" - cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{argparse,bottle,frozendict,JediHTTP,python-future,requests,waitress} \ + cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,frozendict,JediHTTP,python-future,requests,waitress} \ "$pkgdir/usr/share/vim/vimfiles/third_party/ycmd/third_party" if [ "$_omnisharp" = "y" ]; then