r54499 - in /desktop/unstable/totem/debian: changelog patches/fix-vala-build.patch patches/series rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Oct 19 03:58:32 2017
New Revision: 54499

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54499
Log:
Fix vala/meson build ordering issue (Closes: #874027)

Added:
    desktop/unstable/totem/debian/patches/fix-vala-build.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/series
    desktop/unstable/totem/debian/rules

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=54499&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog	[utf-8] (original)
+++ desktop/unstable/totem/debian/changelog	[utf-8] Thu Oct 19 03:58:32 2017
@@ -1,3 +1,14 @@
+totem (3.26.0-2) UNRELEASED; urgency=medium
+
+  [ Rico Tzschichholz ]
+  * Add fix-vala-build.patch:
+    - Fix vala/meson build ordering issue (Closes: #874027)
+
+  [ Jeremy Bicha ]
+  * Allow parallel building again
+
+ -- Jeremy Bicha <jbicha at debian.org>  Wed, 18 Oct 2017 23:50:26 -0400
+
 totem (3.26.0-1) unstable; urgency=medium
 
   * New upstream release

Added: desktop/unstable/totem/debian/patches/fix-vala-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/fix-vala-build.patch?rev=54499&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/fix-vala-build.patch	(added)
+++ desktop/unstable/totem/debian/patches/fix-vala-build.patch	[utf-8] Thu Oct 19 03:58:32 2017
@@ -0,0 +1,62 @@
+From f5aaa7f5deb3a29223122d7dd7f526f44e4e2369 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Wed, 11 Oct 2017 23:20:21 +0200
+Subject: [PATCH] Generate proper vapi to compile vala-based plugins
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786248
+---
+ src/meson.build         | 11 +++++++++--
+ src/plugins/meson.build |  4 +---
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 1e79c2e4..a24573f5 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -317,8 +317,6 @@ if have_gir
+ 
+   gir_incs = [
+     'Gio-2.0',
+-    'GLib-2.0',
+-    'GObject-2.0',
+     'Gtk-3.0',
+     'TotemPlParser-1.0'
+   ]
+@@ -345,6 +343,15 @@ if have_gir
+     install_dir_typelib: typelib_dir,
+     extra_args: gir_extra_args
+   )
++
++  if have_vala
++    libtotem_vapi = gnome.generate_vapi(
++      'totem',
++      sources: libtotem_gir[0],
++      packages: ['gio-2.0', 'gtk+-3.0', 'TotemPlParser-1.0'],
++      install: false,
++    )
++  endif
+ endif
+ 
+ subdir('plugins')
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 95af6485..a8557db1 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -115,7 +115,7 @@ if plugins_option != 'none'
+ 
+   if have_vala
+     plugins_vala_deps = [
+-      declare_dependency(sources: libtotem_gir)
++      libtotem_vapi
+     ]
+ 
+     plugins_vala_flags = [
+@@ -125,8 +125,6 @@ if plugins_option != 'none'
+     ]
+ 
+     plugins_vala_args = [
+-      '--girdir=' + join_paths(meson.build_root(), 'src'),
+-      '--pkg=@0 at -@1@'.format(totem_gir_ns, totem_api_version)
+     ]
+ 
+     plugins += [

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=54499&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series	[utf-8] Thu Oct 19 03:58:32 2017
@@ -0,0 +1 @@
+fix-vala-build.patch

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=54499&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules	[utf-8] (original)
+++ desktop/unstable/totem/debian/rules	[utf-8] Thu Oct 19 03:58:32 2017
@@ -12,7 +12,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 
 %:
-	dh $@ --with gnome,gir --buildsystem=meson --no-parallel
+	dh $@ --with gnome,gir --buildsystem=meson
 
 override_dh_auto_configure:
 	dh_auto_configure -- \