Update ada_language_server to 23.0.13

5 files changed, 25 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index baf07bbb45e3..219231119a9c 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 = 23.0.12
+	pkgver = 23.0.13
 	pkgrel = 1
 	epoch = 2
 	url = https://github.com/AdaCore/ada_language_server
@@ -15,19 +15,19 @@ pkgbase = ada_language_server
 	depends = ada-libfswatch
 	depends = gpr
 	depends = gnatdoc
-	source = ada_language_server-23.0.12.tar.gz::https://github.com/AdaCore/ada_language_server/archive/refs/tags/23.0.12.tar.gz
+	source = ada_language_server-23.0.13.tar.gz::https://github.com/AdaCore/ada_language_server/archive/refs/tags/23.0.13.tar.gz
 	source = als.patch
 	source = spawn.patch
 	source = lal-tools.patch
 	source = lal.patch
 	source = gnatdoc.patch
 	source = vss.patch
-	b2sums = 9daab15000b42df79a847d0ca6eb5b7f604c18f561eed2074cce8d2477d5a85671d3677bb87bab75d31340d90114a3d7b91cbd19817bd3f9e167bf29b77b5ce3
+	b2sums = c741fec76e839aa647eaf17c75b981d07494f120e3a2f2279986fc48468038e435fe344fad21827bf6d6af79756e75dc022fef8eb6b2e9cc56b6b602e806fcad
 	b2sums = 95a8d0ad9367606e5d6426dec432941d76e7bf7f8f7de3915282dcea9fcf7da783611b94f1f09376d5fac5b0fa2e81f470d01344dd42ab607918709e5a48e43b
 	b2sums = 56fecf391b0618a97ea5e010b272346ae761254354bb9b74241508d47dffa6e8abaaeedd1be267775be54347c63929ad4a9f9744f9abc7f360169b139ac957ef
-	b2sums = cc8e0bd391cbf85fd188e5850977b90f1c69a6e4f43cff975c6e5daf8e9c80cde54bc9608ce8505a918300f1f5e17aef46a25300cf992cc89b1c0485e64beac5
+	b2sums = 7dd817aba9cc422f458f1af219c92594a0bdbc2c2a22aa3e7922c51100bb4b67ca0a1c4081c1139be43c04cdd4637b81aa820f7e5bf742ce13afe10de4319d31
 	b2sums = 509b44efc1a2ef8cf0216632bbf03980956ba500bcedd7442308b60ffe5668a0db851de11af0606626ba4726f5efaf10cad1dca16e898b379f6314dc03f51b2e
-	b2sums = 4072dde16e15faeab86da4a804730751ba7e498a32f19dd19bbf7b8e6fd44dff183b375fdacd857ecad03c6d1ac5b3a3351d17fe3b6e5d903e76a99752a2b3c7
+	b2sums = 6c0b7074e2897fc1a8ca3131b6585ebf4f943a95b8129272f96643cbc61e241e31d4924a39be7b70301b58a50cd1e9455145cda0b2c14f3c20b9bd2b454a2715
 	b2sums = 19682602c942eb3cf4a1e911d311468f21003ef7b4bd5c0f36d592cc2088faa50a9dc814dd14596be5bfb834ee3de57fc83c3323462076379995f4042a484849
 
 pkgname = ada_language_server
diff --git a/PKGBUILD b/PKGBUILD
index 33b10863aad7..011edbd379bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tim Lagnese <tim at inept tech>
 
 pkgname=ada_language_server
-pkgver=23.0.12
+pkgver=23.0.13
 pkgrel=1
 epoch=2
 
@@ -22,12 +22,12 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
         "gnatdoc.patch"
         "vss.patch")
 
-b2sums=('9daab15000b42df79a847d0ca6eb5b7f604c18f561eed2074cce8d2477d5a85671d3677bb87bab75d31340d90114a3d7b91cbd19817bd3f9e167bf29b77b5ce3'
+b2sums=('c741fec76e839aa647eaf17c75b981d07494f120e3a2f2279986fc48468038e435fe344fad21827bf6d6af79756e75dc022fef8eb6b2e9cc56b6b602e806fcad'
         '95a8d0ad9367606e5d6426dec432941d76e7bf7f8f7de3915282dcea9fcf7da783611b94f1f09376d5fac5b0fa2e81f470d01344dd42ab607918709e5a48e43b'
         '56fecf391b0618a97ea5e010b272346ae761254354bb9b74241508d47dffa6e8abaaeedd1be267775be54347c63929ad4a9f9744f9abc7f360169b139ac957ef'
-        'cc8e0bd391cbf85fd188e5850977b90f1c69a6e4f43cff975c6e5daf8e9c80cde54bc9608ce8505a918300f1f5e17aef46a25300cf992cc89b1c0485e64beac5'
+        '7dd817aba9cc422f458f1af219c92594a0bdbc2c2a22aa3e7922c51100bb4b67ca0a1c4081c1139be43c04cdd4637b81aa820f7e5bf742ce13afe10de4319d31'
         '509b44efc1a2ef8cf0216632bbf03980956ba500bcedd7442308b60ffe5668a0db851de11af0606626ba4726f5efaf10cad1dca16e898b379f6314dc03f51b2e'
-        '4072dde16e15faeab86da4a804730751ba7e498a32f19dd19bbf7b8e6fd44dff183b375fdacd857ecad03c6d1ac5b3a3351d17fe3b6e5d903e76a99752a2b3c7'
+        '6c0b7074e2897fc1a8ca3131b6585ebf4f943a95b8129272f96643cbc61e241e31d4924a39be7b70301b58a50cd1e9455145cda0b2c14f3c20b9bd2b454a2715'
         '19682602c942eb3cf4a1e911d311468f21003ef7b4bd5c0f36d592cc2088faa50a9dc814dd14596be5bfb834ee3de57fc83c3323462076379995f4042a484849')
 
 prepare() {
diff --git a/VSS.patch b/VSS.patch
deleted file mode 100644
index 3577ef8c89ce..000000000000
--- a/VSS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: VSS/gnat/vss_config.gpr
-===================================================================
---- VSS.orig/gnat/vss_config.gpr
-+++ VSS/gnat/vss_config.gpr
-@@ -34,6 +34,8 @@ abstract project VSS_Config is
-    Ada_Coverage_Switches := ();
-    Linker_Options := ();
- 
-+   for Library_Kind use "static-pic";
-+
-    Object_Dir       := "../.objs/" & Superproject;
-    Tests_Object_Dir := "../../.objs/" & Superproject & "/tests";
- 
diff --git a/gnatdoc.patch b/gnatdoc.patch
index 778f6ca3a24d..8ef72512cae2 100644
--- a/gnatdoc.patch
+++ b/gnatdoc.patch
@@ -4,18 +4,18 @@ Date: Wed, 21 Sep 2022 14:04:33 +0300
 Subject: [PATCH] V721-007 Fix build with latest GNATdoc
 
 ---
- source/ada/lsp-ada_handlers.adb | 1 +
+ source/ada/lsp-lal_utils.adb | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/source/ada/lsp-ada_handlers.adb b/source/ada/lsp-ada_handlers.adb
+diff --git a/source/ada/lsp-lal_utils.adb b/source/ada/lsp-lal_utils.adb
 index 0991cd57..d65291cf 100644
---- a/source/ada/lsp-ada_handlers.adb
-+++ b/source/ada/lsp-ada_handlers.adb
-@@ -3075,6 +3075,7 @@ package body LSP.Ada_Handlers is
+--- b/source/ada/lsp-lal_utils.adb
++++ a/source/ada/lsp-lal_utils.adb
+@@ -808,6 +808,7 @@
        Options : constant
          GNATdoc.Comments.Options.Extractor_Options :=
-           (Style    => Self.Options.Documentation.Style,
+           (Style    => Style,
 +           Pattern  => <>,
             Fallback => True);
- 
-    begin
+       Decl_Lines         : VSS.String_Vectors.Virtual_String_Vector;
+       Doc_Lines     : VSS.String_Vectors.Virtual_String_Vector;
diff --git a/lal-tools.patch b/lal-tools.patch
index 0b3c97cc4362..f7d9c63ccf1d 100644
--- a/lal-tools.patch
+++ b/lal-tools.patch
@@ -917,39 +917,24 @@ index dbb6eeca..74769937 100644
                     ]
                  }
 
-From 4c8c6b56756d3b39aa43a29384343c75843eba46 Mon Sep 17 00:00:00 2001
-From: Anthony Leonardo Gracio <leonardo@adacore.com>
-Date: Thu, 6 Oct 2022 14:23:43 +0200
-Subject: [PATCH] V624-007: clear gnatpp's template tables
-
-This fixes a memory leak.
----
- source/ada/lsp-ada_contexts.adb | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/source/ada/lsp-ada_contexts.adb b/source/ada/lsp-ada_contexts.adb
-index 1f09af86..c585252b 100644
---- a/source/ada/lsp-ada_contexts.adb
-+++ b/source/ada/lsp-ada_contexts.adb
-@@ -37,6 +37,8 @@ with Langkit_Support.Slocs;
+--- b/source/ada/lsp-ada_contexts.adb
++++ a/source/ada/lsp-ada_contexts.adb
+@@ -37,6 +37,7 @@
  
  with Utils.Command_Lines.Common;
  
 +with Pp.Actions;
-+
- package body LSP.Ada_Contexts is
+ with Langkit_Support.Text;
  
-    Indexing_Trace   : constant Trace_Handle := Create ("ALS.INDEXING", Off);
-@@ -890,8 +892,11 @@ package body LSP.Ada_Contexts is
+ package body LSP.Ada_Contexts is
+@@ -942,8 +943,8 @@
        Self.Source_Dirs.Clear;
        Self.Tree := null;
  
--      --  Destroy GnatPP command line
-+      --  Destroy gnatpp's command line
-       Utils.Command_Lines.Clear (Self.PP_Options);
-+
 +      --  Cleanup gnatpp's template tables
 +      Pp.Actions.Clear_Template_Tables;
+-      --  Destroy GnatPP command line
+-      Utils.Command_Lines.Clear (Self.PP_Options);
     end Free;
  
     -----------------