[epiphany/mcatanzaro/libdazzle-subproject: 2/2] Bring back libdazzle subproject for GNOME 3.32

[Jan-Michael Brummer <jbrummer src gnome org>]

commit 6785bc68618b183e1a4863b99b002f9f13a375de
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Mar 17 12:51:13 2019 -0500

    Bring back libdazzle subproject for GNOME 3.32
    
    Debian Buster wants to ship Ephy 3.32 but libdazzle 3.30, which is too
    old.
    
    Fixes #699

 .gitmodules      |  3 +++
 meson.build      | 10 +++++++++-
 po/POTFILES.skip |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/.gitmodules b/.gitmodules
index f4788ba41..76298f76e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [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/meson.build b/meson.build
index bf961201b..1b0e04da6 100644
--- a/meson.build
+++ b/meson.build
@@ -95,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.31.90')
+libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.31.90', required: false)
 libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.9', required: false)
 libnotify_dep = dependency('libnotify', version: '>= 0.5.1')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.14')
@@ -106,6 +106,14 @@ 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)
 
+# Debian Buster wants to ship Ephy 3.32 but libdazzle 3.30, which 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 3064399bd..5b437b5d5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
+subprojects/libdazzle
 subprojects/libhandy