summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Kay2022-11-16 18:55:19 +1100
committerRod Kay2022-11-16 18:55:19 +1100
commit1bfe88883fcb8497b4cff75ff0d0c92e663b335d (patch)
treed597a3bbb6c9d0873fec5e79cb3c1d143df01151
parent037b093707e0b3da36e4498ddc074041e98e80f8 (diff)
downloadaur-1bfe88883fcb8497b4cff75ff0d0c92e663b335d.tar.gz
Update to version '23.0.0'.
-rw-r--r--.SRCINFO18
-rw-r--r--0001-pp-actions.adb-patch-for-compatibility-with-release-.patch51
-rw-r--r--PKGBUILD30
3 files changed, 23 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb3af13cca82..8a2ec90507f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
pkgbase = libadalang-tools
pkgdesc = Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub
- pkgver = 2022
- pkgrel = 2
+ pkgver = 23.0.0
+ pkgrel = 1
+ epoch = 1
url = https://github.com/AdaCore/libadalang-tools
arch = i686
arch = x86_64
- license = GPL
+ license = GPL3
makedepends = gprbuild
makedepends = which
+ depends = ada-web-server
depends = libadalang
- source = https://github.com/AdaCore/libadalang-tools/archive/refs/tags/v22.0.0.tar.gz
- source = 0001-pp-actions.adb-patch-for-compatibility-with-release-.patch
+ source = libadalang-tools-23.0.0.tar.gz::https://github.com/AdaCore/libadalang-tools/archive/v23.0.0.tar.gz
source = 0002-Makefile-add-GPRBUILD_FLAGS-variable.patch
source = 0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch
- sha1sums = a71465b19d099a1a0f9bcaf029ede067c388c187
- sha1sums = ef13af536f419fb8181810b17a5feebff1b98342
- sha1sums = 31bc3f4b157782e95dc7cdbc3185e4f74f7fc576
- sha1sums = af4b98efc227ac64c02f5dde4b20e39c8c967470
+ sha256sums = c6e06d7d0df874cab2b61530165f94b93ebd900b59735ff702b2f9d70456faa6
+ sha256sums = c71fcd7a535c348c24ba984186d3663f41085296e8dc7b79c06bb9d85fabf419
+ sha256sums = 627fd033fd90630c0b5cf24dff4ca6537c903215148384b966567986c17f63aa
pkgname = libadalang-tools
diff --git a/0001-pp-actions.adb-patch-for-compatibility-with-release-.patch b/0001-pp-actions.adb-patch-for-compatibility-with-release-.patch
deleted file mode 100644
index 423127c06ef1..000000000000
--- a/0001-pp-actions.adb-patch-for-compatibility-with-release-.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 92ff22e80dfab775f2ee4e72cef0e05e136d5275 Mon Sep 17 00:00:00 2001
-From: Rod Kay <rodakay5@gmail.com>
-Date: Tue, 13 Jul 2021 15:20:42 +0200
-Subject: [PATCH 1/3] pp-actions.adb: patch for compatibility with release
- versions of dependencies
-
----
- src/pp-actions.adb | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/pp-actions.adb b/src/pp-actions.adb
-index c50bf5c4..aecdfd0b 100644
---- a/src/pp-actions.adb
-+++ b/src/pp-actions.adb
-@@ -672,10 +672,10 @@ package body Pp.Actions is
- -- ??? 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.
-
-@@ -1075,7 +1075,7 @@ package body Pp.Actions is
- 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,
-@@ -1194,7 +1194,8 @@ package body Pp.Actions is
- 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;
-
---
-2.32.0
-
diff --git a/PKGBUILD b/PKGBUILD
index ae00449e3741..db508da658fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,39 +3,37 @@
# Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
pkgname=libadalang-tools
-pkgver=2022
-pkgrel=2
+epoch=1
+pkgver=23.0.0
+pkgrel=1
pkgdesc="Libadalang-based tools for Ada: gnatpp, gnatmetric and gnatstub"
url='https://github.com/AdaCore/libadalang-tools'
arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL3')
-depends=('libadalang')
+depends=('ada-web-server' 'libadalang')
makedepends=('gprbuild' 'which')
-source=("https://github.com/AdaCore/libadalang-tools/archive/refs/tags/v22.0.0.tar.gz"
- "0001-pp-actions.adb-patch-for-compatibility-with-release-.patch"
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
"0002-Makefile-add-GPRBUILD_FLAGS-variable.patch"
- "0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch"
-)
-sha1sums=('a71465b19d099a1a0f9bcaf029ede067c388c187'
- 'ef13af536f419fb8181810b17a5feebff1b98342'
- '31bc3f4b157782e95dc7cdbc3185e4f74f7fc576'
- 'af4b98efc227ac64c02f5dde4b20e39c8c967470')
+ "0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch")
+
+sha256sums=('c6e06d7d0df874cab2b61530165f94b93ebd900b59735ff702b2f9d70456faa6'
+ 'c71fcd7a535c348c24ba984186d3663f41085296e8dc7b79c06bb9d85fabf419'
+ '627fd033fd90630c0b5cf24dff4ca6537c903215148384b966567986c17f63aa')
prepare()
{
- cd "$srcdir/libadalang-tools-22.0.0"
+ cd "$srcdir/$pkgname-$pkgver"
- patch -p1 < "$srcdir/0001-pp-actions.adb-patch-for-compatibility-with-release-.patch"
patch -p1 < "$srcdir/0002-Makefile-add-GPRBUILD_FLAGS-variable.patch"
patch -p1 < "$srcdir/0003-Makefile-don-t-force-j-to-be-passed-to-gprbuild.patch"
}
build()
{
- cd "$srcdir/libadalang-tools-22.0.0"
+ cd "$srcdir/$pkgname-$pkgver"
ADA_FLAGS="$CFLAGS"
ADA_FLAGS="${ADA_FLAGS//-Wformat}"
@@ -50,7 +48,7 @@ build()
package()
{
- cd "$srcdir/libadalang-tools-22.0.0"
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/usr/" \
install-lib