Update to 2019

3 files changed, 15 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53e5ab161d99..f333281898b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = libadalang-tools
 	pkgdesc = Libadalang-based tools: gnatpp, gnatmetric and gnatstub
-	pkgver = 2018
-	pkgrel = 2
+	pkgver = 2019
+	pkgrel = 1
 	url = https://github.com/AdaCore/libadalang-tools
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = gprbuild>=2018
-	depends = libadalang>=2018
-	source = http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59
-	source = workaround-gnat-bug.patch
-	sha1sums = 034e5443a94336f6aca020c916ddf8f30598f8bf
-	sha1sums = 366bc80b768bbb15993b3e896c7aa28ee6f8b2da
+	makedepends = gprbuild
+	depends = libadalang
+	source = http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f
+	sha1sums = 6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d
 
 pkgname = libadalang-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index 0a061da3f526..777df0bafa2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,25 @@
-# Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
+# Maintainer:  Rod Kay               <charlie5  on #ada at freenode.net>
 # Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 
 pkgname=libadalang-tools
-pkgver=2018
-pkgrel=2
+pkgver=2019
+pkgrel=1
 
 pkgdesc="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
 url='https://github.com/AdaCore/libadalang-tools'
 arch=('i686' 'x86_64')
 license=('GPL')
 
-depends=('libadalang>=2018')
-makedepends=("gprbuild>=2018")
+depends=('libadalang')
+makedepends=('gprbuild')
 
-source=('http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59'
-        'workaround-gnat-bug.patch')
-sha1sums=('034e5443a94336f6aca020c916ddf8f30598f8bf'
-          '366bc80b768bbb15993b3e896c7aa28ee6f8b2da')
+source=('http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f')
+sha1sums=('6b32f1aa7cc443bcaf268ef13fa46e3b0fdf147d')
 
-prepare()
-{
-    cd "$srcdir/libadalang-tools-src"
-    patch -Np0 -i "$srcdir/workaround-gnat-bug.patch"
-}
 
 build() 
 {
-    cd "$srcdir/libadalang-tools-src"
+    cd "$srcdir/libadalang-tools-2019-20190517-195C4-src"
 
     # In order to build the generated library, Langkit expects the QUEX_PATH to
     # be set.
@@ -37,7 +30,7 @@ build()
 
 package()
 {
-    cd "$srcdir/libadalang-tools-src"
+    cd "$srcdir/libadalang-tools-2019-20190517-195C4-src"
 
     mkdir -p "$pkgdir/usr/bin"
     for program in gnatpp gnatmetric gnatstub
diff --git a/workaround-gnat-bug.patch b/workaround-gnat-bug.patch
deleted file mode 100644
index bd4326016e18..000000000000
--- a/workaround-gnat-bug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/pp-formatting.adb src/pp-formatting.adb
-index c4539a77..5da22b54 100644
---- src/pp-formatting.adb
-+++ src/pp-formatting.adb
-@@ -60,7 +60,8 @@ package body Pp.Formatting is
- 
-    subtype Ada_Node is Libadalang.Analysis.Ada_Node;
-    use type Ada_Node;
--   function Is_Null (Tree : Ada_Node) return Boolean is (Tree.Is_Null);
-+   function Is_Null (Tree : Ada_Node) return Boolean is
-+     (Libadalang.Analysis.Is_Null (Tree));
-    function T_Img (Tree : Ada_Node) return String is
-      (Libadalang.Analysis.Short_Image (Tree));