version bump 2 commits vim-youcompleteme-git

This commit is contained in:
Trent Palmer 2021-04-09 19:45:21 -07:00
parent 5aaf6823f3
commit 9ceda53f89
2 changed files with 13 additions and 36 deletions

View File

@ -1,6 +1,6 @@
pkgbase = vim-youcompleteme-git pkgbase = vim-youcompleteme-git
pkgdesc = A code-completion engine for Vim pkgdesc = A code-completion engine for Vim
pkgver = r2789.ed423e8a pkgver = r2791.a3d02238
pkgrel = 1 pkgrel = 1
url = https://github.com/Valloric/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe
install = install install = install
@ -35,11 +35,8 @@ pkgbase = vim-youcompleteme-git
source = git+https://github.com/chardet/chardet.git source = git+https://github.com/chardet/chardet.git
source = git+https://github.com/urllib3/urllib3.git source = git+https://github.com/urllib3/urllib3.git
source = git+https://github.com/bottlepy/bottle.git source = git+https://github.com/bottlepy/bottle.git
source = git+https://github.com/Pylons/waitress.git
source = git+https://bitbucket.org/mrabarnett/mrab-regex.git source = git+https://bitbucket.org/mrabarnett/mrab-regex.git
source = git+https://github.com/gorakhargosh/watchdog source = git+https://github.com/gorakhargosh/watchdog
source = git+https://github.com/gorakhargosh/pathtools
source = git+https://github.com/mitsuhiko/flask-sphinx-themes.git
source = https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.35.4/omnisharp-mono.tar.gz source = https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.35.4/omnisharp-mono.tar.gz
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
@ -57,9 +54,6 @@ pkgbase = vim-youcompleteme-git
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = cc6d03e9f368a386213ce6e5b994789ef1a79aa80398f77bd85146bccc68754a sha256sums = cc6d03e9f368a386213ce6e5b994789ef1a79aa80398f77bd85146bccc68754a
pkgname = vim-youcompleteme-git pkgname = vim-youcompleteme-git

View File

@ -46,7 +46,7 @@ _neovim="$NEOVIM_YOUCOMPLETEME"
# Default PKGBUILD Configuration # # Default PKGBUILD Configuration #
#=========================================================================================================# #=========================================================================================================#
pkgname=vim-youcompleteme-git pkgname=vim-youcompleteme-git
pkgver=r2789.ed423e8a pkgver=r2791.a3d02238
pkgver() { pkgver() {
cd "YouCompleteMe" || exit cd "YouCompleteMe" || exit
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@ -75,13 +75,10 @@ source=(
'git+https://github.com/chardet/chardet.git' #requests 'git+https://github.com/chardet/chardet.git' #requests
'git+https://github.com/urllib3/urllib3.git' #requests 'git+https://github.com/urllib3/urllib3.git' #requests
'git+https://github.com/bottlepy/bottle.git' #ycmd 'git+https://github.com/bottlepy/bottle.git' #ycmd
'git+https://github.com/Pylons/waitress.git' #ycmd,jediHTTP
'git+https://bitbucket.org/mrabarnett/mrab-regex.git' 'git+https://bitbucket.org/mrabarnett/mrab-regex.git'
'git+https://github.com/gorakhargosh/watchdog' 'git+https://github.com/gorakhargosh/watchdog'
'git+https://github.com/gorakhargosh/pathtools'
'git+https://github.com/mitsuhiko/flask-sphinx-themes.git'
) )
sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
#=========================================================================================================# #=========================================================================================================#
#=========================================================================================================# #=========================================================================================================#
@ -127,9 +124,9 @@ if [[ "$_use_system_python" == "n" ]]; then
fi fi
elif [[ "$_use_system_python" == "y" ]]; then elif [[ "$_use_system_python" == "y" ]]; then
if [[ "$_use_python2" == "OFF" ]]; then if [[ "$_use_python2" == "OFF" ]]; then
depends+=('python-requests-futures' 'python-certifi' 'python-bottle' 'python-waitress' 'python-regex') depends+=('python-requests-futures' 'python-certifi' 'python-bottle' 'python-regex')
elif [[ "$_use_python2" == "ON" ]]; then elif [[ "$_use_python2" == "ON" ]]; then
depends+=('python2-requests-futures' 'python2-certifi' 'python2-bottle' 'python2-waitress' 'python2-regex') depends+=('python2-requests-futures' 'python2-certifi' 'python2-bottle' 'python2-regex')
fi fi
fi fi
@ -143,9 +140,9 @@ fi
if [[ "$_use_system_python_watchdog" == "y" ]]; then if [[ "$_use_system_python_watchdog" == "y" ]]; then
if [[ "$_use_python2" == "OFF" ]]; then if [[ "$_use_python2" == "OFF" ]]; then
depends+=('python-watchdog' 'python-pathtools' 'python-flask-sphinx-themes') depends+=('python-watchdog')
elif [[ "$_use_python2" == "ON" ]]; then elif [[ "$_use_python2" == "ON" ]]; then
depends+=('python2-watchdog' 'python2-pathtools') depends+=('python2-watchdog')
fi fi
fi fi
#=========================================================================================================# #=========================================================================================================#
@ -216,22 +213,16 @@ prepare() {
gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}" gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}"
gitprepare "YouCompleteMe" "third_party/requests_deps/" "${YouCompleteMeRequestsDeps[@]}" gitprepare "YouCompleteMe" "third_party/requests_deps/" "${YouCompleteMeRequestsDeps[@]}"
local ycmd=("bottle" "mrab-regex" "waitress") local ycmd=("bottle" "mrab-regex")
gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}" gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}"
local ycmdJediDeps=("jedi" "parso" "numpydoc") local ycmdJediDeps=("jedi" "parso" "numpydoc")
gitprepare "YouCompleteMe/third_party/ycmd" "third_party/jedi_deps" "${ycmdJediDeps[@]}" gitprepare "YouCompleteMe/third_party/ycmd" "third_party/jedi_deps" "${ycmdJediDeps[@]}"
local ycmdRequestsDeps=("python-certifi" "chardet" "idna" "requests" "urllib3") local ycmdWatchdogDeps=("watchdog")
gitprepare "YouCompleteMe/third_party/ycmd" "third_party/requests_deps" "${ycmdRequestsDeps[@]}"
local ycmdWatchdogDeps=("watchdog" "pathtools")
gitprepare "YouCompleteMe/third_party/ycmd" "third_party/watchdog_deps" "${ycmdWatchdogDeps[@]}" gitprepare "YouCompleteMe/third_party/ycmd" "third_party/watchdog_deps" "${ycmdWatchdogDeps[@]}"
local ycmdPathtools_themes=("flask-sphinx-themes")
gitprepare "YouCompleteMe/third_party/ycmd/third_party/watchdog_deps" "pathtools/docs/source" "${ycmdPathtools_themes[@]}"
if [[ "$_use_OmniSharp_Roslyn" == "y" ]];then if [[ "$_use_OmniSharp_Roslyn" == "y" ]];then
if [[ "$_use_system_OmniSharp_Roslyn" == "n" ]];then if [[ "$_use_system_OmniSharp_Roslyn" == "n" ]];then
mkdir -p "$srcdir/omnisharp-roslyn" mkdir -p "$srcdir/omnisharp-roslyn"
@ -281,7 +272,7 @@ build() {
msg2 'Building gopls for go completion...' # BuildGoCode() msg2 'Building gopls for go completion...' # BuildGoCode()
cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/go" || exit cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/go" || exit
# find gopls version by grepping third_party/ycmd/build.py # find gopls version by grepping third_party/ycmd/build.py
go get golang.org/x/tools/gopls@v0.5.1 go get golang.org/x/tools/gopls@v0.6.4
else else
msg2 'Skipping Gocode completer...' msg2 'Skipping Gocode completer...'
fi fi
@ -332,7 +323,7 @@ package() {
mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party" mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/"{ycmd,ycm_core.so,CORE_VERSION} \ cp -r "$srcdir/YouCompleteMe/third_party/ycmd/"{ycmd,ycm_core.cpython-*-x86_64-linux-gnu.so,CORE_VERSION} \
"$pkgdir/$vimfiles_dir/third_party/ycmd" "$pkgdir/$vimfiles_dir/third_party/ycmd"
cp -r "$srcdir/YouCompleteMe/"{autoload,doc,plugin,python} \ cp -r "$srcdir/YouCompleteMe/"{autoload,doc,plugin,python} \
@ -352,7 +343,6 @@ package() {
fi fi
if [[ "$_use_system_python" == "n" ]]; then if [[ "$_use_system_python" == "n" ]]; then
mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/requests_deps"
mkdir -p "$pkgdir/$vimfiles_dir/third_party/requests_deps" mkdir -p "$pkgdir/$vimfiles_dir/third_party/requests_deps"
cp -r "$srcdir/YouCompleteMe/third_party/requests-futures" \ cp -r "$srcdir/YouCompleteMe/third_party/requests-futures" \
@ -360,10 +350,8 @@ package() {
cp -r "$srcdir/YouCompleteMe/third_party/requests_deps/"{certifi,chardet,idna,requests,urllib3} \ cp -r "$srcdir/YouCompleteMe/third_party/requests_deps/"{certifi,chardet,idna,requests,urllib3} \
"$pkgdir/$vimfiles_dir/third_party/requests_deps" "$pkgdir/$vimfiles_dir/third_party/requests_deps"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,clang,mrab-regex,waitress} \ cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,clang,mrab-regex} \
"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party" "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/requests_deps/"{certifi,chardet,idna,requests,urllib3} \
"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/requests_deps"
elif [[ "$_use_system_python" == "y" ]]; then elif [[ "$_use_system_python" == "y" ]]; then
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/clang" \ cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/clang" \
@ -381,14 +369,9 @@ package() {
fi fi
if [[ "$_use_system_python_watchdog" == "n" ]]; then if [[ "$_use_system_python_watchdog" == "n" ]]; then
mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/"{pathtools,watchdog} mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/watchdog"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/watchdog_deps/pathtools/pathtools" \
"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/pathtools/"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/watchdog_deps/watchdog" \ cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/watchdog_deps/watchdog" \
"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/" "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/"
mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/pathtools/docs/source"
cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/watchdog_deps/pathtools/docs/source/_themes" \
"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/watchdog_deps/pathtools/docs/source"
fi fi
if [[ "$_gocode" == "y" && "$_use_system_gocode" == "n" ]]; then if [[ "$_gocode" == "y" && "$_use_system_gocode" == "n" ]]; then