Update to 2018

4 files changed, 18 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50d134f181ce..eb485ada9532 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,19 @@
-# Generated by mksrcinfo v8
-# Tue Sep 19 14:36:09 UTC 2017
 pkgbase = gtkada
 	pkgdesc = Ada bindings for the Gtk+ library.
-	pkgver = 2017
-	pkgrel = 3
+	pkgver = 2018
+	pkgrel = 1
 	url = https://github.com/AdaCore/gtkada
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
 	makedepends = gcc-ada
 	makedepends = gprbuild
 	depends = gtk3
 	depends = freetype2
 	provides = gtkada
 	conflicts = gtkada
-	source = http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
-	source = expose-cargs-and-largs-makefile.patch
-	source = use-fpic.patch
-	sha1sums = 31b3512b98d8fa15a0183b5c43caca1b0d692d85
-	sha1sums = a046e897c2d0eec217c880c995a52b0b0c048d4b
-	sha1sums = 01f2affd67c53c2c7d71435b37160fae7a06cd81
+	source = http://mirrors.cdn.adacore.com/art/5b065d07c7a447497530ba7e
+	sha1sums = 8f293b3f1b1842566adb8d165f032336fe7aca54
 
 pkgname = gtkada
 
diff --git a/PKGBUILD b/PKGBUILD
index 47c5d33864aa..ac5ec4bcac8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
+# Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
+
 pkgname=gtkada
-pkgver=2017
-pkgrel=3
+pkgver=2018
+pkgrel=1
 
 pkgdesc='Ada bindings for the Gtk+ library.'
 url='https://github.com/AdaCore/gtkada'
@@ -8,47 +10,32 @@ arch=('i686' 'x86_64')
 license=('GPL')
 
 depends=('gtk3' 'freetype2')
-makedepends=('git' 'gcc-ada' 'gprbuild')
+makedepends=('gcc-ada' 'gprbuild')
 
 provides=('gtkada')
 conflicts=('gtkada')
 
-source=('http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9'
-        'expose-cargs-and-largs-makefile.patch'
-        'use-fpic.patch')
-
-sha1sums=('31b3512b98d8fa15a0183b5c43caca1b0d692d85'
-          'a046e897c2d0eec217c880c995a52b0b0c048d4b'
-          '01f2affd67c53c2c7d71435b37160fae7a06cd81')
-
-
-prepare()
-{
-    cd gtkada-gpl-2017-src
-
-    # XXX https://github.com/AdaCore/gtkada/issues/10
-    patch -Np1 -i "$srcdir"/use-fpic.patch
-    patch -Np1 -i "$srcdir"/expose-cargs-and-largs-makefile.patch
-}
-
+source=('http://mirrors.cdn.adacore.com/art/5b065d07c7a447497530ba7e')
+sha1sums=('8f293b3f1b1842566adb8d165f032336fe7aca54')
 
 build()
 {
-    cd gtkada-gpl-2017-src
+    cd gtkada-gpl-2018-src
 
     export LIBRARY_TYPE=relocatable
 
     # XXX Disable opengl https://github.com/AdaCore/gtkada/issues/9
     ./configure --prefix=/usr --with-GL=no
 
-    # Disable RPATH usage with -R
-    make PROCESSORS="$(nproc)" GPRBUILD_SWITCHES=-R
+    # Disable RPATH usage with -R.
+    # Only use a single job (-j1) to prevent the same file being compiled simultaneously
+    # which results in build artifacts being overwritten.
+    make -j1 PROCESSORS=1 GPRBUILD_SWITCHES=-R
 }
 
-
 package()
 {
-    cd gtkada-gpl-2017-src
+    cd gtkada-gpl-2018-src
 
-    make DESTDIR="$pkgdir" install
+    make -j1 PROCESSORS=1 DESTDIR="$pkgdir" install
 }
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch
deleted file mode 100644
index 2adb2a9c5af0..000000000000
--- a/expose-cargs-and-largs-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d03c7432..875af20b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -49,6 +49,14 @@ datadir=@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
- 
-+ifneq ($(strip $(CFLAGS)),)
-+CARGS := -cargs $(CFLAGS)
-+endif
-+
-+ifneq ($(strip $(LDFLAGS)),)
-+LARGS := -largs $(LDFLAGS)
-+endif
-+
- all:
- 
- ifeq (${BUILD_STATIC_PIC}, yes)
-@@ -78,11 +86,11 @@ relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr $(CARGS) $(LARGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr $(CARGS) $(LARGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
diff --git a/use-fpic.patch b/use-fpic.patch
deleted file mode 100644
index 066c511f42b4..000000000000
--- a/use-fpic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/shared.gpr.in b/shared.gpr.in
-index ba14efeb..a4748844 100644
---- a/shared.gpr.in
-+++ b/shared.gpr.in
-@@ -60,12 +60,12 @@ project Shared is
-              for Switches ("Ada") use
-                 ("-gnat05", "-gnatQ", "-gnatwae", "-gnatay", "-g", "-O0",
-                  "-Werror=format-security");
--             for Switches ("C") use ("-g", "-O0");
-+             for Switches ("C") use ("-g", "-O0", "-fPIC");
-          when "Production" =>
-              for Switches ("Ada") use
-                 ("-gnat05", "-gnatQ", "-O2", "-gnatn", "-gnatwa", "-gnaty",
-                  "-Werror=format-security");
--             for Switches ("C") use ("-O2");
-+             for Switches ("C") use ("-O2", "-fPIC");
-       end case;
- 
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;