Update to 2021 version.

3 files changed, 66 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d03a4acdeea..243d140edeee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libadalang-tools
-	pkgdesc = Libadalang-based tools: gnatpp, gnatmetric and gnatstub
-	pkgver = 2020
+	pkgdesc = Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub
+	pkgver = 2021
 	pkgrel = 1
 	url = https://github.com/AdaCore/libadalang-tools
 	arch = i686
@@ -8,8 +8,9 @@ pkgbase = libadalang-tools
 	license = GPL
 	makedepends = gprbuild
 	depends = libadalang
-	source = libadalang-tools-2020-20200429-1998C-src.tar.gz::https://community.download.adacore.com/v1/740372d8ffb1e4755a99bead2d78dace904235c0?filename=libadalang-tools-2020-20200429-1998C-src.tar.gz
-	sha1sums = 740372d8ffb1e4755a99bead2d78dace904235c0
+	source = libadalang-tools-2021-20210519-19A69-src.tar.gz::https://community.download.adacore.com/v1/21b42a7e6ced5c227fa001eff9c9d39c75d3d58f?filename=libadalang-tools-2021-20210519-19A69-src.tar.gz
+	source = pp-actions.adb-patch
+	sha1sums = 21b42a7e6ced5c227fa001eff9c9d39c75d3d58f
+	sha1sums = 9f0aa925c1af47340dd4b2e86899ec1fb74dde92
 
 pkgname = libadalang-tools
-
diff --git a/PKGBUILD b/PKGBUILD
index 58a18ff94c7f..7a64f8b9ad80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 
 pkgname=libadalang-tools
-_upstream_ver=2020-20200429-1998C
-pkgver=2020
+_upstream_ver=2021-20210519-19A69
+pkgver=2021
 pkgrel=1
 
-pkgdesc="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+pkgdesc="Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub"
 url='https://github.com/AdaCore/libadalang-tools'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,20 +15,29 @@ license=('GPL')
 depends=('libadalang')
 makedepends=('gprbuild')
 
-_checksum=740372d8ffb1e4755a99bead2d78dace904235c0
-source=("${pkgname}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgname}-${_upstream_ver}-src.tar.gz")
-sha1sums=("$_checksum")
+_checksum=21b42a7e6ced5c227fa001eff9c9d39c75d3d58f
+source=("${pkgname}-${_upstream_ver}-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=${pkgname}-${_upstream_ver}-src.tar.gz"
+        "pp-actions.adb-patch")
+sha1sums=("$_checksum"
+          "9f0aa925c1af47340dd4b2e86899ec1fb74dde92")
+
+prepare()
+{
+    cd "$srcdir/$pkgname-$_upstream_ver-src"
+
+    patch -Np0 -i ../pp-actions.adb-patch
+}
 
 build() 
 {
     cd "$srcdir/$pkgname-$_upstream_ver-src"
 
-    gprbuild \
-        -XBUILD_MODE=prod \
+    gprbuild                       \
+        -XBUILD_MODE=prod          \
         -XLIBRARY_TYPE=relocatable \
         -XXMLADA_BUILD=relocatable \
-        -XLALTOOLS_SET=all \
-        -P src/build.gpr -p -j0 \
+        -XLALTOOLS_SET=all         \
+        -P src/build.gpr -p -j0    \
         -R -cargs $CFLAGS -largs $LDFLAGS
 }
 
@@ -37,4 +46,9 @@ package()
     cd "$srcdir/$pkgname-$_upstream_ver-src"
 
     install -Dm755 -t "$pkgdir/usr/bin/" bin/{gnatpp,gnatmetric,gnatstub}
+    
+    # Install the license.
+    install -D -m644 \
+       "COPYING3"    \
+       "$pkgdir/usr/share/licenses/$pkgname/COPYING3"
 }
diff --git a/pp-actions.adb-patch b/pp-actions.adb-patch
new file mode 100644
index 000000000000..5a7a7f9003db
--- /dev/null
+++ b/pp-actions.adb-patch
@@ -0,0 +1,36 @@
+--- src/pp-actions.adb	2021-05-19 15:08:26.084203000 +1000
++++ src/pp-actions.adb-new	2021-06-22 11:50:52.066150085 +1000
+@@ -645,10 +645,10 @@
+            --  ??? Ada 2020 related expressions, needs to be implemented. See
+            --  T519-017.
+ 
+-           when Ada_Abstract_State_Decl => null,
+-           when Ada_Abstract_State_Decl_Expr => null,
+-           when Ada_Multi_Abstract_State_Decl => null,
+-           when Ada_Paren_Abstract_State_Decl => null,
++           --  when Ada_Abstract_State_Decl => null,
++           --  when Ada_Abstract_State_Decl_Expr => null,
++           --  when Ada_Multi_Abstract_State_Decl => null,
++           --  when Ada_Paren_Abstract_State_Decl => null,
+            --   ??? SPARK related expressions, needs to be implemented. See
+            --   U305-048.
+ 
+@@ -1046,7 +1046,7 @@
+            when Ada_Anonymous_Type_Decl =>
+              L ("//!", Aspects),
+            when Ada_Synth_Anonymous_Type_Decl => null,
+-           when Ada_Anonymous_Expr_Decl => null,
++           --  when Ada_Anonymous_Expr_Decl => null,
+                --  Anonymous expr decls cannot appear in source trees
+ 
+            when Ada_Anonymous_Type_Access_Def => null,
+@@ -1165,7 +1165,8 @@
+              L ("until"),
+            when Ada_With_Private_Absent => null,
+            when Ada_With_Private_Present =>
+-             L ("with private")
++             L ("with private"),
++           when others => null
+         ); -- end case
+    end Template_For_Kind;
+