Update to 22.0.5

3 files changed, 28 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c566a3316d2..4f4569a56f35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ada_language_server
 	pkgdesc = High performance syntactic and semantic engine for the Ada programming language
-	pkgver = 22.0.4
+	pkgver = 22.0.5
 	pkgrel = 1
 	url = https://github.com/AdaCore/ada_language_server/
 	arch = x86_64
@@ -29,16 +29,16 @@ pkgbase = ada_language_server
 	conflicts = ada_language_server-git
 	conflicts = libvss
 	conflicts = libadalang
-	source = ada_language_server-22.0.4.tar.gz::https://github.com/AdaCore/ada_language_server/archive/22.0.4.tar.gz
-	source = git+https://github.com/AdaCore/VSS.git#commit=f255a08
-	source = git+https://github.com/AdaCore/langkit.git#commit=fc0a2be
-	source = git+https://github.com/AdaCore/libadalang.git#commit=6fd2550
-	source = git+https://github.com/AdaCore/libadalang-tools.git#commit=ca084eb
-	source = git+https://github.com/AdaCore/spawn.git#commit=2505624
+	source = ada_language_server-22.0.5.tar.gz::https://github.com/AdaCore/ada_language_server/archive/22.0.5.tar.gz
+	source = git+https://github.com/AdaCore/VSS.git#commit=d6b5de8
+	source = git+https://github.com/AdaCore/langkit.git#commit=024d02f
+	source = git+https://github.com/AdaCore/libadalang.git#commit=398acf2
+	source = git+https://github.com/AdaCore/libadalang-tools.git#commit=f114dbb
+	source = git+https://github.com/AdaCore/spawn.git#commit=e57c59d
 	source = libadalang-tools.patch
 	source = VSS.patch
 	source = ada_language_server.patch
-	sha1sums = 848d8611aa2f896a443c8889b7305c14e4401883
+	sha1sums = cb83762ebebf085b6b54a4bfc5eb33248c21615d
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
@@ -46,7 +46,7 @@ pkgbase = ada_language_server
 	sha1sums = SKIP
 	sha1sums = 1eb931d9aea713d3d553d9f6ebc44e5bce58f551
 	sha1sums = dcc8be463ad852ea595748b5c3c092fc88f79ae5
-	sha1sums = 11c16a7360b47876b5a672222b29008a189b3d71
+	sha1sums = ee3bc8ed18ef9f1c94361aa91acae4f6c1364a25
 
 pkgname = ada_language_server
 
diff --git a/PKGBUILD b/PKGBUILD
index 56ecf1d1c587..dda28717e6c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tim Lagnese <tim at inept tech>
 
 pkgname=ada_language_server
-pkgver=22.0.4
+pkgver=22.0.5
 pkgrel=1
 
 pkgdesc='High performance syntactic and semantic engine for the Ada programming language'
@@ -22,15 +22,15 @@ _pkgname=libadalang-tools
 _pkgver=2020
 _checksum=740372d8ffb1e4755a99bead2d78dace904235c0
 source=("$pkgname-$pkgver.tar.gz::https://github.com/AdaCore/ada_language_server/archive/$pkgver.tar.gz"
-        "git+https://github.com/AdaCore/VSS.git#commit=f255a08"
-        "git+https://github.com/AdaCore/langkit.git#commit=fc0a2be"
-        "git+https://github.com/AdaCore/libadalang.git#commit=6fd2550"
-        "git+https://github.com/AdaCore/libadalang-tools.git#commit=ca084eb"
-        "git+https://github.com/AdaCore/spawn.git#commit=2505624"
+        "git+https://github.com/AdaCore/VSS.git#commit=d6b5de8"
+        "git+https://github.com/AdaCore/langkit.git#commit=024d02f"
+        "git+https://github.com/AdaCore/libadalang.git#commit=398acf2"
+        "git+https://github.com/AdaCore/libadalang-tools.git#commit=f114dbb"
+        "git+https://github.com/AdaCore/spawn.git#commit=e57c59d"
         "libadalang-tools.patch"
         "VSS.patch"
         "ada_language_server.patch")
-sha1sums=('848d8611aa2f896a443c8889b7305c14e4401883'
+sha1sums=('cb83762ebebf085b6b54a4bfc5eb33248c21615d'
           'SKIP'
           'SKIP'
           'SKIP'
@@ -38,7 +38,7 @@ sha1sums=('848d8611aa2f896a443c8889b7305c14e4401883'
           'SKIP'
           '1eb931d9aea713d3d553d9f6ebc44e5bce58f551'
           'dcc8be463ad852ea595748b5c3c092fc88f79ae5'
-          '11c16a7360b47876b5a672222b29008a189b3d71')
+          'ee3bc8ed18ef9f1c94361aa91acae4f6c1364a25')
 
 prepare() {
     cd "$srcdir/libadalang-tools"
diff --git a/ada_language_server.patch b/ada_language_server.patch
index bdf6569990d9..0f0c467b40b0 100644
--- a/ada_language_server.patch
+++ b/ada_language_server.patch
@@ -1,7 +1,7 @@
-Index: ada_language_server-22.0.4/Makefile
+Index: ada_language_server-22.0.5/Makefile
 ===================================================================
---- ada_language_server-22.0.4.orig/Makefile
-+++ ada_language_server-22.0.4/Makefile
+--- ada_language_server-22.0.5.orig/Makefile
++++ ada_language_server-22.0.5/Makefile
 @@ -68,12 +68,12 @@ else
  endif
  
@@ -9,14 +9,14 @@ Index: ada_language_server-22.0.4/Makefile
 -	$(GPRBUILD) -P gnat/tester.gpr -p $(BUILD_FLAGS)
 -	$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb
 -	$(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \
-+	$(GPRBUILD) -P gnat/tester.gpr -aP ../spawn/gnat -p $(BUILD_FLAGS)
++	$(GPRBUILD) -P gnat/tester.gpr -aP ../spawn/gnat -aP ../VSS/gnat -p $(BUILD_FLAGS)
 +	$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p $(BUILD_FLAGS) s-memory.adb
 +	$(GPRBUILD) -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p $(COVERAGE_BUILD_FLAGS) \
  		-XVERSION=$(TRAVIS_TAG)
 -	$(GPRBUILD) -P gnat/codec_test.gpr -p $(COVERAGE_BUILD_FLAGS)
 -	$(GPRBUILD) -P gnat/lsp_client.gpr -p $(COVERAGE_BUILD_FLAGS) \
-+	$(GPRBUILD) -P gnat/codec_test.gpr -aP ../VSS/gnat -p $(COVERAGE_BUILD_FLAGS)
-+	$(GPRBUILD) -P gnat/lsp_client.gpr -aP ../VSS/gnat -p $(COVERAGE_BUILD_FLAGS) \
++	$(GPRBUILD) -P gnat/codec_test.gpr -aP ../VSS/gnat -aP ../spawn/gnat -p $(COVERAGE_BUILD_FLAGS)
++	$(GPRBUILD) -P gnat/lsp_client.gpr -aP ../VSS/gnat -aP ../spawn/gnat -p $(COVERAGE_BUILD_FLAGS) \
  		-XVERSION=$(TRAVIS_TAG)
  	mkdir -p integration/vscode/ada/$(PLATFORM)
  	cp -f .obj/server/ada_language_server integration/vscode/ada/$(PLATFORM) ||\
@@ -27,10 +27,12 @@ Index: ada_language_server-22.0.4/Makefile
 -	gprinstall -f -P gnat/lsp_server.gpr -p -r --mode=usage \
 +	gprinstall -f -P gnat/lsp_server.gpr -aP ../libadalang-tools/src -aP ../VSS/gnat -aP ../libadalang/build -aP ../langkit/support -p -r --mode=usage \
  		--prefix=$(DESTDIR) $(LIBRARY_FLAGS)
- 	gprinstall -f -P gnat/tester.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
- 	gprinstall -f -P gnat/codec_test.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
+-	gprinstall -f -P gnat/tester.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
+-	gprinstall -f -P gnat/codec_test.gpr -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
 -	gprinstall -f -P gnat/lsp_client.gpr -p -r	\
-+	gprinstall -f -P gnat/lsp_client.gpr -aP ../VSS/gnat -p -r	\
++	gprinstall -f -P gnat/tester.gpr -aP ../spawn/gnat -aP ../VSS/gnat -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
++	gprinstall -f -P gnat/codec_test.gpr -aP ../spawn/gnat -aP ../VSS/gnat -p --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
++	gprinstall -f -P gnat/lsp_client.gpr -aP ../spawn/gnat -aP ../VSS/gnat -p -r	\
  		--mode=dev				\
  		--prefix=$(DESTDIR)			\
  		$(LIBRARY_FLAGS)