Update to 45.beta

- Requiring tecla instead of gkbd-keyboard-display
This commit is contained in:
Kalev Lember 2023-08-07 19:40:14 +02:00
parent a8d457e5d9
commit b88e9a63a9
3 changed files with 6 additions and 71 deletions

View File

@ -1,64 +0,0 @@
From 160b92daf385fbe627bd39ff4094316e2ecbf8f7 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Thu, 23 Mar 2023 14:54:14 -0500
Subject: [PATCH] software: don't ever call 'fedora-third-party disable'
Instead, leave the setting unset if third-party repos are not disabled
to give GNOME Software a chance to ask the user again. See:
https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2118
https://pagure.io/fedora-workstation/issue/363
Fixes #186
---
.../pages/software/gis-software-page.c | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/gnome-initial-setup/pages/software/gis-software-page.c b/gnome-initial-setup/pages/software/gis-software-page.c
index 16b00dad..e1d0c280 100644
--- a/gnome-initial-setup/pages/software/gis-software-page.c
+++ b/gnome-initial-setup/pages/software/gis-software-page.c
@@ -81,25 +81,27 @@ gis_software_page_apply (GisPage *gis_page,
g_autofree char *program = NULL;
g_autoptr (GError) error = NULL;
- program = find_fedora_third_party ();
-
- if (program)
+ if (priv->enabled)
{
- const char *arg1;
-
- if (priv->enabled)
- arg1 = "enable";
- else
- arg1 = "disable";
-
- gis_pkexec (program, arg1, "root", &error);
- if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_warning ("%s failed: %s", program, error->message);
+ program = find_fedora_third_party ();
+ if (program)
+ {
+ gis_pkexec (program, "enable", "root", &error);
+ if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ g_warning ("%s failed: %s", program, error->message);
+ }
}
+ /* If not enabled, do nothing rather than calling 'fedora-third-party disable'
+ * to leave the setting in an indeterminate state, to allow GNOME Software to
+ * prompt the user once more when it runs for the first time.
+ */
+
return FALSE;
}
+/* End distro-specific stuff */
+
static void
gis_software_page_locale_changed (GisPage *gis_page)
{
--
GitLab

View File

@ -7,18 +7,15 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-initial-setup
Version: 44.0
Version: 45~beta
Release: %autorelease
Summary: Bootstrapping your OS
License: GPL-2.0-or-later
URL: https://wiki.gnome.org/Design/OS/InitialSetup
Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{tarball_version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/45/%{name}-%{tarball_version}.tar.xz
Source1: vendor.conf
# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/197
Patch0: fedora-third-party-disable.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: meson
@ -58,7 +55,7 @@ Requires: geoclue2-libs%{?_isa} >= %{geoclue_version}
Requires: glib2%{?_isa} >= %{glib_required_version}
# we install a rules file
Requires: polkit-js-engine
Requires: /usr/bin/gkbd-keyboard-display
Requires: /usr/bin/tecla
Requires(pre): shadow-utils
@ -99,6 +96,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_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}/dconf/profile/gnome-initial-setup
%{_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
@ -106,6 +104,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_userunitdir}/*
%dir %{_datadir}/gnome-initial-setup
%{_datadir}/gnome-initial-setup/initial-setup-dconf-defaults
%{_datadir}/gnome-initial-setup/vendor.conf
%changelog

View File

@ -1 +1 @@
SHA512 (gnome-initial-setup-44.0.tar.xz) = c1de1b0eea875f70c64ca87abeb4bf33c6afab52c83ed35c2bc0d08ef2ae29ce7a151185a3f32e110e8f1621259f1e38939bbdb4547ecadadf4abeed64a4cc05
SHA512 (gnome-initial-setup-45.beta.tar.xz) = 903e78656d9bb55b25f2a280bc18b7ea35117a3accfd6ffc0551eea000fd5a2b2b81402a6652d3a23a9dfbe7601478c3e2414a975b58d0f39141a213adf6be42