pool/gnome-control-center
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1132163 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1132163
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=536
This commit is contained in:
Dominique Leuenberger 2023-12-11 09:01:35 +00:00 committed by Git OBS Bridge
parent 936f804e7a
commit 18e704070f
8 changed files with 41 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -3,11 +3,11 @@
<service name="obs_scm" mode="manual"> <service name="obs_scm" mode="manual">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param> <param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
<param name="revision">8c6e673c94696ef72a651140892a71437cb7e506</param> <param name="revision">refs/tags/45.2</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param> <param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param> <param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">disable</param>
</service> </service>
<service name="tar" mode="buildtime"/> <service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime"> <service name="recompress" mode="buildtime">

4
_servicedata
View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
<param name="changesrevision">8c6e673c94696ef72a651140892a71437cb7e506</param></service></servicedata>

3
gnome-control-center-45.1+22.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc796a3690c8cd75e308a05447d3a09989c62b8751834a88b8329d00ff7ec3e1
size 46306829

BIN
gnome-control-center-45.2.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

85
gnome-control-center-network-fix-nmce-popup.patch
View File

@ -1,85 +0,0 @@
From 2a7922de9d126a06441e954e6bc406f6da4fc3e8 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Mon, 9 Oct 2023 09:14:03 +0800
Subject: [PATCH] network-connection-editor: Close the editor when
nm-connection-editor exits
Previously, when editing a connection that doesn't have native editor
support, nm-connection-editor is spawned to do the work. But after
closing nm-connection-editor, an empty editor dialog still exists.
Fix that in this commit.
---
.../connection-editor/net-connection-editor.c | 40 ++++++++++++++++---
1 file changed, 35 insertions(+), 5 deletions(-)
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index f97658405..ec5a905a5 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -355,20 +355,48 @@ net_connection_editor_class_init (NetConnectionEditorClass *class)
gtk_widget_class_bind_template_callback (widget_class, apply_clicked_cb);
}
+static void
+nm_connection_editor_watch_cb (GPid pid,
+ gint status,
+ gpointer user_data)
+{
+ g_debug ("Child %d" G_PID_FORMAT " exited %s", pid,
+ g_spawn_check_wait_status (status, NULL) ? "normally" : "abnormally");
+
+ g_spawn_close_pid (pid);
+ /* Close the dialog when nm-connection-editor exits. */
+ gtk_window_destroy (GTK_WINDOW (user_data));
+}
+
static void
net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
{
- g_autofree gchar *cmdline = NULL;
g_autoptr(GError) error = NULL;
+ g_autoptr(GStrvBuilder) builder = NULL;
+ g_auto(GStrv) argv = NULL;
+ GPid child_pid;
+
+ builder = g_strv_builder_new ();
+ g_strv_builder_add (builder, "nm-connection-editor");
if (self->is_new_connection) {
- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
+ g_autofree gchar *type_str = NULL;
+
+ type_str = g_strdup_printf ("--type=%s", type);
+ g_strv_builder_add (builder, type_str);
+ g_strv_builder_add (builder, "--create");
} else {
- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
- nm_connection_get_uuid (self->connection));
+ g_autofree gchar *edit_str = NULL;
+
+ edit_str = g_strdup_printf ("--edit=%s", nm_connection_get_uuid (self->connection));
+ g_strv_builder_add (builder, edit_str);
}
- g_spawn_command_line_async (cmdline, &error);
+ g_strv_builder_add (builder, NULL);
+ argv = g_strv_builder_end (builder);
+
+ g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
+ NULL, NULL, &child_pid, NULL, NULL, NULL, &error);
if (error) {
AdwToast *toast;
@@ -378,6 +406,8 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
toast = adw_toast_new (message);
adw_toast_overlay_add_toast (self->toast_overlay, toast);
+ } else {
+ g_child_watch_add (child_pid, nm_connection_editor_watch_cb, self);
}
g_signal_emit (self, signals[DONE], 0, FALSE);
--
2.42.0

32
gnome-control-center.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Thu Dec 7 20:53:58 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 45.2:
+ Apps:
- Fix status page glitch on initialization
- Fix "File and Link Association" interface not reflecting
changes
+ Background: Improve background preview and chooser performance
+ Default Apps: Fix undesired resetting of default apps during
startup
+ Mouse: Fix interference issue with scroll event in Mouse Test
window
+ Network:
- Close network editor when using non-native
nm-connection-editor
- Show decoration buttons on empty-state (no network device
found page)
- Share WPA3 (SAE) networks with QR Code
- Hide QR Code icon when connection is not successful
- Remove deprecated 'wpa-none'
- Fix route label alignments
+ Privacy:
- Fix crash from free bug in the Camera page
- Fix potential crash on Bolt page visibility
+ Region: Show preview measurement format in current locale
+ Sound: Update mute state when setting mixer control for a
stream
+ Users: Show tooltip information for the Avatar widget
- Drop gnome-control-center-network-fix-nmce-popup.patch: Fixed
upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 6 08:22:24 UTC 2023 - Yifan Jiang <yfjiang@suse.com> Wed Dec 6 08:22:24 UTC 2023 - Yifan Jiang <yfjiang@suse.com>

6
gnome-control-center.obsinfo
View File

@ -1,4 +1,4 @@
name: gnome-control-center name: gnome-control-center
version: 45.1+22 version: 45.2
mtime: 1700838132 mtime: 1701946236
commit: 8c6e673c94696ef72a651140892a71437cb7e506 commit: cc5da95fecaeb5486435c54917edf9633addc02d

5
gnome-control-center.spec
View File

@ -26,7 +26,7 @@
%endif %endif
Name: gnome-control-center Name: gnome-control-center
Version: 45.1+22 Version: 45.2
Release: 0 Release: 0
Summary: The GNOME Control Center Summary: The GNOME Control Center
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -39,8 +39,6 @@ Source99: %{name}-rpmlintrc
Patch1: gnome-control-center-disable-error-message-for-NM.patch Patch1: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-UPSTREAM gnome-control-center-add-user-button.patch bsc#1215556 glgo#GNOME/Settings!1927 xwang@suse.com -- Show add user button # PATCH-FIX-UPSTREAM gnome-control-center-add-user-button.patch bsc#1215556 glgo#GNOME/Settings!1927 xwang@suse.com -- Show add user button
Patch2: gnome-control-center-add-user-button.patch Patch2: gnome-control-center-add-user-button.patch
# PATCH-FIX-UPSTREAM gnome-control-center-network-fix-nmce-popup.patch bsc#1208193 glgo#GNOME/gnome-control-center!1956 sckang@suse.com -- network-connection-editor: Close the editor when nm-connection-editor exits
Patch3: gnome-control-center-network-fix-nmce-popup.patch
### patches for Leap >= 15 plus SLE >= 15, but not TW ### patches for Leap >= 15 plus SLE >= 15, but not TW
# PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
@ -189,7 +187,6 @@ GNOME control center.
%setup -q %setup -q
%patch -P 1 -p1 %patch -P 1 -p1
%patch -P 2 -p1 %patch -P 2 -p1
%patch -P 3 -p1
# patches for Leap >= 15 plus SLE >= 15, but not TW # patches for Leap >= 15 plus SLE >= 15, but not TW
%if 0%{?sle_version} >= 150000 %if 0%{?sle_version} >= 150000