From d041fa1e7e707b60f4ecc54436c54acc75943790 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mar 09 2023 17:24:34 +0000 Subject: Disable granite dependency Yes I could have used a meson arg for this, but stuffing it into a patch guarantees we don't forget to remove it when 44.0 is released. --- diff --git a/webkitgtk-2.39.91.patch b/webkitgtk-2.39.91.patch index f86c281..43331a4 100644 --- a/webkitgtk-2.39.91.patch +++ b/webkitgtk-2.39.91.patch @@ -1692,3 +1692,32 @@ index 0a3345c80..3350fd83b 100644 -- GitLab +From 155fcd489d97ad885c7fc0e18ca5ba9ba3bfadca Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 4 Mar 2023 17:20:58 -0600 +Subject: [PATCH] Disable granite dependency by default + +This is probably only wanted by elementary OS and our flatpak builds. +Other distros that ship Pantheon probably don't want to make Epiphany +depend on Granite. + +Part-of: +--- + meson_options.txt | 2 +- + org.gnome.Epiphany.json | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index 452716670..93ca62504 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -36,6 +36,6 @@ option('gsb_api_key', + + option('granite', + type: 'feature', +- value: 'auto', ++ value: 'disabled', + description: 'Enable elementary OS integration. Requires Granite' + ) +-- +GitLab