Update to latest git version

4 files changed, 98 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f36f8ca286e..d2d05f8203fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,26 @@
 # Generated by mksrcinfo v8
-# Sat Jun 11 10:22:41 UTC 2016
+# Mon Jun  5 08:43:33 UTC 2017
 pkgbase = gtkada
-	pkgdesc = GtkAda is a Gtk3 binding for Ada using the OOP and other features of this programming language
-	pkgver = 2016
+	pkgdesc = ada bindings for the gtk+ library
+	pkgver = 2017
 	pkgrel = 1
-	url = http://libre.adacore.com/libre/tools/GtkAda/
+	url = https://github.com/AdaCore/gtkada
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
 	makedepends = gcc-ada
+	makedepends = gprbuild
 	depends = gtk3
-	depends = gprbuild
-	depends = prepare_gnat_util
-	source = http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
-	source = patch-shared.gpr.in
-	source = patch-Makefile.in
-	source = patch-aclocal.m4
-	source = patch-gtkglarea.c
-	source = patch-testgtk.gpr
-	sha1sums = 024aeb4e6a3d48059b5a80b90d606f760cc05e97
-	sha1sums = 5d165fac792018dceae026083f5c335738879c8d
-	sha1sums = 237efb4ca634752fe21ce299b4261bb1fded2d52
-	sha1sums = 5716bb623634c88e7e04849ca7fc000d76cb4882
-	sha1sums = cab6c699945ff8b5af0c5de0fd0f088012aba114
-	sha1sums = 1a4069100cca7d2df9de23562f6ef0ede537b57a
+	depends = freetype2
+	provides = gtkada
+	conflicts = gtkada
+	source = git+https://github.com/AdaCore/gtkada
+	source = expose-cargs-and-largs-makefile.patch
+	source = use-fpic.patch
+	sha1sums = SKIP
+	sha1sums = a046e897c2d0eec217c880c995a52b0b0c048d4b
+	sha1sums = 01f2affd67c53c2c7d71435b37160fae7a06cd81
 
 pkgname = gtkada
 
diff --git a/PKGBUILD b/PKGBUILD
index 1909b1147184..01e9befa5167 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,49 @@
-# Contributor: Patrick Kelly     <kameo76890 at gmail dot com>
-# Contributor: Georgios Tsalikis <aliverius somewhere near tsalikis and a net>
-# Contributor: Julian Leyh       <julian@vgai.de>
-# Contributor: Rod Kay           <charlie5 on #ada at freenode.net>
-
 pkgname=gtkada
-pkgver=2016
+pkgver=2017
 pkgrel=1
 
-pkgdesc="GtkAda is a Gtk3 binding for Ada using the OOP and other features of this programming language"
+pkgdesc='ada bindings for the gtk+ library'
+url='https://github.com/AdaCore/gtkada'
 arch=('i686' 'x86_64')
-url="http://libre.adacore.com/libre/tools/GtkAda/"
 license=('GPL')
 
-depends=("gtk3" "gprbuild" "prepare_gnat_util")
-makedepends=("gcc-ada")
-
-source=(http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
-        patch-shared.gpr.in
-        patch-Makefile.in
-        patch-aclocal.m4
-        patch-gtkglarea.c
-        patch-testgtk.gpr)
+depends=('gtk3' 'freetype2')
+makedepends=('git' 'gcc-ada' 'gprbuild')
 
-sha1sums=('024aeb4e6a3d48059b5a80b90d606f760cc05e97'
-          '5d165fac792018dceae026083f5c335738879c8d'
-          '237efb4ca634752fe21ce299b4261bb1fded2d52'
-          '5716bb623634c88e7e04849ca7fc000d76cb4882'
-          'cab6c699945ff8b5af0c5de0fd0f088012aba114'
-          '1a4069100cca7d2df9de23562f6ef0ede537b57a')
+provides=('gtkada')
+conflicts=('gtkada')
 
+source=('git+https://github.com/AdaCore/gtkada'
+        'expose-cargs-and-largs-makefile.patch'
+        'use-fpic.patch')
 
+sha1sums=('SKIP'
+          'a046e897c2d0eec217c880c995a52b0b0c048d4b'
+          '01f2affd67c53c2c7d71435b37160fae7a06cd81')
 
-prepare()
-{
-  cd "$srcdir/$pkgname-gpl-$pkgver-src"
+#pkgver() {
+#    cd gtkada
+#    git describe --long --tags | sed 's/^gtkada-//; s/\([^-]*-g\)/r\1/; s/-/./g'
+#}
 
-  patch -Np0 -i "$srcdir/patch-shared.gpr.in"
-  patch -Np0 -i "$srcdir/patch-Makefile.in"
-  patch -Np0 -i "$srcdir/patch-aclocal.m4"
-  patch -Np0 -i "$srcdir/patch-gtkglarea.c"
-  patch -Np0 -i "$srcdir/patch-testgtk.gpr"
+prepare() {
+    cd gtkada
+    # 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
 }
 
+build() {
+    cd gtkada
 
+    # XXX Disable opengl https://github.com/AdaCore/gtkada/issues/9
+    ./configure --prefix=/usr --with-GL=no --disable-static --disable-static-pic
 
-build() 
-{
-  cd "$srcdir/$pkgname-gpl-$pkgver-src"
-
-  autoconf
-  ./configure --prefix=/usr
-  DESTDIR=$pkgdir  make -j1  # It doesn't build with -jn where n>1
+    # Disable RPATH usage with -R
+    make PROCESSORS="$(nproc)" GPRBUILD_SWITCHES=-R
 }
 
-
-
-package() 
-{
-  cd "$srcdir/$pkgname-gpl-$pkgver-src"
-
-  DESTDIR=$pkgdir make -j1 install 
+package() {
+    cd gtkada
+    make DESTDIR="$pkgdir" install
 }
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch
new file mode 100644
index 000000000000..2adb2a9c5af0
--- /dev/null
+++ b/expose-cargs-and-largs-makefile.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000000..066c511f42b4
--- /dev/null
+++ b/use-fpic.patch
@@ -0,0 +1,19 @@
+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;