diff --git a/0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch b/0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch deleted file mode 100644 index 6105924a38a53342522bb266d6760d8ad2f77a99..0000000000000000000000000000000000000000 --- a/0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bebd30ff25d6112a65cdfb7b01040e07920c7735 Mon Sep 17 00:00:00 2001 -Date: Mon, 16 Dec 2019 09:40:30 +0800 -Subject: [PATCH] gnome-initial-setup: remove link Macau to Macao - -reason:remove link Macau to Macao - -Change-Id: Ie4246622b4555b153449e42d9590be4675bebd79 ---- - .../gnome-initial-setup/pages/timezone/backward | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gnome-initial-setup/pages/timezone/backward b/gnome-initial-setup/pages/timezone/backward -index 8594be6..3fe71fc 100644 ---- a/gnome-initial-setup/pages/timezone/backward -+++ b/gnome-initial-setup/pages/timezone/backward -@@ -35,7 +35,6 @@ Link Asia/Dhaka Asia/Dacca - Link Asia/Shanghai Asia/Harbin - Link Asia/Urumqi Asia/Kashgar - Link Asia/Kathmandu Asia/Katmandu --Link Asia/Macau Asia/Macao - Link Asia/Yangon Asia/Rangoon - Link Asia/Ho_Chi_Minh Asia/Saigon - Link Asia/Jerusalem Asia/Tel_Aviv -@@ -125,4 +124,4 @@ Link Pacific/Pago_Pago US/Samoa - Link Etc/UTC UTC - Link Etc/UTC Universal - Link Europe/Moscow W-SU --Link Etc/UTC Zulu -\ No newline at end of file -+Link Etc/UTC Zulu diff --git a/gnome-initial-setup-42.2.tar.xz b/gnome-initial-setup-42.2.tar.xz deleted file mode 100644 index 75c551a2a05f74ce33ca8b5167d622df0813eafa..0000000000000000000000000000000000000000 Binary files a/gnome-initial-setup-42.2.tar.xz and /dev/null differ diff --git a/gnome-initial-setup-43.2.tar.xz b/gnome-initial-setup-43.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a0943f9d5255b22db39158edf89353aa1fe8ffaa Binary files /dev/null and b/gnome-initial-setup-43.2.tar.xz differ diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index cf41d9b46af998c61c04c087f7f6e682ddb3f840..31173db08f096300b720c236659e3ff9a20cf96d 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,47 +1,67 @@ %global nm_version 1.2 %global nma_version 1.0 %global glib_required_version 2.63.1 -%global gtk_required_version 3.11.3 +%global gtk_required_version 4.6 %global geoclue_version 2.3.1 -%global libhandy_version 1.5.90 Name: gnome-initial-setup -Version: 42.2 +Version: 43.2 Release: 1 -Summary: A easy way to prepare a new system +Summary: Bootstrapping your OS License: GPLv2+ URL: https://wiki.gnome.org/Design/OS/InitialSetup -Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{version}.tar.xz Source1: vendor.conf -Patch9000: 0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch - -BuildRequires: libsecret-devel gnome-common meson gcc -BuildRequires: krb5-devel desktop-file-utils libpwquality-devel -BuildRequires: pkgconfig(libnm) >= %{nm_version} pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(libnma) >= %{nma_version} pkgconfig(cheese) -BuildRequires: pkgconfig(accountsservice) pkgconfig(fontconfig) -BuildRequires: pkgconfig(gnome-desktop-4) pkgconfig(gweather4) -BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5 pkgconfig(goa-1.0) -BuildRequires: pkgconfig(geocode-glib-1.0) pkgconfig(goa-backend-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk_required_version} glib2-devel >= %{glib_required_version} -BuildRequires: pkgconfig(gdm) pkgconfig(iso-codes) -BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version} pkgconfig(packagekit-glib2) -BuildRequires: pkgconfig(webkit2gtk-4.0) ibus-devel rest-devel polkit-devel -BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} - -Requires: gdm polkit-js-engine libgnomekbd -Requires: geoclue2-libs%{?_isa} >= %{geoclue_version} -Requires: glib2%{?_isa} >= %{glib_required_version} -Requires: libhandy%{?_isa} >= %{libhandy_version} + +#Patch0: webkitgtk-6.0.patch + +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: meson +BuildRequires: pkgconfig(accountsservice) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gdm) +BuildRequires: pkgconfig(geocode-glib-2.0) +BuildRequires: pkgconfig(gio-2.0) >= %{glib_required_version} +BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_required_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib_required_version} +BuildRequires: pkgconfig(gnome-desktop-4) +BuildRequires: pkgconfig(goa-1.0) +BuildRequires: pkgconfig(goa-backend-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gtk4) >= %{gtk_required_version} +BuildRequires: pkgconfig(gweather4) +BuildRequires: pkgconfig(ibus-1.0) +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version} +BuildRequires: pkgconfig(libnma-gtk4) >= %{nma_version} +BuildRequires: pkgconfig(libnm) >= %{nm_version} +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(packagekit-glib2) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(pwquality) +BuildRequires: pkgconfig(rest-1.0) +BuildRequires: pkgconfig(webkit2gtk-5.0) + +Requires: gdm +Requires: geoclue2-libs%{?_isa} >= %{geoclue_version} +Requires: glib2%{?_isa} >= %{glib_required_version} +Requires: polkit-js-engine +Requires: /usr/bin/gkbd-keyboard-display Requires(pre): shadow-utils Provides: user(%name) %description -After acquiring or installing a new system there are a few essential things to -set up before use. It would be nice if GNOME had a simple, easy, and safe way to -prepare a new system. +GNOME Initial Setup is an alternative to firstboot, providing +a good setup experience to welcome you to your system, and walks +you through configuring it. It is integrated with gdm. %prep %autosetup -p1 @@ -71,16 +91,21 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %doc NEWS README.md %{_libexecdir}/gnome-initial-setup %{_libexecdir}/gnome-initial-setup-copy-worker +%{_libexecdir}/gnome-initial-setup-goa-helper %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop %{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop %{_datadir}/applications/gnome-initial-setup.desktop %{_datadir}/gnome-session/sessions/gnome-initial-setup.session %{_datadir}/gnome-shell/modes/initial-setup.json %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules +%{_sysusersdir}/gnome-initial-setup.conf %{_userunitdir}/* %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Mon Jan 02 2023 lin zhang - 43.2-1 +- Update to 43.2 + * Mon Jun 13 2022 lin zhang - 42.2-1 - Update to 42.2 diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..517934d19c913d7114ad581f12044650478ea092 --- /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 +