diff options
| author | Michael Catanzaro <mcatanzaro@redhat.com> | 2022-11-21 13:25:10 -0600 |
|---|---|---|
| committer | Will Thompson <wjt@endlessos.org> | 2022-12-02 15:05:36 +0000 |
| commit | 2b539a5b85950b3096c3e711f43f98b55897a3ab (patch) | |
| tree | 71394b9ea69f39b6af7d2e2ab8f6843395cbdbe7 | |
| parent | 704e2b859037475fcfc9297732851dde9abed7cc (diff) | |
| download | gnome-initial-setup-2b539a5b85950b3096c3e711f43f98b55897a3ab.tar.gz | |
Support both webkitgtk-6.0 and webkit2gtk-5.0
Let's fall back to webkit2gtk-5.0 if webkitgtk-6.0 is not available.
(cherry picked from commit c848110d0935f52dc882e552b3a8afe50c9c31e8)
| -rw-r--r-- | gnome-initial-setup/gis-driver.c | 5 | ||||
| -rw-r--r-- | gnome-initial-setup/meson.build | 2 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.c | 4 | ||||
| -rw-r--r-- | meson.build | 7 |
4 files changed, 17 insertions, 1 deletions
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c index e6835a5..1ddf3c6 100644 --- a/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c @@ -26,7 +26,12 @@ #include <errno.h> #include <locale.h> #include <stdlib.h> + +#ifdef HAVE_WEBKITGTK_6_0 #include <webkit/webkit.h> +#else +#include <webkit2/webkit2.h> +#endif #include "cc-common-language.h" #include "gis-assistant.h" diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build index ce09829..a3dd513 100644 --- a/gnome-initial-setup/meson.build +++ b/gnome-initial-setup/meson.build @@ -63,11 +63,11 @@ dependencies = [ dependency ('libsecret-1', version: '>= 0.18.8'), dependency ('pwquality'), dependency ('rest-1.0'), - dependency ('webkitgtk-6.0'), ibus_dep, libmalcontent_dep, libmalcontent_ui_dep, libadwaita_dep, + webkitgtk_dep ] executable( diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c index eff481f..3632142 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c @@ -27,7 +27,11 @@ #include "privacy-resources.h" #include "gis-privacy-page.h" +#ifdef HAVE_WEBKITGTK_6_0 #include <webkit/webkit.h> +#else +#include <webkit2/webkit2.h> +#endif #include <locale.h> #include <gtk/gtk.h> diff --git a/meson.build b/meson.build index 5f8c282..1e9626c 100644 --- a/meson.build +++ b/meson.build @@ -77,6 +77,13 @@ libmalcontent_ui_dep = dependency ('malcontent-ui-1', have_parental_controls = libmalcontent_dep.found() and libmalcontent_ui_dep.found() conf.set('HAVE_PARENTAL_CONTROLS', have_parental_controls) +webkitgtk_dep = dependency('webkitgtk-6.0', required: false) +if webkitgtk_dep.found() + conf.set10('HAVE_WEBKITGTK_6_0', true) +else + webkitgtk_dep = dependency('webkit2gtk-5.0') +endif + configure_file(output: 'config.h', configuration: conf) config_h_dir = include_directories('.') |