Update to 22.0.4

4 files changed, 43 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f117a2b794d..0c566a3316d2 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.3
+	pkgver = 22.0.4
 	pkgrel = 1
 	url = https://github.com/AdaCore/ada_language_server/
 	arch = x86_64
@@ -29,22 +29,24 @@ pkgbase = ada_language_server
 	conflicts = ada_language_server-git
 	conflicts = libvss
 	conflicts = libadalang
-	source = ada_language_server-22.0.3.tar.gz::https://github.com/AdaCore/ada_language_server/archive/22.0.3.tar.gz
-	source = git+https://github.com/AdaCore/VSS.git#commit=b9c65707a43d747116dad7711d1d026c9b767d41
-	source = git+https://github.com/AdaCore/langkit.git#commit=3e376436d169a91bda26ba48ed151acf22bada9a
-	source = git+https://github.com/AdaCore/libadalang.git#commit=f95e0161cf0bca8e21c8bc7a8795eb332b153733
-	source = git+https://github.com/AdaCore/libadalang-tools.git#commit=9bfbf407d9f376684aafe25797b04cb3fe10ca02
+	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 = libadalang-tools.patch
 	source = VSS.patch
 	source = ada_language_server.patch
-	sha1sums = fec24df3cda0ed7a0022a5f09a2ca4194aecb778
+	sha1sums = 848d8611aa2f896a443c8889b7305c14e4401883
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
-	sha1sums = b1d6d2578ef21d3dd71dee10ed4857a5a4e5f8d5
+	sha1sums = SKIP
+	sha1sums = 1eb931d9aea713d3d553d9f6ebc44e5bce58f551
 	sha1sums = dcc8be463ad852ea595748b5c3c092fc88f79ae5
-	sha1sums = 23f4f0502d322bda621ad013aab5f45ab20555aa
+	sha1sums = 11c16a7360b47876b5a672222b29008a189b3d71
 
 pkgname = ada_language_server
 
diff --git a/PKGBUILD b/PKGBUILD
index 062e603d56ed..56ecf1d1c587 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tim Lagnese <tim at inept tech>
 
 pkgname=ada_language_server
-pkgver=22.0.3
+pkgver=22.0.4
 pkgrel=1
 
 pkgdesc='High performance syntactic and semantic engine for the Ada programming language'
@@ -22,21 +22,23 @@ _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=b9c65707a43d747116dad7711d1d026c9b767d41"
-        "git+https://github.com/AdaCore/langkit.git#commit=3e376436d169a91bda26ba48ed151acf22bada9a"
-        "git+https://github.com/AdaCore/libadalang.git#commit=f95e0161cf0bca8e21c8bc7a8795eb332b153733"
-        "git+https://github.com/AdaCore/libadalang-tools.git#commit=9bfbf407d9f376684aafe25797b04cb3fe10ca02"
+        "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"
         "libadalang-tools.patch"
         "VSS.patch"
         "ada_language_server.patch")
-sha1sums=('fec24df3cda0ed7a0022a5f09a2ca4194aecb778'
+sha1sums=('848d8611aa2f896a443c8889b7305c14e4401883'
           'SKIP'
           'SKIP'
           'SKIP'
           'SKIP'
-          'b1d6d2578ef21d3dd71dee10ed4857a5a4e5f8d5'
+          'SKIP'
+          '1eb931d9aea713d3d553d9f6ebc44e5bce58f551'
           'dcc8be463ad852ea595748b5c3c092fc88f79ae5'
-          '23f4f0502d322bda621ad013aab5f45ab20555aa')
+          '11c16a7360b47876b5a672222b29008a189b3d71')
 
 prepare() {
     cd "$srcdir/libadalang-tools"
@@ -63,7 +65,10 @@ build() {
     # 4. Build libadalang-tools
     cd ../libadalang-tools
     make BUILD_MODE=prod LIBRARY_TYPE=static-pic
-    # 5. Finally, build ada_language_server
+    # 5. Build spawn
+    cd ../spawn
+    make all
+    # 6. Finally, build ada_language_server
     cd "../$pkgname-$pkgver"
     make BUILD_MODE=prod LIBRARY_TYPE=static-pic
 }
diff --git a/ada_language_server.patch b/ada_language_server.patch
index 95ee61cb3d7f..bdf6569990d9 100644
--- a/ada_language_server.patch
+++ b/ada_language_server.patch
@@ -1,14 +1,16 @@
-Index: ada_language_server-22.0.3/Makefile
+Index: ada_language_server-22.0.4/Makefile
 ===================================================================
---- ada_language_server-22.0.3.orig/Makefile
-+++ ada_language_server-22.0.3/Makefile
-@@ -72,11 +72,11 @@ endif
+--- ada_language_server-22.0.4.orig/Makefile
++++ ada_language_server-22.0.4/Makefile
+@@ -68,12 +68,12 @@ else
+ endif
+ 
  all: coverage-instrument
- 	$(GPRBUILD) -P gnat/spawn_tests.gpr -p $(BUILD_FLAGS)
- 	$(GPRBUILD) -P gnat/tester.gpr -p $(BUILD_FLAGS)
+-	$(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) -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/tester.gpr -aP ../spawn/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)
@@ -18,7 +20,7 @@ Index: ada_language_server-22.0.3/Makefile
  		-XVERSION=$(TRAVIS_TAG)
  	mkdir -p integration/vscode/ada/$(PLATFORM)
  	cp -f .obj/server/ada_language_server integration/vscode/ada/$(PLATFORM) ||\
-@@ -97,11 +97,11 @@ ifneq ($(COVERAGE),)
+@@ -94,11 +94,11 @@ ifneq ($(COVERAGE),)
  endif
  
  install:
diff --git a/libadalang-tools.patch b/libadalang-tools.patch
index 09da8fe0d85e..1f7c820a9685 100644
--- a/libadalang-tools.patch
+++ b/libadalang-tools.patch
@@ -2,12 +2,12 @@ Index: libadalang-tools/Makefile
 ===================================================================
 --- libadalang-tools.orig/Makefile
 +++ libadalang-tools/Makefile
-@@ -22,7 +22,7 @@ lib:
- 	which gprbuild
- 	which gcc
+@@ -29,7 +29,7 @@ lib:
  	for proj in $(LIB_PROJECTS) ; do \
--          gprbuild -v -k \
-+          gprbuild -v -aP ../libadalang/build -aP ../langkit/support -k \
- 	   -XLIBRARY_TYPE=$(LIBRARY_TYPE) \
- 	   -XXMLADA_BUILD=$(LIBRARY_TYPE) \
- 	   -XBUILD_MODE=$(BUILD_MODE) \
+ 	  for kind in $(ALL_LIBRARY_TYPES) ; do \
+ 	    rm -f obj/lib/*.lexch; \
+-	    gprbuild -v -k \
++	    gprbuild -v -aP ../libadalang/build -aP ../langkit/support -k \
+ 	      -XLIBRARY_TYPE=$$kind \
+ 	      -XBUILD_MODE=$(BUILD_MODE) \
+ 	      -P $$proj -p -j$(PROCESSORS) ; \