[gnome-continuous] Revert "Tag Totem"

[Emmanuele Bassi <ebassi src gnome org>]

commit 1e79c18f02dd1edd9f753ad860cef4235c5cad44
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Jun 24 00:47:58 2017 +0100

    Revert "Tag Totem"
    
    This reverts commit 794839c9fea952c9253b3a1653164282d90efc33.
    
    This is a Meson/Vala bug; let's disable the Vala plugins from the build,
    for the time being.

 manifest.json                       |    4 ++--
 patches/totem-meson-build-api.patch |   21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index ff1966c..f6afe31 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1210,8 +1210,8 @@
                {"src": "gnome:seahorse"},
 
                {"src": "gnome:totem",
-                 "tag": "a1da1b32da5f4c1aa307a170cff80154f210c172",
-                 "tag-reason": "Meson build is failing"},
+                 "config-opts": ["--disable-vala"],
+                "patches": ["totem-meson-build-api.patch"]},
 
                {"src": "gnome:libgda",
                 "branch": "LIBGDA_5.2"},
diff --git a/patches/totem-meson-build-api.patch b/patches/totem-meson-build-api.patch
index 011f9f3..e4484d9 100644
--- a/patches/totem-meson-build-api.patch
+++ b/patches/totem-meson-build-api.patch
@@ -1,20 +1,24 @@
-From 2e4c44a8014c1fdfdfb66dc468ae2c6b77c22584 Mon Sep 17 00:00:00 2001
+From 08f9b7add1f1b25aeb30528f917e45eb4a37df9f Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Thu, 27 Apr 2017 09:47:16 +0100
 Subject: [PATCH] Add build-api wrapper
 
 See: https://github.com/cgwalters/build-api
+
+v2:
+  - disable Vala plugins; Meson has a dependency bug for Vala plugins
+  depending on a generated vapi
 ---
- configure | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 145 insertions(+)
+ configure | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 150 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 000000000..aa228f6b1
+index 00000000..8931b1ba
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,150 @@
 +#!/bin/bash
 +# configure script adapter for Meson
 +# Based on build-api: https://github.com/cgwalters/build-api
@@ -72,6 +76,8 @@ index 000000000..aa228f6b1
 +sanitycheck MESONTEST 'mesontest'
 +sanitycheck NINJA 'ninja' 'ninja-build'
 +
++enable_vala="-Denable-vala=auto"
++
 +while (($# > 0)); do
 +    case "${1%%=*}" in
 +      --prefix) read_arg prefix "$@" || shift;;
@@ -84,6 +90,8 @@ index 000000000..aa228f6b1
 +      --libdir) read_arg libdir "$@" || shift;;
 +      --mandir) read_arg mandir "$@" || shift;;
 +      --includedir) read_arg includedir "$@" || shift;;
++      --enable-vala) enable_vala="-Denable-vala=yes";;
++      --disable-vala) enable_vala="-Denable-vala=no";;
 +      *) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
 +    esac
 +    shift
@@ -156,10 +164,11 @@ index 000000000..aa228f6b1
 +      --bindir=${bindir} \
 +      --includedir=${includedir} \
 +      --mandir=${mandir} \
++      ${enable_vala} \
 +      ${builddir} \
 +      ${srcdir}
 +
 +# vim: ai ts=8 noet sts=2 ft=sh
 -- 
-2.12.2
+2.13.0