[gnome-builder] flatpak: patch flatpak-builder to send WATCH_BUS

[Christian Hergert <chergert src gnome org>]

commit ffe17ede7aa1bc1d1c0e0dfc661d645dedaa453b
Author: Christian Hergert <chergert redhat com>
Date:   Wed Apr 24 15:10:57 2019 -0700

    flatpak: patch flatpak-builder to send WATCH_BUS
    
    When we bump to a new version, we can drop the patch.

 build-aux/flatpak/flatpak-builder-watch-bus.patch | 39 +++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Builder.json          | 12 ++++---
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/flatpak/flatpak-builder-watch-bus.patch 
b/build-aux/flatpak/flatpak-builder-watch-bus.patch
new file mode 100644
index 000000000..6cffe361d
--- /dev/null
+++ b/build-aux/flatpak/flatpak-builder-watch-bus.patch
@@ -0,0 +1,39 @@
+From 70c280094ccd0fc718f3aabfe56a91b6bee81efd Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert redhat com>
+Date: Thu, 18 Apr 2019 21:52:49 -0700
+Subject: [PATCH] utils: force exit host commands when flatpak-builder exits
+
+If we are spawning applications on the host using the Development service,
+then we want those commands to exit when the flatpak-builder process
+exits, as can happen from Ctrl^C or kill().
+---
+ src/builder-flatpak-utils.h | 1 +
+ src/builder-utils.c         | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/builder-flatpak-utils.h b/src/builder-flatpak-utils.h
+index 4d878d98..86631002 100644
+--- a/src/builder-flatpak-utils.h
++++ b/src/builder-flatpak-utils.h
+@@ -33,6 +33,7 @@
+ 
+ typedef enum {
+   FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV = 1 << 0,
++  FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS = 1 << 1,
+ } FlatpakHostCommandFlags;
+ 
+ typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
+diff --git a/src/builder-utils.c b/src/builder-utils.c
+index 37de88c9..54bba04c 100644
+--- a/src/builder-utils.c
++++ b/src/builder-utils.c
+@@ -1750,7 +1750,8 @@ builder_host_spawnv (GFile                *dir,
+                                                                       argv,
+                                                                       g_variant_builder_end (fd_builder),
+                                                                       g_variant_builder_end (env_builder),
+-                                                                      FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV),
++                                                                      FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV |
++                                                                      FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS),
+                                                        G_VARIANT_TYPE ("(u)"),
+                                                        G_DBUS_CALL_FLAGS_NONE, -1,
+                                                        fd_list, NULL,
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 3fc01584f..c54375e5d 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -467,8 +467,8 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : 
"https://github.com/flatpak/flatpak/releases/download/1.2.3/flatpak-1.2.3.tar.xz";,
-                    "sha256" : "bb4720307fc10465660e37bb9489c1d9a349c19143e24f65ddb49032f8b00d44"
+                    "url" : 
"https://github.com/flatpak/flatpak/releases/download/1.2.4/flatpak-1.2.4.tar.xz";,
+                    "sha256" : "1b6539d94d31e571661a2545cfcece7ec9267b4e2552e3cc0f617f4790f6c3e1"
                 }
             ]
         },
@@ -477,8 +477,12 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : 
"https://github.com/flatpak/flatpak-builder/releases/download/1.0.5/flatpak-builder-1.0.5.tar.xz";,
-                    "sha256" : "ab9a2d6395def37d60983a232c4105d6ed8dd8ba4f798e76ba75b8c366bfb0d0"
+                    "url" : 
"https://github.com/flatpak/flatpak-builder/releases/download/1.0.6/flatpak-builder-1.0.6.tar.xz";,
+                    "sha256" : "3b572ad7b7cce9ca6a8632ca69a49a47b20e99066fe064b7b56e7896dca789bb"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "flatpak-builder-watch-bus.patch"
                 }
             ]
         },