From 503e1b59fa7757543bb0133d3d902b359f5c5e7b Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 5 Dec 2022 12:23:12 -0600 Subject: [PATCH] Build against webkitgtk-6.0 --- gnome-initial-setup.spec | 4 +++ webkitgtk-6.0.patch | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 webkitgtk-6.0.patch diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index d50b3e9..f6e8acd 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -16,6 +16,10 @@ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf +# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/164 +# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/165 +Patch0: webkitgtk-6.0.patch + BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch new file mode 100644 index 0000000..517934d --- /dev/null +++ b/webkitgtk-6.0.patch @@ -0,0 +1,53 @@ +From 716516f82f975016a4ec025e6f09cbc996564365 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Dec 2022 12:21:26 -0600 +Subject: [PATCH] Build against webkitgtk-6.0 + +--- + gnome-initial-setup/gis-driver.c | 2 +- + gnome-initial-setup/meson.build | 2 +- + gnome-initial-setup/pages/privacy/gis-privacy-page.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +index 1fbf636c..e6835a5f 100644 +--- a/gnome-initial-setup/gis-driver.c ++++ b/gnome-initial-setup/gis-driver.c +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + + #include "cc-common-language.h" + #include "gis-assistant.h" +diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build +index 3127803c..ce098298 100644 +--- a/gnome-initial-setup/meson.build ++++ b/gnome-initial-setup/meson.build +@@ -63,7 +63,7 @@ dependencies = [ + dependency ('libsecret-1', version: '>= 0.18.8'), + dependency ('pwquality'), + dependency ('rest-1.0'), +- dependency ('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 40cfd882..eff481f7 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 ++#include + + #include + #include +-- +2.38.1 +