Update to 2021 release

3 files changed, 68 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f81870dc560..949cfa329d07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,51 +1,21 @@
 pkgbase = ada_language_server
 	pkgdesc = High performance syntactic and semantic engine for the Ada programming language
-	pkgver = 22.0.8
+	pkgver = 2021
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/AdaCore/ada_language_server/
 	arch = x86_64
 	license = GPL3
 	makedepends = gcc-ada
-	makedepends = gprbuild-git
-	makedepends = autopep8
-	makedepends = python-coverage
-	makedepends = python-docutils
-	makedepends = python-funcy
-	makedepends = python-mako
-	makedepends = python-psutil
-	makedepends = python-sphinx_rtd_theme
-	makedepends = yapf
-	makedepends = python-pycodestyle
-	makedepends = mypy
-	makedepends = flake8
-	makedepends = python-jsonschema
-	makedepends = python-e3-core
-	makedepends = python-e3-testsuite
-	makedepends = git
-	depends = gnatcoll-iconv
-	depends = gnatcoll-gmp
-	depends = ada-libfswatch-git
-	provides = ada_language_server
-	conflicts = ada_language_server-git
-	conflicts = libvss
-	conflicts = libadalang
-	source = ada_language_server-22.0.8.tar.gz::https://github.com/AdaCore/ada_language_server/archive/22.0.8.tar.gz
-	source = git+https://github.com/AdaCore/VSS.git#commit=0709cab
-	source = git+https://github.com/AdaCore/langkit.git#commit=cbd7542
-	source = git+https://github.com/AdaCore/libadalang.git#commit=cb8f782
-	source = git+https://github.com/AdaCore/libadalang-tools.git#commit=7cc5d58
-	source = git+https://github.com/AdaCore/spawn.git#commit=725a42d
-	source = libadalang-tools.patch
-	source = VSS.patch
-	source = ada_language_server.patch
-	sha1sums = d56ba8b7bc207579ac9bf5f91a1d825986458ff8
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = 1eb931d9aea713d3d553d9f6ebc44e5bce58f551
-	sha1sums = aee366f733a0821034ac683745799d72f79b1941
-	sha1sums = ee3bc8ed18ef9f1c94361aa91acae4f6c1364a25
+	makedepends = gprbuild
+	depends = libadalang-tools
+	depends = gtkada
+	depends = libvss
+	depends = ada_spawn
+	depends = ada-libfswatch
+	source = ada_language_server-2021-20210701-19A88-src.tar.gz::https://community.download.adacore.com/v1/176c07d5fafde00cbb0b2eaebe13039da27ca135?filename=ada_language_server-2021-20210701-19A88-src.tar.gz
+	source = als.patch
+	sha1sums = 176c07d5fafde00cbb0b2eaebe13039da27ca135
+	sha1sums = a3905d1ee3a4a84fdbbb1a8f5fd1c6deb2b767ba
 
 pkgname = ada_language_server
diff --git a/PKGBUILD b/PKGBUILD
index 2f5a5c2657fb..906f56106830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,80 +1,37 @@
 # Maintainer: Tim Lagnese <tim at inept tech>
 
 pkgname=ada_language_server
-pkgver=22.0.8
+_upstream_ver=2021-20210701-19A88
+pkgver=2021
 pkgrel=1
+epoch=1
 
 pkgdesc='High performance syntactic and semantic engine for the Ada programming language'
 url='https://github.com/AdaCore/ada_language_server/'
 arch=('x86_64')
 license=('GPL3')
 
-depends=('gnatcoll-iconv' 'gnatcoll-gmp' 'ada-libfswatch-git')
-makedepends=('gcc-ada' 'gprbuild-git' 'autopep8' 'python-coverage'
-             'python-docutils' 'python-funcy' 'python-mako' 'python-psutil'
-             'python-sphinx_rtd_theme' 'yapf' 'python-pycodestyle' 'mypy' 'flake8' 'python-jsonschema'
-             'python-e3-core' 'python-e3-testsuite' 'git')
+depends=('libadalang-tools' 'gtkada' 'libvss' 'ada_spawn' 'ada-libfswatch')
+makedepends=('gcc-ada' 'gprbuild')
 
-provides=('ada_language_server')
-conflicts=('ada_language_server-git' 'libvss' 'libadalang')
-_upstream_ver=2020-20200429-1998C
-_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=0709cab"
-        "git+https://github.com/AdaCore/langkit.git#commit=cbd7542"
-        "git+https://github.com/AdaCore/libadalang.git#commit=cb8f782"
-        "git+https://github.com/AdaCore/libadalang-tools.git#commit=7cc5d58"
-        "git+https://github.com/AdaCore/spawn.git#commit=725a42d"
-        "libadalang-tools.patch"
-        "VSS.patch"
-        "ada_language_server.patch")
-sha1sums=('a9e56f1538c212519ba19558a812da937733e172'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          'SKIP'
-          '1eb931d9aea713d3d553d9f6ebc44e5bce58f551'
-          'aee366f733a0821034ac683745799d72f79b1941'
-          'ee3bc8ed18ef9f1c94361aa91acae4f6c1364a25')
+_checksum=176c07d5fafde00cbb0b2eaebe13039da27ca135
+source=("${pkgname}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgname}-${_upstream_ver}-src.tar.gz"
+        "als.patch")
+sha1sums=('176c07d5fafde00cbb0b2eaebe13039da27ca135'
+          'a3905d1ee3a4a84fdbbb1a8f5fd1c6deb2b767ba')
 
 prepare() {
-    cd "$srcdir/libadalang-tools"
-    git apply "$srcdir/libadalang-tools.patch"
-    cd "$srcdir/VSS"
-    git apply "$srcdir/VSS.patch"
-    cd "$srcdir/$pkgname-$pkgver"
-    git apply "$srcdir/ada_language_server.patch"
+    cd "$srcdir/als-$_upstream_ver-src"
+    patch --strip=1 < ../als.patch
 }
 
 build() {
-    # Manually handle dependencies since we have to use specific versions that don't match version in the AUR
-    # 1. Build VSS
-    cd "$srcdir/VSS"
-    make BUILD_MODE=prod all
-    # 2. Build langkit
-    cd ../langkit
-    python manage.py build-langkit-support --library-types=static-pic
-    # 3. Build libadalang
-    cd ../libadalang
-    PYTHONPATH="../langkit"
-    export PYTHONPATH
-    python manage.py generate
-    # 4. Build libadalang-tools
-    cd ../libadalang-tools
-    make BUILD_MODE=prod LIBRARY_TYPE=static-pic
-    # 5. Build spawn
-    cd ../spawn
-    make all
-    # 6. Finally, build ada_language_server
-    cd "../$pkgname-$pkgver"
-    make BUILD_MODE=prod LIBRARY_TYPE=static-pic
+    cd "$srcdir/als-$_upstream_ver-src"
+    make BUILD_MODE=prod
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$srcdir/als-$_upstream_ver-src"
 
-	make BUILD_MODE=prod LIBRARY_TYPE=static-pic DESTDIR="$pkgdir/usr" install
+	make BUILD_MODE=prod LIBRARY_TYPE=relocatable DESTDIR="$pkgdir/usr" install
 }
diff --git a/als.patch b/als.patch
new file mode 100644
index 000000000000..e8209a8499ec
--- /dev/null
+++ b/als.patch
@@ -0,0 +1,40 @@
+Index: als-2021-20210701-19A88-src/gnat/tester.gpr
+===================================================================
+--- als-2021-20210701-19A88-src.orig/gnat/tester.gpr
++++ als-2021-20210701-19A88-src/gnat/tester.gpr
+@@ -17,6 +17,7 @@
+ 
+ with "lsp_client";
+ with "gnatcoll";
++with "gtkada";
+ 
+ project Tester is
+ 
+Index: als-2021-20210701-19A88-src/Makefile
+===================================================================
+--- als-2021-20210701-19A88-src.orig/Makefile
++++ als-2021-20210701-19A88-src/Makefile
+@@ -72,12 +72,13 @@ endif
+ 
+ all: coverage-instrument
+ 	$(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) -d -ws -c -u -P gnat/lsp_server.gpr -aP /usr/share/gpr -p $(BUILD_FLAGS) s-memory.adb
+ 	$(GPRBUILD) -P gnat/lsp_server.gpr -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) \
+ 		-XVERSION=$(TRAVIS_TAG)
++	$(GPRBUILD) -p gnat/lsp_client_glib.gpr -p $(COVERAGE_BUILD_FLAGS)
+ 	mkdir -p integration/vscode/ada/$(PLATFORM)
+ 	cp -f .obj/server/ada_language_server integration/vscode/ada/$(PLATFORM) ||\
+ 	  cp -f .obj/server/ada_language_server.exe integration/vscode/ada/$(PLATFORM)
+@@ -108,6 +109,8 @@ install:
+ 		--mode=dev				\
+ 		--prefix=$(DESTDIR)			\
+ 		$(LIBRARY_FLAGS)
++	gprinstall -f -P gnat/lsp_client_glib.gpr -p -r	\
++      --prefix=$(DESTDIR) $(LIBRARY_FLAGS)
+ ifneq ($(COVERAGE),)
+ 	mkdir -p $(DESTDIR)/share/als/sids || true
+ 	cp .obj/*/*.sid $(DESTDIR)/share/als/sids/