upgpkg: vim-youcompleteme-git r2812.ab73ca25-1

1 files changed, 12 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 528775dcc631..cc114662de34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,7 +36,7 @@ _neovim="$NEOVIM_YOUCOMPLETEME"
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgname=vim-youcompleteme-git
-pkgver=r2811.7c4d0537
+pkgver=r2812.ab73ca25
 pkgrel=1
 pkgdesc='A code-completion engine for Vim'
 arch=('x86_64')
@@ -57,8 +57,12 @@ optdepends=(
   'java-environment>=11: Java semantic completion'
   'jdtls: Java semantic completion'
   'abseil-cpp: if setting _use_system_abseil ON')
-source=(git+https://github.com/ycm-core/YouCompleteMe.git)
-sha256sums=('SKIP')
+source=(git+https://github.com/ycm-core/YouCompleteMe.git
+        clangd-12.0.0.tar.bz2::https://github.com/ycm-core/llvm/releases/download/12.0.0/clangd-12.0.0-x86_64-unknown-linux-gnu.tar.bz2
+        libclang-12.0.0.tar.bz2::https://github.com/ycm-core/llvm/releases/download/12.0.0/libclang-12.0.0-x86_64-unknown-linux-gnu.tar.bz2)
+sha256sums=('SKIP'
+            '0bb712b8d2a2d6861ea28b11167fc01c21336e5bce8682caab60257e32d9bba1'
+            'dc7b08d63fcf504fdbcfc5b96c446beee8ee79dc96e8d315666b20030c41e29a')
 
 pkgver() {
   cd "${srcdir}"/YouCompleteMe || exit
@@ -98,10 +102,6 @@ prepare() {
       -e 's|\(roslyn_binary_path":\).*$|\1 "/opt/omnisharp-roslyn/OmniSharp.exe",|' \
       -e 's|\(mono_binary_path":\).*$|\1 "/usr/bin/mono",|' \
       -i "${srcdir}"/YouCompleteMe/third_party/ycmd/ycmd/default_settings.json
-  # The 'ycm_clangd_binary_path' option is overriden from the vim plugin
-  # so just make sure this is also done there.
-  sed -e "s|\(ycm_clangd_binary_path',\).*\$|\1 '/usr/bin/clangd' )|" \
-      -i "${srcdir}"/YouCompleteMe/plugin/youcompleteme.vim
 }
 
 build() {
@@ -146,4 +146,9 @@ package() {
 
   python -m compileall -d /usr/share/vim/vimfiles "${pkgdir}/usr/share/vim/vimfiles"
   python -O -m compileall -d /usr/share/vim/vimfiles "${pkgdir}/usr/share/vim/vimfiles"
+
+  install -Ddm755 "${pkg_ycmd_dir}/third_party/clangd/output/bin/"
+  cp -dr --no-preserve=ownership "${srcdir}"/LICENSE.TXT "${pkg_ycmd_dir}/third_party/clangd/output"
+  cp -dr --no-preserve=ownership "${srcdir}"/bin "${pkg_ycmd_dir}/third_party/clangd/output/"
+  cp -dr --no-preserve=ownership "${srcdir}"/lib "${pkg_ycmd_dir}/third_party/clangd/output/"
 }