diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index bceb9e4ab754207c8ca26661509ceedd3db630bc..994a048b4e753b817d28f35dcf612854f029a30f 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -6,15 +6,13 @@ Name: gnome-initial-setup Version: 44.0 -Release: 1 +Release: 2 Summary: Bootstrapping your OS License: GPLv2+ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{version}.tar.xz Source1: vendor.conf -#Patch0: webkitgtk-6.0.patch - BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson @@ -46,7 +44,7 @@ BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(pwquality) BuildRequires: pkgconfig(rest-1.0) -BuildRequires: pkgconfig(webkit2gtk-5.0) +BuildRequires: pkgconfig(webkitgtk-6.0) Requires: gdm Requires: geoclue2-libs%{?_isa} >= %{geoclue_version} @@ -103,6 +101,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Thu Feb 27 2025 yaoxin <1024769339@qq.com> - 44.0-2 +- Removing the webkit2gtk-5.0 , and add webkitgtk-6.0 instead + * Mon Nov 27 2023 lwg - 44.0-1 - update to version 44.0 diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch deleted file mode 100644 index 517934d19c913d7114ad581f12044650478ea092..0000000000000000000000000000000000000000 --- a/webkitgtk-6.0.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 -