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

Accepting request 735038 from GNOME:Next

Browse Source 
Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/735038
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=424
This commit is contained in:
Bjørn Lie 2019-10-04 15:39:44 +00:00 committed by Git OBS Bridge
parent 6538f0251b
commit efaefe27eb
11 changed files with 88 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_service
View File

@ -2,9 +2,8 @@
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
<param name="revision">gnome-3-32</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="changesgenerate">enable</param>
<param name="revision">refs/tags/3.34.0.1</param>
<param name="versionformat">@PARENT_TAG@</param>
</service>
<service name="tar" 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">5a6ff6ad76db415cb3f5defd264e569e11a7dde4</param></service></servicedata>

49
control-center-fix-mtu-label.patch
View File

@ -1,49 +0,0 @@
From 1d0f24e077f80d123e53e476fcd57293b82052d5 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Fri, 10 May 2019 15:10:55 +0800
Subject: [PATCH] network: Fix mtu label not requesting enough space
Remove the size group where mtu label belongs, so that it can request
enough space when it becomes visible. Since the size group is removed,
filler widget is no longer useful. Remove it as well.
---
.../network/connection-editor/ethernet-page.ui | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui
index eb1bfb06a..650f72e8a 100644
--- a/panels/network/connection-editor/ethernet-page.ui
+++ b/panels/network/connection-editor/ethernet-page.ui
@@ -199,18 +199,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="filler">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
<child>
<placeholder/>
</child>
@@ -227,10 +215,4 @@
<placeholder/>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="label_mtu"/>
- <widget name="filler"/>
- </widgets>
- </object>
</interface>
--
2.21.0

524
control-center-network-add-domain-suffix-match.patch
View File

@ -1,524 +0,0 @@
From e48d32e5699d824dc229f131246229f077709f84 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathan121537@gmail.com>
Date: Tue, 19 Sep 2017 17:00:18 +0800
Subject: [PATCH 2/2] wifi: Add domain-suffix-match entry
domain-suffix-match has been supported in nm-connection-editor for a
while. So users can edit that property in nm-connection-editor. But
it's still not available in gnome-control-center yet.
Fix that by adding domain-suffix-match entry in tls, ttls and peap
security settings page.
https://bugzilla.gnome.org/show_bug.cgi?id=787882
---
panels/network/wireless-security/eap-method-peap.c | 21 ++++++++++
.../network/wireless-security/eap-method-peap.ui | 43 ++++++++++++++++----
panels/network/wireless-security/eap-method-tls.c | 29 ++++++++++++-
panels/network/wireless-security/eap-method-tls.ui | 47 +++++++++++++++++-----
panels/network/wireless-security/eap-method-ttls.c | 21 ++++++++++
.../network/wireless-security/eap-method-ttls.ui | 39 +++++++++++++++---
6 files changed, 175 insertions(+), 25 deletions(-)
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-peap.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.c 2018-07-24 12:14:46.053325821 +0200
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_label"));
+ g_assert (widget);
+ gtk_size_group_add_widget (group, widget);
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -159,6 +163,12 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_entry"));
+ g_assert (widget);
+ text = gtk_entry_get_text (GTK_ENTRY (widget));
+ if (text && strlen (text))
+ g_object_set (s_8021x, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, text, NULL);
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -424,11 +434,22 @@ eap_method_peap_new (WirelessSecurity *w
(GCallback) wireless_security_changed_cb,
ws_parent);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_entry"));
+ if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
+ gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
+ g_signal_connect (G_OBJECT (widget), "changed",
+ (GCallback) wireless_security_changed_cb,
+ ws_parent);
+
if (secrets_only) {
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_entry"));
gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_label"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_entry"));
+ gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-peap.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.ui 2018-07-24 12:14:46.053325821 +0200
@@ -67,6 +67,33 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="eap_peap_domain_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Domain:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eap_peap_domain_entry</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="eap_peap_domain_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="eap_peap_ca_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -77,7 +104,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -88,7 +115,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -103,7 +130,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -117,7 +144,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -135,7 +162,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -149,7 +176,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -167,7 +194,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -181,7 +208,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
<property name="width">2</property>
</packing>
</child>
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-tls.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.c 2018-07-24 12:14:46.053325821 +0200
@@ -139,6 +139,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_label"));
+ g_assert (widget);
+ gtk_size_group_add_widget (group, widget);
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -181,6 +185,12 @@ fill_connection (EAPMethod *parent, NMCo
g_assert (widget);
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_entry"));
+ g_assert (widget);
+ g_object_set (s_8021x,
+ parent->phase2 ? NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH : NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH,
+ gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
+
/* TLS private key */
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
g_assert (widget);
@@ -384,7 +394,7 @@ setup_filepicker (GtkBuilder *builder,
filter = eap_method_default_file_chooser_filter_new (privkey);
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
- /* For some reason, GTK+ calls set_current_filter (..., NULL) from
+ /* For some reason, GTK+ calls set_current_filter (..., NULL) from
* gtkfilechooserdefault.c::show_and_select_files_finished_loading() on our
* dialog; so force-reset the filter to what we want it to be whenever
* it gets cleared.
@@ -482,6 +492,19 @@ eap_method_tls_new (WirelessSecurity *ws
if (s_8021x && nm_setting_802_1x_get_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_entry"));
+ g_assert (widget);
+ g_signal_connect (G_OBJECT (widget), "changed",
+ (GCallback) wireless_security_changed_cb,
+ ws_parent);
+ if (phase2) {
+ if (s_8021x && nm_setting_802_1x_get_phase2_domain_suffix_match (s_8021x))
+ gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_phase2_domain_suffix_match (s_8021x));
+ } else {
+ if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
+ gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
+ }
+
setup_filepicker (parent->builder, "eap_tls_user_cert_button",
_("Choose your personal certificate"),
ws_parent, parent, s_8021x,
@@ -531,6 +554,10 @@ eap_method_tls_new (WirelessSecurity *ws
if (secrets_only) {
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
gtk_widget_set_sensitive (widget, FALSE);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_label"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_entry"));
+ gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"));
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-tls.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.ui 2018-07-24 12:14:46.053325821 +0200
@@ -43,6 +43,33 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="eap_tls_domain_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Domain:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eap_tls_domain_entry</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="eap_tls_domain_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="eap_tls_user_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -53,7 +80,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -64,7 +91,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -78,7 +105,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -89,7 +116,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -104,7 +131,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -118,7 +145,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -129,7 +156,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -143,7 +170,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -156,7 +183,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -171,7 +198,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
</packing>
</child>
</object>
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-ttls.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.c 2018-07-24 12:14:46.057325870 +0200
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_label"));
+ g_assert (widget);
+ gtk_size_group_add_widget (group, widget);
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -154,6 +158,12 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_entry"));
+ g_assert (widget);
+ text = gtk_entry_get_text (GTK_ENTRY (widget));
+ if (text && strlen (text))
+ g_object_set (s_8021x, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, text, NULL);
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -451,6 +461,13 @@ eap_method_ttls_new (WirelessSecurity *w
(GCallback) wireless_security_changed_cb,
ws_parent);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_entry"));
+ if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
+ gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
+ g_signal_connect (G_OBJECT (widget), "changed",
+ (GCallback) wireless_security_changed_cb,
+ ws_parent);
+
widget = inner_auth_combo_init (method, connection, s_8021x, secrets_only);
inner_auth_combo_changed_cb (widget, (gpointer) method);
@@ -459,6 +476,10 @@ eap_method_ttls_new (WirelessSecurity *w
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_label"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_entry"));
+ gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-ttls.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.ui 2018-07-24 12:14:46.057325870 +0200
@@ -50,6 +50,33 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="eap_ttls_domain_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Domain:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eap_ttls_domain_entry</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="eap_ttls_domain_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="eap_ttls_ca_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -60,7 +87,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -71,7 +98,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -87,7 +114,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -101,7 +128,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -119,7 +146,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -134,7 +161,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>

3
gnome-control-center-3.32.2+9.obscpio
View File

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

3
gnome-control-center-3.34.0.1.obscpio Normal file
View File

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

26
gnome-control-center-Remove-leftover-canberra-gtk.patch Normal file
View File

@ -0,0 +1,26 @@
From 1fb8edb9c3734ce108388304af221188be79c400 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Fri, 20 Sep 2019 08:37:42 +0300
Subject: [PATCH] sound: Remove leftover canberra-gtk header inclusion
This may fail to build too, as we don't depend on canberra-gtk anymore,
and gsound only depends on canberra, not canberra-gtk.
---
panels/sound/cc-volume-slider.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/panels/sound/cc-volume-slider.c b/panels/sound/cc-volume-slider.c
index 9f0610f63..98541e98a 100644
--- a/panels/sound/cc-volume-slider.c
+++ b/panels/sound/cc-volume-slider.c
@@ -20,7 +20,6 @@
#include <math.h>
#include <pulse/pulseaudio.h>
#include <gvc-mixer-control.h>
-#include <canberra-gtk.h>
#include "cc-sound-resources.h"
#include "cc-volume-slider.h"
--
2.22.0

174
gnome-control-center-disable-error-message-for-NM.patch
View File

@ -1,174 +0,0 @@
Index: gnome-control-center-3.32.1/panels/network/cc-network-panel.c
===================================================================
--- gnome-control-center-3.32.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.32.1/panels/network/cc-network-panel.c
@@ -775,10 +775,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label;
gchar *markup;
const gchar *version;
+ const gchar *state;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
/* parse running version */
version = nm_client_get_version (panel->client);
- if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@@ -801,9 +815,27 @@ panel_check_network_manager_version (CcN
gtk_widget_show_all (box);
g_free (markup);
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
+ gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
+
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
+ gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
+ gtk_widget_set_vexpand (box, TRUE);
+ gtk_container_add (GTK_CONTAINER (panel), box);
+
+ label = gtk_label_new (_("Please use YaST2 to configure your network."));
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+
+ gtk_widget_show_all (box);
} else {
manager_running (panel->client, NULL, panel);
}
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
Index: gnome-control-center-3.32.1/panels/network/cc-wifi-panel.c
===================================================================
--- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.c
@@ -183,21 +183,41 @@ static void
check_main_stack_page (CcWifiPanel *self)
{
const gchar *nm_version;
+ const gchar *state;
gboolean airplane_mode_active;
gboolean wireless_enabled;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
nm_version = nm_client_get_version (self->client);
wireless_enabled = nm_client_wireless_get_enabled (self->client);
airplane_mode_active = gtk_switch_get_active (self->rfkill_switch);
- if (!nm_version)
+ if (!nm_version && g_strcmp0 (state, "inactive") == 0)
gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running");
+ else if (!nm_version && g_strcmp0 (state, "active") == 0)
+ gtk_stack_set_visible_child_name (self->main_stack, "wicked-running");
else if (!wireless_enabled && airplane_mode_active)
gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode");
else if (!wireless_enabled || self->devices->len == 0)
gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices");
else
gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections");
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
Index: gnome-control-center-3.32.1/panels/network/cc-wifi-panel.ui
===================================================================
--- gnome-control-center-3.32.1.orig/panels/network/cc-wifi-panel.ui
+++ gnome-control-center-3.32.1/panels/network/cc-wifi-panel.ui
@@ -315,6 +315,48 @@
<property name="name">nm-not-running</property>
</packing>
</child>
+
+ <!-- "Wicked Running" page -->
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="expand">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="margin">18</property>
+ <property name="spacing">18</property>
+ <child type="center">
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">face-sad-symbolic</property>
+ <property name="pixel_size">128</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="label" translatable="yes">Please use YaST2 to configure your network.</property>
+ <attributes>
+ <attribute name="scale" value="1.42" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="name">wicked-running</property>
+ </packing>
+ </child>
</object>
</child>
Index: gnome-control-center-3.32.1/tests/meson.build
===================================================================
--- gnome-control-center-3.32.1.orig/tests/meson.build
+++ gnome-control-center-3.32.1/tests/meson.build
@@ -1,8 +1,11 @@
subdir('common')
subdir('datetime')
+# Disable tests for network panel, boo#1128195
+if false
if host_is_linux
subdir('network')
endif
+endif
subdir('interactive-panels')

50
gnome-control-center.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Sat Sep 21 09:38:32 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Add gnome-control-center-Remove-leftover-canberra-gtk.patch:
sound: Remove leftover canberra-gtk header inclusion. Following
this, drop pkgconfig(libcanberra-gtk3) BuildRequires: No longer
needed, nor used.
- Add explicit xorg-x11-server-Xvfb BuildRequires: Previously
pulled in by libcanberra-gtk3. Needed for tests to succeed.
-------------------------------------------------------------------
Mon Sep 9 14:46:21 CDT 2019 - mgorse@suse.com
- Update to version 3.34.0.1:
+ Sound: fix sliders not behaving properly.
+ Changes in version 3.34.0:
+ Updated translations.
-------------------------------------------------------------------
Wed Sep 4 15:28:03 NZST 2019 - luke@ljones.dev
- Update to version 3.33.90:
+ Background: Clarify remove background button.
+ Display: Various bugfixes.
+ Search:
- Introduce Drag n' Drop
- Visual polishment.
+ Updated translations.
- Changes from version 3.33.3:
+ Various minor improvements from the Every Detail Matters
session.
+ Add shadows to application icons
+ Documented Communication Guidelines
+ Development builds with Flatpak working again
+ Background: Redesigned panel.
+ Display: Move Night Light to a tab, instead of a dialog.
+ Keyboard Shortcuts:
- Panel renamed from "Keyboard".
- Minor UI adjustments.
+ Mouse & Touchpad: Reinstate keyboard navitation.
+ Power: Don't treat all batteries as laptop batteries.
+ Sharing: Use a HdyLeaflet.
+ User Accounts: Present the default avatar in the avatar
popover.
+ Wacom: Ensure calibrator UI CSS only applies to its UI.
+ Updated translations.
- Remove control-center-fix-mtu-label.patch
- Remove control-center-network-add-domain-suffix-match.patch
- Remove gnome-control-center-disable-error-message-for-NM.patch
-------------------------------------------------------------------
Fri Aug 02 19:21:27 UTC 2019 - bjorn.lie@gmail.com

6
gnome-control-center.obsinfo
View File

@ -1,5 +1,5 @@
name: gnome-control-center
version: 3.32.2+9
mtime: 1564042828
commit: 5a6ff6ad76db415cb3f5defd264e569e11a7dde4
version: 3.34.0.1
mtime: 1568043452
commit: ea7b65a7eeb2829f22c8ac0ad8fef84d0aae90c2

15
gnome-control-center.spec
View File

@ -26,23 +26,18 @@
%endif
Name: gnome-control-center
Version: 3.32.2+9
Version: 3.34.0.1
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
# We are using source services, so no download url for source
Source0: %{name}-%{version}.tar.xz
# PATCH-NEEDS-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running
Patch0: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch bgo#787882 bsc#1047509 sckang@suse.com -- wifi: Add domain-suffix-match entry
Patch1: control-center-network-add-domain-suffix-match.patch
# PATCH-FIX-UPSTREAM control-center-network-fix-ce-apply-button.patch glgo#GNOME/gnome-control-center!402 bsc#1040054 sckang@suse.com -- network: disable the "Apply" button until a change has been made
Patch2: control-center-network-fix-ce-apply-button.patch
# PATCH-FIX-UPSTREAM control-center-fix-mtu-label.patch glgo#GNOME/gnome-control-center!475 bsc#1040055 sckang@suse.com -- network: Fix mtu label not requesting enough space
Patch3: control-center-fix-mtu-label.patch
# PATCH-FIX-UPSTREAM gnome-control-center-Remove-leftover-canberra-gtk.patch -- sound: Remove leftover canberra-gtk header inclusion
Patch3: gnome-control-center-Remove-leftover-canberra-gtk.patch
### 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.
@ -62,6 +57,7 @@ BuildRequires: pkgconfig
BuildRequires: python3-dbusmock
BuildRequires: python3-pytest-xvfb
BuildRequires: translation-update-upstream
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xsltproc
BuildRequires: pkgconfig(accountsservice) >= 0.6.39
BuildRequires: pkgconfig(cairo-gobject)
@ -89,7 +85,6 @@ BuildRequires: pkgconfig(gsound)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libhandy-0.0) >= 0.0.9
BuildRequires: pkgconfig(libnm) >= 1.10.0
@ -198,8 +193,6 @@ GNOME control center.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
translation-update-upstream po gnome-control-center-2.0