[epiphany/gnome-3-32] Require GTK 3.24 and recent system libdazzle

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ae98f8c8445fce9321e5a4d4d32c0c60c85618ec
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Feb 20 15:52:40 2019 -0600

    Require GTK 3.24 and recent system libdazzle
    
    Hasn't been possible to build against GTK 3.22 for some time. The plan
    to support Ubuntu 18.04 in new major versions of Epiphany has failed.

 .gitmodules                         |  3 ---
 lib/widgets/ephy-location-entry.c   |  2 --
 meson.build                         | 16 ++--------------
 po/POTFILES.skip                    |  1 -
 src/ephy-mouse-gesture-controller.c |  2 --
 subprojects/libdazzle               |  1 -
 6 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 76298f76e..f4788ba41 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "subprojects/libhandy"]
        path = subprojects/libhandy
        url = https://source.puri.sm/Librem5/libhandy.git
-[submodule "subprojects/libdazzle"]
-       path = subprojects/libdazzle
-       url = https://gitlab.gnome.org/GNOME/libdazzle.git
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index c7b06afd2..0beb4b507 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -303,9 +303,7 @@ ephy_location_entry_constructed (GObject *object)
 
   G_OBJECT_CLASS (ephy_location_entry_parent_class)->constructed (object);
 
-#if GTK_CHECK_VERSION(3, 22, 20)
   gtk_entry_set_input_hints (GTK_ENTRY (entry->url_entry), GTK_INPUT_HINT_NO_EMOJI);
-#endif
 }
 
 static void
diff --git a/meson.build b/meson.build
index 1a130eb3a..36455ec37 100644
--- a/meson.build
+++ b/meson.build
@@ -76,11 +76,8 @@ else
   )
 endif
 
-# Dependencies policy: except for WebKitGTK+, all dependency versions must be
-# available in Ubuntu 18.04. Please check before bumping the required version
-# of any dependency.
 glib_requirement = '>= 2.56.0'
-gtk_requirement = '>= 3.22.13'
+gtk_requirement = '>= 3.24.0'
 nettle_requirement = '>= 3.4'
 webkitgtk_requirement = '>= 2.21.92'
 
@@ -98,7 +95,7 @@ hogweed_dep = dependency('hogweed', version: nettle_requirement)
 icu_uc_dep = dependency('icu-uc', version: '>= 4.6')
 iso_codes_dep = dependency('iso-codes', version: '>= 0.35')
 json_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.4')
-libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.29.4', required: false)
+libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.31.90')
 libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.8', required: false)
 libnotify_dep = dependency('libnotify', version: '>= 0.5.1')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.14')
@@ -109,15 +106,6 @@ sqlite3_dep = dependency('sqlite3', version: '>= 3.0')
 webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement)
 webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement)
 
-# Ubuntu 18.04 has libdazzle 3.28, the max we can require from the system, but
-# we need 3.30, so bundle it if the system copy is too old.
-if not libdazzle_dep.found()
-  libdazzle_dep = subproject('libdazzle', default_options: ['package_subdir=epiphany',
-                                                            'enable_tools=false',
-                                                            'with_introspection=false',
-                                                            'with_vapi=false']).get_variable('libdazzle_dep')
-endif
-
 # Ubuntu 18.04 doesn't have libhandy at all, and we need 0.0.5, so bundle it if
 # the system copy is missing or too old.
 if not libhandy_dep.found()
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5b437b5d5..3064399bd 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-subprojects/libdazzle
 subprojects/libhandy
diff --git a/src/ephy-mouse-gesture-controller.c b/src/ephy-mouse-gesture-controller.c
index 5cc286019..f494cbc5b 100644
--- a/src/ephy-mouse-gesture-controller.c
+++ b/src/ephy-mouse-gesture-controller.c
@@ -274,10 +274,8 @@ ephy_mouse_gesture_controller_constructed (GObject *object)
 
   ephy_mouse_gesture_controller_reset (self);
 
-#if GTK_CHECK_VERSION (3, 24, 0)
   self->controller = gtk_event_controller_motion_new (GTK_WIDGET (self->window));
   g_signal_connect (self->controller, "motion", G_CALLBACK (ephy_mouse_gesture_controller_motion_cb), self);
-#endif
 }
 
 static void