[epiphany] flatpak: Temporarily bundle GTK+ and add debug patch

[Michael Catanzaro <mcatanzaro src gnome org>]

commit c792368db346e7b4ad747897cb2d21103d12eda5
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Dec 20 17:56:25 2018 -0600

    flatpak: Temporarily bundle GTK+ and add debug patch

 flatpak/gtk-debug.patch         | 39 +++++++++++++++++++++++++++++++++++++++
 flatpak/org.gnome.Epiphany.json | 19 +++++++++++++++++++
 2 files changed, 58 insertions(+)
---
diff --git a/flatpak/gtk-debug.patch b/flatpak/gtk-debug.patch
new file mode 100644
index 000000000..9d9312ab8
--- /dev/null
+++ b/flatpak/gtk-debug.patch
@@ -0,0 +1,39 @@
+From a87640c983103d578ec9750a6e882c6b943c1047 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg gnome org>
+Date: Mon, 17 Dec 2018 20:05:17 +0100
+Subject: [PATCH] blah
+
+---
+ gdk/wayland/gdkdevice-wayland.c | 1 +
+ gtk/gtkmain.c                   | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
+index fb3cfcb505..3837a61498 100644
+--- a/gdk/wayland/gdkdevice-wayland.c
++++ b/gdk/wayland/gdkdevice-wayland.c
+@@ -2283,6 +2283,7 @@ keyboard_handle_key (void               *data,
+   seat->keyboard_key_serial = serial;
+   seat->repeat_count = 0;
+   _gdk_wayland_display_update_serial (display, serial);
++  g_message ("Handle wl_keyboard.key %d, state: %d", key + 8, state_w);
+   deliver_key_event (data, time, key + 8, state_w, FALSE);
+
+ }
+diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
+index 12b5d6659d..1e2ab1b58c 100644
+--- a/gtk/gtkmain.c
++++ b/gtk/gtkmain.c
+@@ -1789,6 +1789,10 @@ gtk_main_do_event (GdkEvent *event)
+   if (check_event_in_child_popover (event_widget, grab_widget))
+     grab_widget = event_widget;
+
++  if (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE)
++    g_message ("Handle key event %d in GTK, target widget %p (%s)",
++               event->type, grab_widget, gtk_widget_get_name (grab_widget));
++
+   /* If the widget receiving events is actually blocked by another
+    * device GTK+ grab
+    */
+--
+2.19.2
diff --git a/flatpak/org.gnome.Epiphany.json b/flatpak/org.gnome.Epiphany.json
index ff313d450..c846dc664 100644
--- a/flatpak/org.gnome.Epiphany.json
+++ b/flatpak/org.gnome.Epiphany.json
@@ -43,6 +43,25 @@
         "*.a"
     ],
     "modules" : [
+        {
+            "name" : "gtk",
+            "config-opts" : [
+                "--libdir=/app/lib"
+            ],
+            "buildsystem" : "autotools",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git";,
+                    "branch" : "gtk-3-24"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "gtk-debug.patch"
+                }
+            ]
+        },
         {
             "name" : "libdazzle",
             "config-opts" : [