r51019 - in /packages/unstable/gnome-builder/debian: changelog control.in patches/0004-build-check-for-libvala-0.34.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Sep 21 13:46:42 2016
New Revision: 51019

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51019
Log:
Build against vala 0.34.

Added:
    packages/unstable/gnome-builder/debian/patches/0004-build-check-for-libvala-0.34.patch
Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/control.in
    packages/unstable/gnome-builder/debian/patches/series

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=51019&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Wed Sep 21 13:46:42 2016
@@ -1,3 +1,9 @@
+gnome-builder (3.20.4-3) UNRELEASED; urgency=medium
+
+  * Build against vala 0.34.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 21 Sep 2016 15:27:53 +0200
+
 gnome-builder (3.20.4-2) unstable; urgency=medium
 
   [ Andreas Henriksson ]

Modified: packages/unstable/gnome-builder/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/control.in?rev=51019&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/control.in	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/control.in	[utf-8] Wed Sep 21 13:46:42 2016
@@ -22,14 +22,14 @@
                libpango1.0-dev (>= 1.38.0),
                libpcre3-dev,
                libpeas-dev (>= 1.18.0-2~),
-               libvala-0.32-dev (>= 0.29.3),
+               libvala-0.34-dev,
                libvte-2.91-dev (>= 0.40.2),
                libwebkit2gtk-4.0-dev (>= 2.8.4),
                libxml2-dev (>= 2.9.0),
                llvm,
                python-gi-dev (>= 3.19.3),
                python3-dev,
-               valac (>= 0.30.0.55),
+               valac (>= 0.34),
                yelp-tools
 # Don't (re)build libide api docs for now:
 #               gtk-doc-tools,
@@ -48,8 +48,8 @@
          gir1.2-peas-1.0,
          gir1.2-webkit2-4.0,
          python3-gi,
-         valac-0.32-vapi,
-         libvala-0.32-dev,
+         valac-0.34-vapi,
+         libvala-0.34-dev,
          clang,
          ${gir:Depends},
          ${misc:Depends},

Added: packages/unstable/gnome-builder/debian/patches/0004-build-check-for-libvala-0.34.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/0004-build-check-for-libvala-0.34.patch?rev=51019&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/0004-build-check-for-libvala-0.34.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/0004-build-check-for-libvala-0.34.patch	[utf-8] Wed Sep 21 13:46:42 2016
@@ -0,0 +1,29 @@
+From ee5a87d2cdcf16c192b72d63090650ff6f3aa605 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <christian at hergert.me>
+Date: Wed, 1 Jun 2016 08:52:52 -0700
+Subject: [PATCH] build: check for libvala-0.34
+
+---
+ plugins/vala-pack/configure.ac | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/vala-pack/configure.ac b/plugins/vala-pack/configure.ac
+index 39b5f0a..fc6dd06 100644
+--- a/plugins/vala-pack/configure.ac
++++ b/plugins/vala-pack/configure.ac
+@@ -1,6 +1,10 @@
+ VAPIGEN_CHECK
+-PKG_CHECK_MODULES(VALA, [libvala-0.32],[have_libvala=yes],[have_libvala=no])
+-VALA_VERSION=0.32
++PKG_CHECK_MODULES(VALA, [libvala-0.34],[have_libvala=yes],[have_libvala=no])
++VALA_VERSION=0.34
++AS_IF([test x$have_libvala = xno],[
++	PKG_CHECK_MODULES(VALA, [libvala-0.32],[have_libvala=yes],[have_libvala=no])
++	VALA_VERSION=0.32
++])
+ AS_IF([test x$have_libvala = xno],[
+ 	PKG_CHECK_MODULES(VALA, [libvala-0.30 >= 0.29.3],[have_libvala=yes],[have_libvala=no])
+ 	VALA_VERSION=0.30
+-- 
+2.9.3
+

Modified: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=51019&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/patches/series	[utf-8] Wed Sep 21 13:46:42 2016
@@ -1,3 +1,4 @@
 0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch
 0002-terminal-add-scrollbar-for-terminal.patch
 0003-desktop-Add-IDE-category.patch
+0004-build-check-for-libvala-0.34.patch