[arch-commits] Commit in libgda/trunk (PKGBUILD vala.patch)

[Evangelos Foutras]

    Date: Monday, November 7, 2016 @ 19:43:25
  Author: foutrelis
Revision: 280123

Specify Vala version using VALA_API_VERSION

Modified:
  libgda/trunk/PKGBUILD
Deleted:
  libgda/trunk/vala.patch

------------+
 PKGBUILD   |    8 +++-----
 vala.patch |   21 ---------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-07 19:40:06 UTC (rev 280122)
+++ PKGBUILD	2016-11-07 19:43:25 UTC (rev 280123)
@@ -15,10 +15,9 @@
              gobject-introspection gtk-doc vala itstool gnome-common)
 url="http://www.gnome-db.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
-        java.patch vala.patch)
+        java.patch)
 sha256sums=('2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e'
-            'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22'
-            'a3150354141739caac0c5922f02f933903c15481d8c8f64c0ecc56828a8e3bbf')
+            'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22')
 
 _apiver=5.0
 
@@ -28,7 +27,6 @@
   cd $pkgname-$pkgver
 
   patch -Np1 -i ../java.patch
-  patch -Np1 -i ../vala.patch
 
   find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
 
@@ -42,7 +40,7 @@
       --with-bdb=/usr --with-bdb-libdir-name=lib \
       --enable-json --enable-system-sqlite --enable-binreloc \
       --enable-gda-gi --enable-gdaui-gi \
-      --enable-vala --enable-gdaui-vala \
+      --enable-vala --enable-gdaui-vala VALA_API_VERSION=0.34 \
       --enable-gtk-doc
   make
 }

Deleted: vala.patch
===================================================================
--- vala.patch	2016-11-07 19:40:06 UTC (rev 280122)
+++ vala.patch	2016-11-07 19:43:25 UTC (rev 280123)
@@ -1,21 +0,0 @@
-diff -u -r libgda-5.2.4/configure.ac libgda-5.2.4-vala/configure.ac
---- libgda-5.2.4/configure.ac	2015-06-13 11:07:23.000000000 +0200
-+++ libgda-5.2.4-vala/configure.ac	2015-06-14 19:11:36.700984704 +0200
-@@ -547,13 +547,13 @@
- vala_api="No Vala bindings will be generated"
- if test "x$enable_vala" = "xyes"
- then
--	AM_PROG_VALAC([0.26.0])
-+	AM_PROG_VALAC([0.32.0])
- 	if test "x$VALA_API_VERSION" = "x"
- 	then
--		VAPIGEN_CHECK([0.26.0],[0.26],,no)
--		vala_api="0.26 (Default)"
-+		VAPIGEN_CHECK([0.32.0],[0.32],,no)
-+		vala_api="0.32 (Default)"
- 	else
--		VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
-+		VAPIGEN_CHECK([0.32.0],$VALA_API_VERSION,,no)
- 		vala_api=$VALA_API_VERSION
- 	fi
- else