diff options
| author | Michael Catanzaro <mcatanzaro@redhat.com> | 2022-11-18 13:30:58 -0600 |
|---|---|---|
| committer | Will Thompson <wjt@endlessos.org> | 2022-12-02 15:05:36 +0000 |
| commit | 704e2b859037475fcfc9297732851dde9abed7cc (patch) | |
| tree | 4db214a9df545d4312c94aa89e259171067e8fd3 | |
| parent | 462343610490bc98a2ef0375c398299ebad855ca (diff) | |
| download | gnome-initial-setup-704e2b859037475fcfc9297732851dde9abed7cc.tar.gz | |
Try harder to support webkitgtk-6.0
bfb0e6a97a26994d098e02f83ab95e4c293053ca attempted to handle recent
WebKitGTK API changes, but failed because I gave Will incorrect advice.
I thought changing just the pkg-config name would be enough, but the
header file name has changed too. I should know, because I was the one
who changed it....
(cherry picked from commit 48a971685ff4038412f14f5740dd2a33eb44f85f)
| -rw-r--r-- | gnome-initial-setup/gis-driver.c | 2 | ||||
| -rw-r--r-- | gnome-initial-setup/meson.build | 5 | ||||
| -rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c index 1fbf636..e6835a5 100644 --- a/gnome-initial-setup/gis-driver.c +++ b/gnome-initial-setup/gis-driver.c @@ -26,7 +26,7 @@ #include <errno.h> #include <locale.h> #include <stdlib.h> -#include <webkit2/webkit2.h> +#include <webkit/webkit.h> #include "cc-common-language.h" #include "gis-assistant.h" diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build index 57c742f..ce09829 100644 --- a/gnome-initial-setup/meson.build +++ b/gnome-initial-setup/meson.build @@ -63,10 +63,7 @@ dependencies = [ dependency ('libsecret-1', version: '>= 0.18.8'), dependency ('pwquality'), dependency ('rest-1.0'), - dependency ( - 'webkitgtk-6.0', - 'webkit2gtk-5.0', - ), + dependency ('webkitgtk-6.0'), ibus_dep, libmalcontent_dep, libmalcontent_ui_dep, diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c index 40cfd88..eff481f 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c @@ -27,7 +27,7 @@ #include "privacy-resources.h" #include "gis-privacy-page.h" -#include <webkit2/webkit2.h> +#include <webkit/webkit.h> #include <locale.h> #include <gtk/gtk.h> |