From 6c421c4ecc6bc5dc9e34021cdbe9a616525951fc Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Fri, 12 Jul 2024 10:58:27 -0700 Subject: [PATCH] version bump 37 commits vim-youcompleteme-git --- vim-youcompleteme-git/.SRCINFO | 6 ++---- vim-youcompleteme-git/PKGBUILD | 27 ++++++++------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/vim-youcompleteme-git/.SRCINFO b/vim-youcompleteme-git/.SRCINFO index 3e3f7af..4c34dbc 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 = r3173.45560628 + pkgver = r3210.b5fe27bb pkgrel = 1 url = https://github.com/Valloric/YouCompleteMe install = install @@ -28,7 +28,6 @@ pkgbase = vim-youcompleteme-git source = git+https://github.com/davidhalter/typeshed.git source = git+https://github.com/davidhalter/django-stubs source = git+https://github.com/numpy/numpydoc - source = git+https://github.com/bottlepy/bottle.git source = git+https://github.com/mrabarnett/mrab-regex source = git+https://github.com/gorakhargosh/watchdog source = https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.37.11/omnisharp-mono.tar.gz @@ -41,7 +40,6 @@ pkgbase = vim-youcompleteme-git sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP - sha256sums = cc6d03e9f368a386213ce6e5b994789ef1a79aa80398f77bd85146bccc68754a + sha256sums = 6060d44229abb27076eeed33d5909c1c69422e52b352c1ce24e0eb1f71d19b48 pkgname = vim-youcompleteme-git diff --git a/vim-youcompleteme-git/PKGBUILD b/vim-youcompleteme-git/PKGBUILD index 752497e..e96684e 100644 --- a/vim-youcompleteme-git/PKGBUILD +++ b/vim-youcompleteme-git/PKGBUILD @@ -46,7 +46,7 @@ _neovim="$NEOVIM_YOUCOMPLETEME" # Default PKGBUILD Configuration # #=========================================================================================================# pkgname=vim-youcompleteme-git -pkgver=r3173.45560628 +pkgver=r3210.b5fe27bb pkgver() { cd "YouCompleteMe" || exit printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" @@ -68,11 +68,10 @@ source=( 'git+https://github.com/davidhalter/typeshed.git' #jedi 'git+https://github.com/davidhalter/django-stubs' #jedi 'git+https://github.com/numpy/numpydoc' #jedi -'git+https://github.com/bottlepy/bottle.git' #ycmd 'git+https://github.com/mrabarnett/mrab-regex' 'git+https://github.com/gorakhargosh/watchdog' ) -sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') +sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') #=========================================================================================================# #=========================================================================================================# @@ -86,7 +85,7 @@ if [[ "$_use_OmniSharp_Roslyn" == "y" ]];then if [[ "$_use_system_OmniSharp_Roslyn" == "n" ]];then source+=('https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.37.11/omnisharp-mono.tar.gz') noextract=('omnisharp-mono.tar.gz') - sha256sums+=('cc6d03e9f368a386213ce6e5b994789ef1a79aa80398f77bd85146bccc68754a') + sha256sums+=('6060d44229abb27076eeed33d5909c1c69422e52b352c1ce24e0eb1f71d19b48') elif [[ "$_use_system_OmniSharp_Roslyn" == "y" ]];then depends+=('omnisharp-roslyn') fi @@ -118,9 +117,9 @@ if [[ "$_use_system_python" == "n" ]]; then fi elif [[ "$_use_system_python" == "y" ]]; then if [[ "$_use_python2" == "OFF" ]]; then - depends+=('python-bottle' 'python-regex') + depends+=('python-regex') elif [[ "$_use_python2" == "ON" ]]; then - depends+=('python2-bottle' 'python2-regex') + depends+=('python2-regex') fi fi @@ -205,7 +204,7 @@ prepare() { gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}" - local ycmd=("bottle" "mrab-regex") + local ycmd=("mrab-regex") gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}" @@ -264,7 +263,7 @@ build() { msg2 'Building gopls for go completion...' # BuildGoCode() cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/go" || exit # find gopls version by grepping third_party/ycmd/build.py - go install golang.org/x/tools/gopls@v0.14.0 + go install golang.org/x/tools/gopls@v0.15.3 else msg2 'Skipping Gocode completer...' fi @@ -336,7 +335,7 @@ package() { if [[ "$_use_system_python" == "n" ]]; then - cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,clang,mrab-regex-github} \ + cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{clang,mrab-regex-github} \ "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party" elif [[ "$_use_system_python" == "y" ]]; then @@ -396,16 +395,6 @@ package() { find "$pkgdir" -name 'test' -exec rm -fr {} + fi - # Remove any file we cannot compile using a specfic python version - if [[ "$_use_python2" == "ON" ]]; then - : - else - if [[ "$_use_system_python" == "n" ]]; then - rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/bottle/plugins/werkzeug/bottle_werkzeug.py" - rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/bottle/plugins/sqlite/bottle_sqlite.py" - fi - fi - # Remove unneeded docs if [[ "$_docs" == "n" ]]; then # find "$pkgdir" -name docs -exec rm -fr {} + # can't do this anymore because flask-sphinx-themes