packages/gnome-initial-setup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:c19b4e18c09cd77908c61358a9314fd607a13b0f
Branches Tags
packages:main
..
compare: packages:b1be3e3bef7adab396116e66ccbd35ce86ce8cbe
Branches Tags
packages:main

No commits in common. "c19b4e18c09cd77908c61358a9314fd607a13b0f" and "b1be3e3bef7adab396116e66ccbd35ce86ce8cbe" have entirely different histories.
c19b4e18c0 ... b1be3e3bef

7 changed files with 156 additions and 144 deletions
Show Stats Expand all files Collapse all files

27
0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch Normal file
View File

@ -0,0 +1,27 @@
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 f1f95a8..9bf41f3 100644
--- a/gnome-initial-setup/pages/timezone/backward
+++ b/gnome-initial-setup/pages/timezone/backward
@@ -29,7 +29,6 @@ Link Asia/Chongqing Asia/Chungking
Link Asia/Dhaka Asia/Dacca
Link Asia/Kathmandu Asia/Katmandu
Link Asia/Kolkata Asia/Calcutta
-Link Asia/Macau Asia/Macao
Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Ho_Chi_Minh Asia/Saigon
Link Asia/Thimphu Asia/Thimbu
--
2.19.1

BIN
gnome-initial-setup-3.30.0.tar.xz Normal file
View File

Binary file not shown.

BIN
gnome-initial-setup-44.0.tar.xz
View File

Binary file not shown.

130
gnome-initial-setup.spec
View File

@ -1,126 +1,76 @@
%global nm_version 1.2
%global nma_version 1.0
%global glib_required_version 2.63.1
%global gtk_required_version 4.6
%global geoclue_version 2.3.1
Name: gnome-initial-setup
Version: 44.0
Release: 1
Summary: Bootstrapping your OS
Version: 3.30.0
Release: 3
Summary: A easy way to prepare a new system
License: GPLv2+
URL: https://wiki.gnome.org/Design/OS/InitialSetup
Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-initial-setup/3.30/gnome-initial-setup-%{version}.tar.xz
Source1: vendor.conf
Patch0000: honor-firstboot-disabled.patch
Patch9000: 0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch
#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
BuildRequires: krb5-devel desktop-file-utils intltool libpwquality-devel
BuildRequires: pkgconfig(libnm) >= 1.2 pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(libnma) >= 1.0 pkgconfig(cheese)
BuildRequires: pkgconfig(accountsservice) pkgconfig(fontconfig)
BuildRequires: pkgconfig(gnome-desktop-3.0) pkgconfig(gweather-3.0)
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) >= 3.11.3 pkgconfig(glib-2.0) >= 2.53.0
BuildRequires: pkgconfig(gio-2.0) >= 2.53.0 pkgconfig(gio-unix-2.0) >= 2.53.0
BuildRequires: pkgconfig(gdm) pkgconfig(iso-codes) krb5-devel
BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.3.1 pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(webkit2gtk-4.0) ibus-devel rest-devel polkit-devel
BuildRequires: libsecret-devel autoconf gnome-common
Requires: gdm geoclue2-libs >= 2.3.1 glib2 >= 2.53.0 polkit-js-engine libgnomekbd
Requires(pre): shadow-utils
Provides: user(%name)
%description
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.
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.
%prep
%autosetup -p1
%build
%meson -Dparental_controls=disabled
%meson_build
autoreconf -i
%configure --enable-software-sources --with-vendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
%make_build
%install
%meson_install
%make_install
%delete_la
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/setup-shell.desktop
install -d %{buildroot}%{_datadir}/gnome-initial-setup
cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
%find_lang %{name}
%check
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-initial-setup.desktop
%find_lang gnome-initial-setup
%pre
useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
%files -f %{name}.lang
%license COPYING
%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
%files -f gnome-initial-setup.lang
%doc README COPYING
%{_libexecdir}/gnome-initial-setup*
%{_libexecdir}/gnome-welcome-tour
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/gdm/greeter/applications/*.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}/*
%dir %{_datadir}/gnome-initial-setup
%{_datadir}/gnome-initial-setup/vendor.conf
%changelog
* Mon Nov 27 2023 lwg <liweiganga@uniontech.com> - 44.0-1
- update to version 44.0
* Thu Mar 02 2023 wenlong ding <wenlong.ding@turbolinux.com.cn> - 43.2-2
- Move '%%find_lang %{name}' to %%install, fix not found %{name}.lang if disable %%check build
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
- Update to 43.2
* Mon Jun 13 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.2-1
- Update to 42.2
* Mon Jun 7 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.5-1
- Upgrade to 3.38.5
- Update Version, Release, Source0, BuildRequires, Requires, stage 'build', 'install', 'files'
- Use meson rebuild, delete setup-shell.desktop, which doesn't existed in this version
- Delete honor-firstboot-disabled.patch which existed in this version
* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.30.0-3
- Type:bugfix
- ID:NA

2
gnome-initial-setup.yaml
View File

@ -1,4 +1,4 @@
version_control: gitlab.gnome
src_repo: gnome-initial-setup
tag_prefix: ^
separator: .
seperator: .

88
honor-firstboot-disabled.patch Normal file
View File

@ -0,0 +1,88 @@
From cfa7925f70ec44a976f6d0426133e3b8ba589142 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 23 Jan 2017 19:42:44 +0100
Subject: [PATCH] Exit gracefully if we are disabled systemwide
Sysadmins might want to disable any kind of initial setup for their
users, perhaps because they pre-configure their environments. We
should provide an easy way to do it.
At least the anaconda installer provides an option to skip any kind
post-install setup tools so, for now we're only adding support for
that but more might be added in the future.
https://bugzilla.gnome.org/show_bug.cgi?id=777707
---
gnome-initial-setup/Makefile.am | 3 +-
gnome-initial-setup/gnome-initial-setup.c | 34 +++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 6b6d5fb..e6a3e10 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -12,7 +12,8 @@ AM_CPPFLAGS = \
-DUIDIR="\"$(uidir)\"" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
- -DDATADIR=\""$(datadir)"\"
+ -DDATADIR=\""$(datadir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\"
libexec_PROGRAMS = gnome-initial-setup gnome-initial-setup-copy-worker
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 414ea94..989827b 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -247,6 +247,31 @@ get_mode (void)
return GIS_DRIVER_MODE_NEW_USER;
}
+static gboolean
+initial_setup_disabled_by_anaconda (void)
+{
+ GKeyFile *key_file;
+ const gchar *file_name = SYSCONFDIR "/sysconfig/anaconda";
+ gboolean disabled = FALSE;
+ GError *error = NULL;
+
+ key_file = g_key_file_new ();
+ if (!g_key_file_load_from_file (key_file, file_name, G_KEY_FILE_NONE, &error)) {
+ if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT) &&
+ !g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND)) {
+ g_warning ("Could not read %s: %s", file_name, error->message);
+ }
+ g_error_free (error);
+ goto out;
+ }
+
+ disabled = g_key_file_get_boolean (key_file, "General",
+ "post_install_tools_disabled", NULL);
+ out:
+ g_key_file_unref (key_file);
+ return disabled;
+}
+
int
main (int argc, char *argv[])
{
@@ -281,6 +306,15 @@ main (int argc, char *argv[])
skipped_pages = g_ptr_array_new_with_free_func ((GDestroyNotify) gtk_widget_destroy);
mode = get_mode ();
+ /* We only do this in existing-user mode, because if gdm launches us
+ * in new-user mode and we just exit, gdm's special g-i-s session
+ * never terminates. */
+ if (initial_setup_disabled_by_anaconda () &&
+ mode == GIS_DRIVER_MODE_EXISTING_USER) {
+ gis_ensure_stamp_files ();
+ exit (EXIT_SUCCESS);
+ }
+
/* When we are running as the gnome-initial-setup user we
* dont have a normal user session and need to initialize
* the keyring manually so that we can pass the credentials
--
2.19.0.rc0

53
webkitgtk-6.0.patch
View File

@ -1,53 +0,0 @@
From 716516f82f975016a4ec025e6f09cbc996564365 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
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 <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 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 <webkit2/webkit2.h>
+#include <webkit/webkit.h>
#include <locale.h>
#include <gtk/gtk.h>
--
2.38.1