Update to 2018

3 files changed, 23 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d53ac0e47a61..060d505eb150 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
-# Generated by mksrcinfo v8
-# Thu Jul  6 12:08:01 UTC 2017
 pkgbase = libadalang
 	pkgdesc = A high performance semantic engine for the Ada programming language.
-	pkgver = 1
-	pkgrel = 3
+	pkgver = 2018
+	pkgrel = 1
 	url = https://github.com/AdaCore/libadalang
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
+	makedepends = gprbuild
 	depends = gcc-ada
-	depends = gnatcoll
+	depends = gnatcoll-core
 	depends = quex-for_libadalang
 	depends = python2-funcy
 	depends = python2-mako
@@ -22,12 +20,12 @@ pkgbase = libadalang
 	depends = python2-docutils
 	depends = autopep8
 	depends = yapf
-	source = http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
-	source = http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-	source = use_fpic_for_libadalang.patch
-	sha1sums = 08a43b26a2f3469c1255c642db105aba023e9f78
-	sha1sums = 4b36153f8610dd7b62b41938d020eaed39e20842
-	sha1sums = 6d1f238567e1a8ec4aff81a7f62f10ef048a7b28
+	provides = libadalang
+	conflicts = libadalang-git
+	source = http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
+	source = http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a
+	sha1sums = 7e9f90eb9bcdd2877b7da1aca1c2f88ff90c3dcc
+	sha1sums = 0f6ea268a81371a880122cbdd3b2493ae91d0811
 
 pkgname = libadalang
 
diff --git a/PKGBUILD b/PKGBUILD
index 69689d337f8e..0f0e9d7c041e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,46 @@
 # Contributor: Rod Kay   <charlie5 on #ada at freenode.net>
 
 pkgname=libadalang
-pkgver=1
-pkgrel=3
+pkgver=2018
+pkgrel=1
 pkgdesc="A high performance semantic engine for the Ada programming language."
 
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/libadalang"
 license=('GPL')
 
-depends=("gcc-ada" "gnatcoll"
+depends=("gcc-ada" "gnatcoll-core"
          "quex-for_libadalang" "python2-funcy" "python2-mako" "python-yaml" "python-sphinx" "python-coverage" "python2-enum34"
          "python-psutil" "python2-docutils" "autopep8" "yapf")
 
-makedepends=("git")
+makedepends=("gprbuild")
 
+provides=('libadalang')
+conflicts=('libadalang-git')
 
-source=(http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
-        http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
-        use_fpic_for_libadalang.patch)
-
-sha1sums=('08a43b26a2f3469c1255c642db105aba023e9f78'
-          '4b36153f8610dd7b62b41938d020eaed39e20842'
-          '6d1f238567e1a8ec4aff81a7f62f10ef048a7b28')
-
+source=('http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18'
+        'http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a')
+sha1sums=('7e9f90eb9bcdd2877b7da1aca1c2f88ff90c3dcc'
+          '0f6ea268a81371a880122cbdd3b2493ae91d0811')
 
 build() 
 {
-  cd $srcdir/libadalang-gps-src
+  cd $srcdir/libadalang-gpl-2018-src
 
   # Ensure that QUEX_PATH is set.
   #
   source /etc/profile.d/quex.sh
 
-  export PYTHONPATH=$srcdir/langkit-gps-src:$PYTHONPATH
+  export PYTHONPATH=$srcdir/langkit-gpl-2018-src:$PYTHONPATH
 
   python2 ada/manage.py generate
-
-  # Add -fPIC where needed.
-  #
-  patch -Np0 -i "$srcdir"/use_fpic_for_libadalang.patch
-
   python2 ada/manage.py build
 }
 
 
 package()
 {
-  cd $srcdir/libadalang-gps-src
+  cd $srcdir/libadalang-gpl-2018-src
 
   # Ensure that QUEX_PATH is set.
   #
diff --git a/use_fpic_for_libadalang.patch b/use_fpic_for_libadalang.patch
deleted file mode 100644
index 7b5a9fb07196..000000000000
--- a/use_fpic_for_libadalang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- build/lib/gnat/libadalang.gpr	2017-06-14 20:38:02.947741666 +1000
-+++ build/lib/gnat/libadalang.gpr-new	2017-06-14 20:39:57.568356667 +1000
-@@ -88,9 +88,9 @@
-             for Default_Switches ("Ada") use
-                Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
- 
--            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
-+            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0", "-fPIC");
- 
--            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
-+            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0", "-fPIC");
-             --  This file is *huge* and the debugging information for it harms
-             --  Valgrind runs. We almost never have to debug this file so
-             --  this is acceptable.
-@@ -101,13 +101,13 @@
-             for Default_Switches ("Ada") use
-                Common_Ada_Cargs & ("-g", "-Ofast", "-gnatp", "-gnatn2");
- 
--            for Default_Switches ("C") use Common_C_Cargs & ("-Ofast");
-+            for Default_Switches ("C") use Common_C_Cargs & ("-Ofast", "-fPIC");
- 
-             case Target is
-                when "x86-linux" | "x86-windows" =>
-                   for Switches ("quex_lexer.c") use Common_C_Cargs
-                     & ("-Ofast", "-fno-ree", "-fdisable-rtl-cprop_hardreg",
--                       "-fdisable-rtl-sched2", "-mno-stv");
-+                       "-fdisable-rtl-sched2", "-mno-stv", "-fPIC");
-                   --  Deactivate because of memory usage, see P726-024. This
-                   --  limits the memory usage peaks of GCC 6 based compilers
-                   --  and should prevent OOM on 32-bit platforms.