Sync from SUSE:SLFO:Main gnome-control-center revision 8cb7dfd3889eeba13e0ed0f88f5afb78
This commit is contained in:
parent
098a00f877
commit
aee10a32e5
6
_service
6
_service
@ -3,16 +3,16 @@
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
|
||||
<param name="revision">refs/tags/44.1</param>
|
||||
<param name="revision">refs/tags/45.2</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<!-- <param name="changesgenerate">enable</param> -->
|
||||
<param name="changesgenerate">disable</param>
|
||||
</service>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
<param name="compression">zst</param>
|
||||
</service>
|
||||
<service name="set_version" mode="manual" />
|
||||
</services>
|
||||
|
BIN
gnome-control-center-44.1.obscpio
(Stored with Git LFS)
BIN
gnome-control-center-44.1.obscpio
(Stored with Git LFS)
Binary file not shown.
BIN
gnome-control-center-45.2.obscpio
(Stored with Git LFS)
Normal file
BIN
gnome-control-center-45.2.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
13
gnome-control-center-add-user-button.patch
Normal file
13
gnome-control-center-add-user-button.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
|
||||
index 3fdfe961e..fa3af01f8 100644
|
||||
--- a/panels/user-accounts/cc-user-panel.c
|
||||
+++ b/panels/user-accounts/cc-user-panel.c
|
||||
@@ -830,7 +830,7 @@ show_user (ActUser *user, CcUserPanel *self)
|
||||
gtk_widget_set_visible (GTK_WIDGET (self->back_button), !show);
|
||||
show_or_hide_back_button(self);
|
||||
gtk_widget_set_visible (GTK_WIDGET (self->other_users), other_user_show);
|
||||
- gtk_widget_set_visible (GTK_WIDGET (self->add_user_button), show && is_admin);
|
||||
+ gtk_widget_set_sensitive (GTK_WIDGET (self->add_user_button), is_admin);
|
||||
|
||||
on_permission_changed (self);
|
||||
}
|
@ -1,7 +1,26 @@
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-ethernet.c
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c
|
||||
From c7e0b3b8d993c2edaaafa54cd40da9378d641263 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Kang <jonathankang@gnome.org>
|
||||
Date: Fri, 27 Oct 2023 16:51:26 +0800
|
||||
Subject: [PATCH] gnome-control-center-bring-back-firewall-zone.patch
|
||||
|
||||
---
|
||||
.../connection-editor/ce-page-ethernet.c | 27 ++++
|
||||
.../connection-editor/ce-page-security.c | 15 +++
|
||||
.../network/connection-editor/ce-page-vpn.c | 8 ++
|
||||
.../connection-editor/ethernet-page.ui | 26 ++++
|
||||
.../connection-editor/firewall-helpers.c | 125 ++++++++++++++++++
|
||||
.../connection-editor/firewall-helpers.h | 33 +++++
|
||||
panels/network/connection-editor/meson.build | 1 +
|
||||
.../connection-editor/security-page.ui | 27 ++++
|
||||
panels/network/connection-editor/vpn-page.ui | 24 ++++
|
||||
9 files changed, 286 insertions(+)
|
||||
create mode 100644 panels/network/connection-editor/firewall-helpers.c
|
||||
create mode 100644 panels/network/connection-editor/firewall-helpers.h
|
||||
|
||||
diff --git a/panels/network/connection-editor/ce-page-ethernet.c b/panels/network/connection-editor/ce-page-ethernet.c
|
||||
index dce05a3..bba438f 100644
|
||||
--- a/panels/network/connection-editor/ce-page-ethernet.c
|
||||
+++ b/panels/network/connection-editor/ce-page-ethernet.c
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include "ce-page.h"
|
||||
@ -22,7 +41,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
NMSettingConnection *setting_connection;
|
||||
NMSettingWired *setting_wired;
|
||||
};
|
||||
@@ -80,6 +84,7 @@ static void
|
||||
@@ -78,6 +82,7 @@ static void
|
||||
connect_ethernet_page (CEPageEthernet *self)
|
||||
{
|
||||
NMSettingWired *setting = self->setting_wired;
|
||||
@ -30,7 +49,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
char **mac_list;
|
||||
const char *s_mac_str;
|
||||
const gchar *name;
|
||||
@@ -109,6 +114,10 @@ connect_ethernet_page (CEPageEthernet *s
|
||||
@@ -107,6 +112,10 @@ connect_ethernet_page (CEPageEthernet *self)
|
||||
|
||||
g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
||||
g_signal_connect_object (self->mtu_spin, "value-changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
||||
@ -41,19 +60,20 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -136,6 +145,8 @@ ui_to_setting (CEPageEthernet *self)
|
||||
@@ -134,6 +143,8 @@ ui_to_setting (CEPageEthernet *self)
|
||||
g_object_set (self->setting_connection,
|
||||
NM_SETTING_CONNECTION_ID, gtk_entry_get_text (self->name_entry),
|
||||
NM_SETTING_CONNECTION_ID, gtk_editable_get_text (GTK_EDITABLE (self->name_entry)),
|
||||
NULL);
|
||||
+
|
||||
+ firewall_ui_to_setting (self->setting_connection, GTK_WIDGET (self->firewall_combo));
|
||||
}
|
||||
|
||||
static const gchar *
|
||||
@@ -180,6 +191,16 @@ ce_page_ethernet_validate (CEPage
|
||||
@@ -177,6 +188,16 @@ ce_page_ethernet_validate (CEPage *page,
|
||||
nm_setting_verify (NM_SETTING (self->setting_wired), NULL, error);
|
||||
}
|
||||
|
||||
static void
|
||||
+static void
|
||||
+ce_page_ethernet_dispose (GObject *object)
|
||||
+{
|
||||
+ CEPageEthernet *self = CE_PAGE_ETHERNET (object);
|
||||
@ -63,11 +83,10 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
+ G_OBJECT_CLASS (ce_page_ethernet_parent_class)->dispose (object);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
static void
|
||||
ce_page_ethernet_init (CEPageEthernet *self)
|
||||
{
|
||||
gtk_widget_init_template (GTK_WIDGET (self));
|
||||
@@ -188,8 +209,11 @@ ce_page_ethernet_init (CEPageEthernet *s
|
||||
@@ -186,8 +207,11 @@ ce_page_ethernet_init (CEPageEthernet *self)
|
||||
static void
|
||||
ce_page_ethernet_class_init (CEPageEthernetClass *klass)
|
||||
{
|
||||
@ -79,7 +98,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/ethernet-page.ui");
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, cloned_mac_combo);
|
||||
@@ -197,6 +221,8 @@ ce_page_ethernet_class_init (CEPageEther
|
||||
@@ -195,6 +219,8 @@ ce_page_ethernet_class_init (CEPageEthernetClass *klass)
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, mtu_spin);
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, mtu_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, name_entry);
|
||||
@ -88,7 +107,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -215,6 +241,7 @@ ce_page_ethernet_new (NMConnection *
|
||||
@@ -213,6 +239,7 @@ ce_page_ethernet_new (NMConnection *connection,
|
||||
self = CE_PAGE_ETHERNET (g_object_new (ce_page_ethernet_get_type (), NULL));
|
||||
|
||||
self->client = client;
|
||||
@ -96,19 +115,19 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethern
|
||||
self->setting_connection = nm_connection_get_setting_connection (connection);
|
||||
self->setting_wired = nm_connection_get_setting_wired (connection);
|
||||
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-security.c
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c
|
||||
diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c
|
||||
index ae6fbd4..b8a1b83 100644
|
||||
--- a/panels/network/connection-editor/ce-page-security.c
|
||||
+++ b/panels/network/connection-editor/ce-page-security.c
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include "ce-page.h"
|
||||
#include "ce-page-security.h"
|
||||
+#include "firewall-helpers.h"
|
||||
#include "wireless-security.h"
|
||||
#include "ws-dynamic-wep.h"
|
||||
#include "ws-leap.h"
|
||||
@@ -42,6 +43,8 @@ struct _CEPageSecurity
|
||||
#include "nma-ws.h"
|
||||
|
||||
struct _CEPageSecurity
|
||||
@@ -36,6 +37,8 @@ struct _CEPageSecurity
|
||||
GtkBox *box;
|
||||
GtkComboBox *security_combo;
|
||||
GtkLabel *security_label;
|
||||
@ -117,15 +136,15 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-securi
|
||||
|
||||
NMConnection *connection;
|
||||
const gchar *security_setting;
|
||||
@@ -176,6 +179,7 @@ security_combo_changed (CEPageSecurity *
|
||||
gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (sec));
|
||||
@@ -165,6 +168,7 @@ security_combo_changed (CEPageSecurity *self)
|
||||
gtk_box_remove (self->box, GTK_WIDGET (sec));
|
||||
|
||||
gtk_size_group_add_widget (self->group, GTK_WIDGET (self->security_label));
|
||||
+ gtk_size_group_add_widget (self->group, self->firewall_heading);
|
||||
wireless_security_add_to_size_group (sec, self->group);
|
||||
nma_ws_add_to_size_group (sec, self->group);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (self->box), g_object_ref (GTK_WIDGET (sec)));
|
||||
@@ -230,6 +234,7 @@ finish_setup (CEPageSecurity *self)
|
||||
gtk_box_append (self->box, g_object_ref (GTK_WIDGET (sec)));
|
||||
@@ -222,6 +226,7 @@ finish_setup (CEPageSecurity *self)
|
||||
{
|
||||
NMSettingWireless *sw;
|
||||
NMSettingWirelessSecurity *sws;
|
||||
@ -133,7 +152,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-securi
|
||||
gboolean is_adhoc = FALSE;
|
||||
g_autoptr(GtkListStore) sec_model = NULL;
|
||||
GtkTreeIter iter;
|
||||
@@ -396,6 +401,10 @@ finish_setup (CEPageSecurity *self)
|
||||
@@ -388,6 +393,10 @@ finish_setup (CEPageSecurity *self)
|
||||
|
||||
gtk_combo_box_set_active (self->security_combo, active < 0 ? 0 : (guint32) active);
|
||||
|
||||
@ -144,16 +163,16 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-securi
|
||||
security_combo_changed (self);
|
||||
g_signal_connect_object (self->security_combo, "changed",
|
||||
G_CALLBACK (security_combo_changed), self, G_CONNECT_SWAPPED);
|
||||
@@ -431,6 +440,7 @@ ce_page_security_validate (CEPage
|
||||
@@ -423,6 +432,7 @@ ce_page_security_validate (CEPage *page,
|
||||
{
|
||||
CEPageSecurity *self = CE_PAGE_SECURITY (page);
|
||||
NMSettingWireless *sw;
|
||||
+ NMSettingConnection *sc;
|
||||
g_autoptr(WirelessSecurity) sec = NULL;
|
||||
NMAWs *sec;
|
||||
gboolean valid = FALSE;
|
||||
const char *mode;
|
||||
@@ -471,6 +481,9 @@ ce_page_security_validate (CEPage
|
||||
valid = TRUE;
|
||||
@@ -479,6 +489,9 @@ ce_page_security_validate (CEPage *page,
|
||||
|
||||
}
|
||||
|
||||
+ sc = nm_connection_get_setting_connection (connection);
|
||||
@ -162,7 +181,7 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-securi
|
||||
return valid;
|
||||
}
|
||||
|
||||
@@ -493,6 +506,8 @@ ce_page_security_class_init (CEPageSecur
|
||||
@@ -501,6 +514,8 @@ ce_page_security_class_init (CEPageSecurityClass *klass)
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, box);
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, security_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, security_combo);
|
||||
@ -171,10 +190,10 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-securi
|
||||
}
|
||||
|
||||
static void
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-vpn.c
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
|
||||
diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c
|
||||
index 36afde5..edbf331 100644
|
||||
--- a/panels/network/connection-editor/ce-page-vpn.c
|
||||
+++ b/panels/network/connection-editor/ce-page-vpn.c
|
||||
@@ -35,6 +35,8 @@ struct _CEPageVpn
|
||||
|
||||
GtkLabel *failure_label;
|
||||
@ -184,9 +203,9 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
|
||||
|
||||
NMConnection *connection;
|
||||
NMSettingConnection *setting_connection;
|
||||
@@ -125,6 +127,9 @@ connect_vpn_page (CEPageVpn *self)
|
||||
@@ -123,6 +125,9 @@ connect_vpn_page (CEPageVpn *self)
|
||||
name = nm_setting_connection_get_id (self->setting_connection);
|
||||
gtk_entry_set_text (self->name_entry, name);
|
||||
gtk_editable_set_text (GTK_EDITABLE (self->name_entry), name);
|
||||
g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
||||
+
|
||||
+ firewall_ui_setup (self->setting_connection, GTK_WIDGET (self->firewall_combo), GTK_WIDGET (self->firewall_heading), NULL);
|
||||
@ -194,15 +213,15 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -160,6 +165,7 @@ ce_page_vpn_validate (CEPage *pag
|
||||
@@ -158,6 +163,7 @@ ce_page_vpn_validate (CEPage *page,
|
||||
g_object_set (self->setting_connection,
|
||||
NM_SETTING_CONNECTION_ID, gtk_entry_get_text (self->name_entry),
|
||||
NM_SETTING_CONNECTION_ID, gtk_editable_get_text (GTK_EDITABLE (self->name_entry)),
|
||||
NULL);
|
||||
+ firewall_ui_to_setting (self->setting_connection, GTK_WIDGET (self->firewall_combo));
|
||||
|
||||
if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL, error))
|
||||
return FALSE;
|
||||
@@ -188,6 +194,8 @@ ce_page_vpn_class_init (CEPageVpnClass *
|
||||
@@ -186,6 +192,8 @@ ce_page_vpn_class_init (CEPageVpnClass *class)
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, failure_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, name_entry);
|
||||
@ -211,14 +230,15 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c
|
||||
}
|
||||
|
||||
static void
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/ethernet-page.ui
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui
|
||||
@@ -159,6 +159,36 @@
|
||||
</packing>
|
||||
diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui
|
||||
index e35a18a..c3618a9 100644
|
||||
--- a/panels/network/connection-editor/ethernet-page.ui
|
||||
+++ b/panels/network/connection-editor/ethernet-page.ui
|
||||
@@ -117,5 +117,31 @@
|
||||
</layout>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
+ <child>
|
||||
+ <object class="GtkLabel" id="firewall_heading">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
@ -226,13 +246,11 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.
|
||||
+ <property name="label" translatable="yes">Firewall _Zone</property>
|
||||
+ <property name="use_underline">True</property>
|
||||
+ <property name="mnemonic_widget">firewall_combo</property>
|
||||
+ <layout>
|
||||
+ <property name="column">0</property>
|
||||
+ <property name="row">4</property>
|
||||
+ </layout>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="left_attach">0</property>
|
||||
+ <property name="top_attach">4</property>
|
||||
+ <property name="width">1</property>
|
||||
+ <property name="height">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkComboBoxText" id="firewall_combo">
|
||||
@ -240,22 +258,19 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.
|
||||
+ <property name="can_focus">False</property>
|
||||
+ <property name="entry_text_column">0</property>
|
||||
+ <property name="id_column">1</property>
|
||||
+ <layout>
|
||||
+ <property name="column">1</property>
|
||||
+ <property name="row">4</property>
|
||||
+ </layout>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="left_attach">1</property>
|
||||
+ <property name="top_attach">4</property>
|
||||
+ <property name="width">1</property>
|
||||
+ <property name="height">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
<child>
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c
|
||||
===================================================================
|
||||
</template>
|
||||
</interface>
|
||||
diff --git a/panels/network/connection-editor/firewall-helpers.c b/panels/network/connection-editor/firewall-helpers.c
|
||||
new file mode 100644
|
||||
index 0000000..2e2c29f
|
||||
--- /dev/null
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c
|
||||
+++ b/panels/network/connection-editor/firewall-helpers.c
|
||||
@@ -0,0 +1,125 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
@ -382,10 +397,11 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpe
|
||||
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
|
||||
+ g_free (zone);
|
||||
+}
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h
|
||||
===================================================================
|
||||
diff --git a/panels/network/connection-editor/firewall-helpers.h b/panels/network/connection-editor/firewall-helpers.h
|
||||
new file mode 100644
|
||||
index 0000000..213c515
|
||||
--- /dev/null
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h
|
||||
+++ b/panels/network/connection-editor/firewall-helpers.h
|
||||
@@ -0,0 +1,33 @@
|
||||
+/*
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
@ -420,68 +436,64 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpe
|
||||
+
|
||||
+
|
||||
+#endif /* _FIREWALL_HELPERS_H_ */
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/meson.build
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/meson.build
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/meson.build
|
||||
@@ -12,6 +12,7 @@ sources = files(
|
||||
'ce-page-vpn.c',
|
||||
diff --git a/panels/network/connection-editor/meson.build b/panels/network/connection-editor/meson.build
|
||||
index c544b21..7377fc0 100644
|
||||
--- a/panels/network/connection-editor/meson.build
|
||||
+++ b/panels/network/connection-editor/meson.build
|
||||
@@ -13,6 +13,7 @@ sources = files(
|
||||
'ce-page-wireguard.c',
|
||||
'ce-page-wifi.c',
|
||||
'ce-page.c',
|
||||
+ 'firewall-helpers.c',
|
||||
'net-connection-editor.c',
|
||||
'vpn-helpers.c'
|
||||
)
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/security-page.ui
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/security-page.ui
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/security-page.ui
|
||||
@@ -47,6 +47,37 @@
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
+ <object class="GtkLabel" id="firewall_heading">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
+ <property name="xalign">1</property>
|
||||
+ <property name="label" translatable="yes">Firewall _Zone</property>
|
||||
+ <property name="use_underline">True</property>
|
||||
+ <property name="mnemonic_widget">firewall_combo</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="left_attach">0</property>
|
||||
+ <property name="top_attach">2</property>
|
||||
+ <property name="width">1</property>
|
||||
+ <property name="height">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkComboBoxText" id="firewall_combo">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
+ <property name="hexpand">True</property>
|
||||
+ <property name="entry_text_column">0</property>
|
||||
+ <property name="id_column">1</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="left_attach">1</property>
|
||||
+ <property name="top_attach">2</property>
|
||||
+ <property name="width">1</property>
|
||||
+ <property name="height">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
<placeholder/>
|
||||
diff --git a/panels/network/connection-editor/security-page.ui b/panels/network/connection-editor/security-page.ui
|
||||
index 9a1c0de..ba31a81 100644
|
||||
--- a/panels/network/connection-editor/security-page.ui
|
||||
+++ b/panels/network/connection-editor/security-page.ui
|
||||
@@ -41,5 +41,32 @@
|
||||
</layout>
|
||||
</object>
|
||||
</child>
|
||||
+ <child>
|
||||
+ <object class="GtkLabel" id="firewall_heading">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
+ <property name="xalign">1</property>
|
||||
+ <property name="label" translatable="yes">Firewall _Zone</property>
|
||||
+ <property name="use_underline">True</property>
|
||||
+ <property name="mnemonic_widget">firewall_combo</property>
|
||||
+ <layout>
|
||||
+ <property name="column">0</property>
|
||||
+ <property name="row">2</property>
|
||||
+ </layout>
|
||||
+ </object>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkComboBoxText" id="firewall_combo">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
+ <property name="hexpand">True</property>
|
||||
+ <property name="entry_text_column">0</property>
|
||||
+ <property name="id_column">1</property>
|
||||
+ <layout>
|
||||
+ <property name="column">1</property>
|
||||
+ <property name="row">2</property>
|
||||
+ </layout>
|
||||
+ </object>
|
||||
+ </child>
|
||||
</template>
|
||||
</interface>
|
||||
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
|
||||
index 98f801b..73bbef8 100644
|
||||
--- a/panels/network/connection-editor/vpn-page.ui
|
||||
+++ b/panels/network/connection-editor/vpn-page.ui
|
||||
@@ -28,6 +28,30 @@
|
||||
</child>
|
||||
</object>
|
||||
Index: gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/network/connection-editor/vpn-page.ui
|
||||
+++ gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
|
||||
@@ -51,6 +51,45 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
+ <child>
|
||||
+ <object class="GtkBox" id="box1">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">False</property>
|
||||
@ -494,11 +506,6 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
|
||||
+ <property name="use_underline">True</property>
|
||||
+ <property name="mnemonic_widget">firewall_combo</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">True</property>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkComboBoxText" id="firewall_combo">
|
||||
@ -507,20 +514,12 @@ Index: gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui
|
||||
+ <property name="entry_text_column">0</property>
|
||||
+ <property name="id_column">1</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">True</property>
|
||||
+ <property name="fill">True</property>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">True</property>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="failure_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">0</property>
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
@ -0,0 +1,114 @@
|
||||
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
|
||||
index 3544411..87d8fbd 100644
|
||||
--- a/panels/datetime/cc-datetime-panel.c
|
||||
+++ b/panels/datetime/cc-datetime-panel.c
|
||||
@@ -229,6 +229,10 @@ clock_settings_changed_cb (CcDateTimePanel *self,
|
||||
g_signal_handlers_unblock_by_func (self->timeformat_row, change_clock_settings, self);
|
||||
}
|
||||
|
||||
+static void on_month_selection_changed_cb (CcDateTimePanel *self);
|
||||
+
|
||||
+static void time_changed_cb (CcDateTimePanel *self,
|
||||
+ CcTimeEditor *editor);
|
||||
|
||||
/* Update the widgets based on the system time */
|
||||
static void
|
||||
@@ -242,9 +246,11 @@ update_time (CcDateTimePanel *self)
|
||||
else
|
||||
use_ampm = FALSE;
|
||||
|
||||
+ g_signal_handlers_block_by_func (self->time_editor, time_changed_cb, self);
|
||||
cc_time_editor_set_time (self->time_editor,
|
||||
g_date_time_get_hour (self->date),
|
||||
g_date_time_get_minute (self->date));
|
||||
+ g_signal_handlers_unblock_by_func (self->time_editor, time_changed_cb, self);
|
||||
|
||||
/* Update the time on the listbow row */
|
||||
if (use_ampm)
|
||||
@@ -259,7 +265,9 @@ update_time (CcDateTimePanel *self)
|
||||
}
|
||||
|
||||
self->month = g_date_time_get_month (self->date);
|
||||
+ g_signal_handlers_block_by_func (self->month_model, on_month_selection_changed_cb, self);
|
||||
gtk_single_selection_set_selected (self->month_model, self->month - 1);
|
||||
+ g_signal_handlers_unblock_by_func (self->month_model, on_month_selection_changed_cb, self);
|
||||
gtk_label_set_text (self->datetime_label, label);
|
||||
}
|
||||
|
||||
@@ -327,6 +335,10 @@ queue_set_datetime (CcDateTimePanel *self)
|
||||
{
|
||||
gint64 unixtime;
|
||||
|
||||
+ /* Don't set the time if we are using network time (NTP). */
|
||||
+ if (gtk_switch_get_active (self->network_time_switch))
|
||||
+ return;
|
||||
+
|
||||
/* timedated expects number of microseconds since 1 Jan 1970 UTC */
|
||||
unixtime = g_date_time_to_unix (self->date);
|
||||
|
||||
@@ -381,9 +393,11 @@ change_date (CcDateTimePanel *self)
|
||||
g_date_time_get_hour (old_date),
|
||||
g_date_time_get_minute (old_date),
|
||||
g_date_time_get_second (old_date));
|
||||
+ g_signal_handlers_block_by_func (self->time_editor, time_changed_cb, self);
|
||||
cc_time_editor_set_time (self->time_editor,
|
||||
g_date_time_get_hour (self->date),
|
||||
g_date_time_get_minute (self->date));
|
||||
+ g_signal_handlers_unblock_by_func (self->time_editor, time_changed_cb, self);
|
||||
|
||||
queue_set_datetime (self);
|
||||
}
|
||||
@@ -765,7 +779,9 @@ setup_datetime_dialog (CcDateTimePanel *self)
|
||||
|
||||
/* Month */
|
||||
self->month = g_date_time_get_month (self->date);
|
||||
+ g_signal_handlers_block_by_func (self->month_model, on_month_selection_changed_cb, self);
|
||||
gtk_single_selection_set_selected (self->month_model, self->month - 1);
|
||||
+ g_signal_handlers_unblock_by_func (self->month_model, on_month_selection_changed_cb, self);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -859,11 +875,9 @@ cc_date_time_panel_class_init (CcDateTimePanelClass *klass)
|
||||
|
||||
gtk_widget_class_bind_template_callback (widget_class, panel_tz_selection_changed_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, list_box_row_activated);
|
||||
- gtk_widget_class_bind_template_callback (widget_class, time_changed_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, change_clock_settings);
|
||||
gtk_widget_class_bind_template_callback (widget_class, format_clock_name_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, on_date_box_row_activated_cb);
|
||||
- gtk_widget_class_bind_template_callback (widget_class, on_month_selection_changed_cb);
|
||||
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE_TIMEZONES, "UTF-8");
|
||||
|
||||
@@ -988,6 +1002,11 @@ cc_date_time_panel_init (CcDateTimePanel *self)
|
||||
* the model is filled up */
|
||||
get_initial_timezone (self);
|
||||
|
||||
+ g_signal_connect_object (self->time_editor, "time-changed",
|
||||
+ G_CALLBACK (time_changed_cb), self, G_CONNECT_SWAPPED);
|
||||
+ g_signal_connect_object (self->month_model, "selection-changed",
|
||||
+ G_CALLBACK (on_month_selection_changed_cb), self, G_CONNECT_SWAPPED);
|
||||
+
|
||||
/* Watch changes of timedated remote service properties */
|
||||
g_signal_connect_object (self->dtm, "g-properties-changed",
|
||||
G_CALLBACK (on_timedated_properties_changed), self, G_CONNECT_SWAPPED);
|
||||
diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui
|
||||
index ebdb078..1fbb52c 100644
|
||||
--- a/panels/datetime/cc-datetime-panel.ui
|
||||
+++ b/panels/datetime/cc-datetime-panel.ui
|
||||
@@ -37,7 +37,6 @@
|
||||
<child>
|
||||
<object class="CcTimeEditor" id="time_editor">
|
||||
<property name="halign">center</property>
|
||||
- <signal name="time-changed" handler="time_changed_cb" swapped="yes"/>
|
||||
</object>
|
||||
</child>
|
||||
|
||||
@@ -312,7 +311,6 @@
|
||||
<property name="model">
|
||||
<object class="GtkSingleSelection" id="month_model">
|
||||
<property name="autoselect">False</property>
|
||||
- <signal name="selection-changed" handler="on_month_selection_changed_cb" swapped="yes"/>
|
||||
<property name="model">
|
||||
<object class="GtkStringList">
|
||||
<items>
|
@ -1,8 +1,7 @@
|
||||
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
|
||||
index 6a3074ce..40fb0283 100644
|
||||
--- a/panels/network/cc-network-panel.c
|
||||
+++ b/panels/network/cc-network-panel.c
|
||||
@@ -659,10 +659,24 @@ static void
|
||||
diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-network-panel.c gnome-control-center-45.1/panels/network/cc-network-panel.c
|
||||
--- temp/gnome-control-center-45.1/panels/network/cc-network-panel.c 2023-10-27 14:56:16.289319792 +0800
|
||||
+++ gnome-control-center-45.1/panels/network/cc-network-panel.c 2023-10-27 15:42:47.030395835 +0800
|
||||
@@ -653,10 +653,24 @@
|
||||
panel_check_network_manager_version (CcNetworkPanel *self)
|
||||
{
|
||||
const gchar *version;
|
||||
@ -28,16 +27,16 @@ index 6a3074ce..40fb0283 100644
|
||||
GtkWidget *status_page;
|
||||
|
||||
status_page = adw_status_page_new ();
|
||||
@@ -674,9 +688,23 @@ panel_check_network_manager_version (CcNetworkPanel *self)
|
||||
_("NetworkManager needs to be running to view or make "
|
||||
"connections. Contact a system administrator or the "
|
||||
"software vendor."));
|
||||
@@ -667,10 +681,23 @@
|
||||
adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
||||
_("An error has occurred and network cannot be used."
|
||||
"\n Error details: NetworkManager not running."));
|
||||
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
|
||||
+ GtkWidget *status_page;
|
||||
+
|
||||
+ status_page = adw_status_page_new ();
|
||||
+ cc_panel_set_content (CC_PANEL (self), status_page);
|
||||
+
|
||||
+ adw_toolbar_view_set_content (ADW_TOOLBAR_VIEW (self->toolbar_view), status_page);
|
||||
|
||||
+ adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page), "network-error-symbolic");
|
||||
+ adw_status_page_set_title (ADW_STATUS_PAGE (status_page), _("Wicked is running"));
|
||||
+ adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
||||
@ -52,11 +51,10 @@ index 6a3074ce..40fb0283 100644
|
||||
}
|
||||
|
||||
static void
|
||||
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
|
||||
index 8e0b17b0..495b5616 100644
|
||||
--- a/panels/network/cc-wifi-panel.c
|
||||
+++ b/panels/network/cc-wifi-panel.c
|
||||
@@ -302,21 +302,41 @@ static void
|
||||
diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.c gnome-control-center-45.1/panels/network/cc-wifi-panel.c
|
||||
--- temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.c 2023-10-27 14:56:16.292653165 +0800
|
||||
+++ gnome-control-center-45.1/panels/network/cc-wifi-panel.c 2023-10-27 15:05:30.805703042 +0800
|
||||
@@ -298,21 +298,41 @@
|
||||
check_main_stack_page (CcWifiPanel *self)
|
||||
{
|
||||
const gchar *nm_version;
|
||||
@ -79,7 +77,7 @@ index 8e0b17b0..495b5616 100644
|
||||
|
||||
nm_version = nm_client_get_version (self->client);
|
||||
wireless_enabled = nm_client_wireless_get_enabled (self->client);
|
||||
airplane_mode_active = cc_list_row_get_active (self->rfkill_row);
|
||||
airplane_mode_active = adw_switch_row_get_active (self->rfkill_row);
|
||||
|
||||
- if (!nm_version)
|
||||
+ if (!nm_version && g_strcmp0 (state, "inactive") == 0)
|
||||
@ -99,14 +97,14 @@ index 8e0b17b0..495b5616 100644
|
||||
}
|
||||
|
||||
static void
|
||||
diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
|
||||
index 722ca3d4..c196f984 100644
|
||||
--- a/panels/network/cc-wifi-panel.ui
|
||||
+++ b/panels/network/cc-wifi-panel.ui
|
||||
@@ -226,6 +226,50 @@ Error details: NetworkManager not running.</property>
|
||||
diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.ui gnome-control-center-45.1/panels/network/cc-wifi-panel.ui
|
||||
--- temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.ui 2023-10-27 14:56:16.292653165 +0800
|
||||
+++ gnome-control-center-45.1/panels/network/cc-wifi-panel.ui 2023-10-27 14:49:00.914031545 +0800
|
||||
@@ -197,6 +197,51 @@
|
||||
</property>
|
||||
</object>
|
||||
</child>
|
||||
|
||||
+
|
||||
+ <!-- "Wicked Running" page -->
|
||||
+ <child>
|
||||
+ <object class="GtkStackPage">
|
||||
@ -153,11 +151,10 @@ index 722ca3d4..c196f984 100644
|
||||
+
|
||||
</object>
|
||||
</child>
|
||||
|
||||
diff --git a/tests/meson.build b/tests/meson.build
|
||||
index 69667acb..5f6a932d 100644
|
||||
--- a/tests/meson.build
|
||||
+++ b/tests/meson.build
|
||||
</object>
|
||||
diff -uraBN temp/gnome-control-center-45.1/tests/meson.build gnome-control-center-45.1/tests/meson.build
|
||||
--- temp/gnome-control-center-45.1/tests/meson.build 2023-10-27 14:56:16.545989479 +0800
|
||||
+++ gnome-control-center-45.1/tests/meson.build 2023-10-27 14:49:56.034724339 +0800
|
||||
@@ -1,8 +1,11 @@
|
||||
subdir('common')
|
||||
#subdir('datetime')
|
||||
@ -168,5 +165,5 @@ index 69667acb..5f6a932d 100644
|
||||
endif
|
||||
+endif
|
||||
|
||||
subdir('interactive-panels')
|
||||
|
||||
# FIXME: this is a workaround because interactive-tests don't work with libadwaita as a subproject. See !1754
|
||||
if not libadwaita_is_subproject
|
||||
|
51
gnome-control-center-fix-region-preview-crash.patch
Normal file
51
gnome-control-center-fix-region-preview-crash.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From d4a522277bcd1e172be57f3525c2d24831bb3cc5 Mon Sep 17 00:00:00 2001
|
||||
From: Alynx Zhou <alynx.zhou@gmail.com>
|
||||
Date: Thu, 4 Jan 2024 10:29:49 +0800
|
||||
Subject: [PATCH] system/region: Prevent preview crash from accessing invalid
|
||||
pointer
|
||||
|
||||
In !2051, we switch back to real locale before setting the label text,
|
||||
however, according to nl_langinfo's manpage, the returned pointer could
|
||||
be invalid after switching locale or creating new locale, so the program
|
||||
may crash.
|
||||
|
||||
To fix this, we save the result before switching locale, so we won't
|
||||
access the invalid pointer after switch locale.
|
||||
---
|
||||
panels/region/cc-format-preview.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/region/cc-format-preview.c b/panels/region/cc-format-preview.c
|
||||
index 7aea45511..e4f4afa32 100644
|
||||
--- a/panels/region/cc-format-preview.c
|
||||
+++ b/panels/region/cc-format-preview.c
|
||||
@@ -69,6 +69,7 @@ update_format_examples (CcFormatPreview *self)
|
||||
g_autofree gchar *s = NULL;
|
||||
#ifdef LC_MEASUREMENT
|
||||
const gchar *fmt;
|
||||
+ gboolean is_imperial = FALSE;
|
||||
#endif
|
||||
g_autoptr(GtkPaperSize) paper = NULL;
|
||||
|
||||
@@ -133,6 +134,9 @@ update_format_examples (CcFormatPreview *self)
|
||||
old_locale = uselocale (locale);
|
||||
|
||||
fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT);
|
||||
+ /* The returned pointer of nl_langinfo could be invalid after switching
|
||||
+ locale, so we must use it here. */
|
||||
+ is_imperial = fmt && *fmt == 2;
|
||||
|
||||
if (locale != (locale_t) 0)
|
||||
{
|
||||
@@ -140,7 +144,7 @@ update_format_examples (CcFormatPreview *self)
|
||||
freelocale (locale);
|
||||
}
|
||||
|
||||
- if (fmt && *fmt == 2)
|
||||
+ if (is_imperial)
|
||||
gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Imperial"));
|
||||
else
|
||||
gtk_label_set_text (GTK_LABEL (self->measurement_format_label), C_("measurement format", "Metric"));
|
||||
--
|
||||
2.43.0
|
||||
|
10
gnome-control-center-info-fix-distro-logo.patch
Normal file
10
gnome-control-center-info-fix-distro-logo.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/panels/info-overview/cc-info-overview-panel.c 2022-05-27 06:08:12.000000000 +0300
|
||||
+++ b/panels/info-overview/cc-info-overview-panel.c 2022-10-17 22:35:19.478332000 +0300
|
||||
@@ -954,6 +954,7 @@
|
||||
|
||||
icon = g_themed_icon_new_from_names ((char **) array->pdata, array->len);
|
||||
gtk_image_set_from_gicon (panel->os_logo, icon, GTK_ICON_SIZE_INVALID);
|
||||
+ gtk_image_set_pixel_size (panel->os_logo, 148);
|
||||
}
|
||||
|
||||
static void
|
@ -1,8 +1,8 @@
|
||||
Index: gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/info-overview/cc-info-overview-panel.c
|
||||
+++ gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c
|
||||
@@ -791,8 +791,8 @@ does_gnome_software_allow_updates (void)
|
||||
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
|
||||
index 700df61..846ac80 100644
|
||||
--- a/panels/info-overview/cc-info-overview-panel.c
|
||||
+++ b/panels/info-overview/cc-info-overview-panel.c
|
||||
@@ -111,8 +111,8 @@ does_gnome_software_allow_updates (void)
|
||||
static gboolean
|
||||
does_gnome_software_exist (void)
|
||||
{
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: gnome-control-center-41.0/panels/power/cc-power-panel.c
|
||||
===================================================================
|
||||
--- gnome-control-center-41.0.orig/panels/power/cc-power-panel.c
|
||||
+++ gnome-control-center-41.0/panels/power/cc-power-panel.c
|
||||
@@ -796,7 +796,8 @@ populate_power_button_row (HdyComboRow *
|
||||
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
|
||||
index 26e3837..3fa91db 100644
|
||||
--- a/panels/power/cc-power-panel.c
|
||||
+++ b/panels/power/cc-power-panel.c
|
||||
@@ -680,7 +680,8 @@ populate_power_button_row (AdwComboRow *combo_row,
|
||||
{ N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND },
|
||||
{ N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
|
||||
{ N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE },
|
||||
@ -10,5 +10,5 @@ Index: gnome-control-center-41.0/panels/power/cc-power-panel.c
|
||||
+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING },
|
||||
+ { N_("Force Off"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }
|
||||
};
|
||||
guint item_index = 0;
|
||||
guint i;
|
||||
|
||||
|
@ -1,3 +1,417 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 21 08:42:35 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
||||
|
||||
- Update gnome-control-center-disable-error-message-for-NM.patch:
|
||||
Add info page to toolbar view instead of navigation page to
|
||||
prevent hiding close button (bsc#1222099).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 8 03:14:11 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
||||
|
||||
- Add gnome-control-center-datetime-Avoid-emitting-the-time-changed-signal.patch:
|
||||
Avoid emitting the time-changed signal
|
||||
(bsc#1222149, bsc#1221799, glgo#GNOME/gnome-control-center#2943).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 02:08:39 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
||||
|
||||
- Add gnome-control-center-fix-region-preview-crash.patch:
|
||||
nl_langinfo's returned pointer could be invalid after switching
|
||||
locale, so we have to save the result before switch locale to
|
||||
prevent the crash (bsc#1218528,
|
||||
glgo#GNOME/gnome-control-center!2122).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Mark gnome-control-center-info-fix-distro-logo.patch as rebase
|
||||
needed. The patch needs a deeper review because its base is too
|
||||
old and SLE/Leap specific.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 28 12:09:13 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -p N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 26 11:58:27 UTC 2023 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 45.1+22:
|
||||
+ apps: Fix status page glitch on initialization
|
||||
+ po: Fix missing closing tag in pt_BR locale
|
||||
+ background: Improve preview performance
|
||||
+ applications: Fix File & Link Associations UI
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 13 12:47:50 UTC 2023 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 45.1+14:
|
||||
+ user-accounts: Sync lock tooltip for the Avatar
|
||||
+ privacy: Fix crash from free bug in cc-camera-page
|
||||
+ default-apps: Workaround AdwComboRow item selection at startup
|
||||
+ network-connection-editor: Align Routes labels
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 27 07:40:55 UTC 2023 - Jonathan Kang <sckang@suse.com>
|
||||
|
||||
- Rebase gnome-control-center-disable-error-message-for-NM.patch,
|
||||
gnome-control-center-info-never-use-gnome-software.patch,
|
||||
gnome-control-center-more-power-button-actions.patch and
|
||||
gnome-control-center-bring-back-firewall-zone.patch(bsc#1216601).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 14:15:52 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 45.1:
|
||||
+ About: Add more types of processor support
|
||||
+ Accessibility: Make Cursor Size dialog close on Escape key
|
||||
+ Keyboard: Allow closing Shortcuts dialog with Escape key
|
||||
+ Mouse:
|
||||
- Fix linked style of primary mouse button in RTL languages
|
||||
- Avoid making videos blurry
|
||||
+ Network:
|
||||
- Fix editing connections without a device
|
||||
- Revert "Disable DNS entry if automatic DNS option is enabled"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 12 08:16:55 UTC 2023 - Jonathan Kang <songchuan.kang@suse.com>
|
||||
|
||||
- Add gnome-control-center-network-fix-nmce-popup.patch:
|
||||
network-connection-editor: Close the editor when nm-connection-editor
|
||||
exits(bsc#1208193 glgo#GNOME/gnome-control-center!1956).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 03 14:03:43 UTC 2023 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 45.0+34:
|
||||
+ network: fix editing connections without a device (boo#1215651)
|
||||
+ mouse: Fix linked style of primary mouse button in RTL
|
||||
+ privacy: Fix crash in the firmware security page
|
||||
+ data:
|
||||
- Fix label string
|
||||
- Add missing wireguard-peer.ui to POTFILES.in
|
||||
- Mark translatable strings yes
|
||||
+ info-overview: Add more types of processor support
|
||||
+ Updated translations.
|
||||
- Switch to git checkout from stable branch, use explicit commit.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 22 03:30:16 UTC 2023 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
||||
|
||||
- Add gnome-control-center-add-user-button.patch:
|
||||
Show add user button when user is a normal user
|
||||
(bsc#1215556 glgo#GNOME/Settings!1927).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 15 10:22:39 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 45.0:
|
||||
+ Fix panel list (sidebar) issues with panel centering
|
||||
+ Use g_printeer to message when running in non-supported
|
||||
environments
|
||||
+ About:
|
||||
- Fix issue with system details label having the "selected"
|
||||
state
|
||||
- Allow system details labels to span multiple lines
|
||||
+ Accessibility: Fix issue when icon theme changes to
|
||||
HighContrast can't be reverted
|
||||
+ Keyboard: Fallback to subproject when keyboard previewer
|
||||
(tecla) is not available
|
||||
+ Network:
|
||||
- Fix criticals when updating connection
|
||||
- Don't try to update device if it doesn't exist
|
||||
- Don't show QR Code button for wifi connections using
|
||||
unsupported security methods
|
||||
+ Online Accounts: Add line-breaks to log messages
|
||||
+ Search: Fix crash when selecting folder in "Other Search"
|
||||
locations
|
||||
+ Users: Allow new password insert if the old one is right
|
||||
- Add explicit pkgconfig(tecla) BuildRequires: New dependency.
|
||||
- Switch service and tarball produced to zst compression.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 25 18:17:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 45.rc:
|
||||
+ About:
|
||||
- Port to AdwToolbarView
|
||||
- Make System Details window more compact
|
||||
- Port System Details window to AdwBreakpoint
|
||||
- Port System Details window to AdwToolbarView
|
||||
+ Accessibility: Port to AdwToolbarView
|
||||
+ Applications:
|
||||
- Make panel fit on narrow widths
|
||||
- Port deprecated GtkDialogs to AdwWindow
|
||||
+ Background: Port to AdwToolbarView
|
||||
+ Bluetooth: Port to AdwToolbarView
|
||||
+ Color: Port to AdwToolbarView
|
||||
+ Date and Time:
|
||||
- Port to AdwToolbarView
|
||||
- Port dialog to AdwWindow
|
||||
+ Default Apps: Port to AdwToolbarView
|
||||
+ Display:
|
||||
- Port to AdwNavigationView and AdwtoolbarView
|
||||
- Reduce the size of the preview width
|
||||
+ Keyboard:
|
||||
- Port to AdwToolbarView
|
||||
- Port keyboard shortcuts dialog to AdwNavigationView
|
||||
- Fix criticals when inpuit chooser is destroyed
|
||||
- Write to mru-sources setting if it has never been set before
|
||||
+ Mouse:
|
||||
- Make adaptative
|
||||
- Port to AdwToolbarView
|
||||
- Port the test dialog to AdwToolbarView
|
||||
- Stop leaking the test window
|
||||
+ Multitasking: Port to AdwToolbarView
|
||||
+ Network:
|
||||
- Port to AdwNavigationView and AdwToolbarView
|
||||
- Port the Wi-Fi panel to AdwToolbarView
|
||||
- Stop leaking the hotspot dialog
|
||||
+ Notifications:
|
||||
- Port to AdwToolbarView
|
||||
- Port dialog to AdwWindow and AdwToolbarView
|
||||
+ Online Accounts: Port to AdwToolbarView
|
||||
+ Power:
|
||||
- Port to AdwToolbarView
|
||||
- Port the suspend dialog to AdwWindow and AdwToolbarView
|
||||
+ Printers:
|
||||
- Port to AdwToolbarView
|
||||
- Make the panel adaptative
|
||||
- Move search bar above the banner
|
||||
- Port dialogs to AdwWindow and AdwToolbarView
|
||||
- Fix size calculation for normalized printer name
|
||||
+ Removable Media:
|
||||
- Port the dialog to AdwWindow
|
||||
- Port to AdwToolbarView
|
||||
+ Region: Port to AdwToolbarView
|
||||
+ Search: Port to AdwToolbarView
|
||||
+ Sharing:
|
||||
- Port to AdwToolbarView
|
||||
- Port dialogs to AdwWindow and AdwToolbarView
|
||||
- Port Remote Login row to AdwSwitchRow
|
||||
+ Sound:
|
||||
- Port to AdwToolbarView
|
||||
- Port dialogs to AdwWindow and AdwToolbarView
|
||||
+ User Accounts:
|
||||
- Fix account type row sensitivity
|
||||
- Port to AdwToolbarView
|
||||
- Port Add User dialog from deprecated GtkDialog to AdwWindow
|
||||
- Update status page text when no accountsservice is available
|
||||
- Show label when another user is logged in
|
||||
- Port error message dialogs to AdwToasts
|
||||
- Port deprecated GtkMessageDialogs to AdwMessageDialog
|
||||
- Add "loading" page at startup
|
||||
+ Wacom: Port to AdwToolbarView
|
||||
+ WWAN: Port to AdwToolbarView
|
||||
- Pass tests=false to meson, we are not running tests, so lets not
|
||||
build them either (avoids a dependency on setxkbmap).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 7 12:46:15 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 45.beta:
|
||||
+ Prevent loading last-panel unconditionally on startup
|
||||
+ Multiple settings rows got ported to use the AdwSwitchRow
|
||||
widget
|
||||
+ Various accessibility label fixes
|
||||
+ Various memory leak fixes
|
||||
+ About: New About panel displaying system information in a more
|
||||
compact way
|
||||
+ Applications: Fix crash when opening the Apps panel as the
|
||||
last-opened panel
|
||||
+ Datetime: Add description explaining the "Clock & Calendar"
|
||||
settings
|
||||
+ Displays: Replace deprecated GtkComboBox with AdwComboRow
|
||||
+ Keyboard:
|
||||
- Fix "Move up/down" movement options in the input list
|
||||
- Spawn "tecla" app to display the keyboard map (replaces
|
||||
gkbd-keyboard-display)
|
||||
- Fix alignment of the "Set Shorcut..." button
|
||||
+ Network: Use an AdwSwitchRow widget to enable/disable Wi-Fi
|
||||
+ Online Accounts:
|
||||
- Improve "offiline" message text
|
||||
- Use banner to indicate when the system is offline
|
||||
- Add panel description text and section titles
|
||||
+ Sound:
|
||||
- Make output test whell smaller
|
||||
- Ellipsize long device name label
|
||||
+ Printers: Use the "card" style for printer entries
|
||||
+ Privacy: New Privacy panel containing all the panels under the
|
||||
Privacy category
|
||||
+ Region: Fix preview buttoins in the format chooser
|
||||
+ Search: Fix "Move up/down" movement options in the app search
|
||||
list
|
||||
+ Users:
|
||||
- Show "Other Users" section only when there are users to show
|
||||
- Make entire panel insensitive when the user has no permission
|
||||
to make changes
|
||||
- Fix focus issues when selecting avatar image from a file
|
||||
- Fix g_critical errors when loading file metadata for avatars
|
||||
- Replace gnomekbd-tools Requires with tecla-keyboard-layout-viewer
|
||||
Requires following upstream changes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 14 13:55:51 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 45.alpha:
|
||||
+ Add placeholder text to various search entries
|
||||
+ Set a minimum size for various dialogs
|
||||
+ Make dialogs close when pressing the Escape key
|
||||
+ Replace deprecated GTK4 methods with new replacements
|
||||
+ Depend on snapd-glib-2 (soup3 version)
|
||||
+ Accessibility improvements
|
||||
+ Common:
|
||||
- Fix time entry for RTL languages
|
||||
- Use ToastOverlay
|
||||
- Show start title buttons in header bar
|
||||
- Allow more theming of rows
|
||||
- Only return to last panel if it didn't crash
|
||||
- Improvements to panel activation
|
||||
- Improvements to panel searching
|
||||
+ About:
|
||||
- Show only the GNOME major version
|
||||
- Update hostname only after apply is clicked
|
||||
+ Accessibility: Present the checked state on the list row itself
|
||||
+ Appearance: Clear out dconf if user picks defaults
|
||||
+ Applications:
|
||||
- Always use bold for app name in dialogs
|
||||
- Use header capitalization in the "No apps" AdwStatusPage
|
||||
+ Color:
|
||||
- Do not try to access to null pointer in destruction
|
||||
- Dim information text & fix "Learn more" link alignment
|
||||
+ Date and Time:
|
||||
- Fix NTP switch getting out of sync
|
||||
- Add top bar clock and calendar switches
|
||||
- Move "Time Format" row out of "Clock" section
|
||||
- Merge "Clock" and "Calendar" sections
|
||||
+ Default Apps: Don't crash when there are no apps for a mimetype
|
||||
+ Device Security:
|
||||
- Skip security attributes that have been obsoleted by others
|
||||
- Ddon't translate technical report
|
||||
+ Display:
|
||||
- Allow configuring all monitors and apply settings at once
|
||||
- Try snapping all the displays after a config change
|
||||
- Don't leak config manager proxy
|
||||
- Use AdwPreferencesPage
|
||||
- Fix display enabled toggle visibility
|
||||
- Fix gaps when numbering unusable displays
|
||||
- Fix stuck window subtitle
|
||||
- Fix invalid panel state after canceling changes
|
||||
- Check best_mode exist before adding flag
|
||||
+ Info: Show each GPU in it's own line
|
||||
+ Mouse:
|
||||
- Prevent infinite loop on settings changes
|
||||
- Do not bind sensitivity to touchpad settings
|
||||
- Simplify binding of touchpad sensitive widgets
|
||||
- Hide entire "Touchpad" row when touchpad cannot be disabled
|
||||
+ Keyboard:
|
||||
- Fix cancel button issue
|
||||
- Add "Compose" and "Character" keywords
|
||||
- Add ellipsis to the "Add Shortcut" button label
|
||||
- Fix "Add Custom Shortcut" in others sections
|
||||
- Drop "Left Alt" as compose key option
|
||||
+ Network:
|
||||
- Validate max length of hotspot SSID
|
||||
- Keep current mode when enabling proxy
|
||||
- Increase maximum MTU value from 10000 to 65536
|
||||
- Fix incorrect styling in WiFi list
|
||||
- Make the security status and signal strength read by screen
|
||||
readers
|
||||
- Add a confirmation dialog when forgetting a connection
|
||||
- Center panel title when subtitle isn't visible
|
||||
- Rename "Other Devices" to "Bluetooth"
|
||||
- Fix crash when importing wrong vpn file
|
||||
- Drop legacy vpn_export function
|
||||
- Close Connection Editor dialog when clicking Apply button
|
||||
- Add delete icon in saved WiFi connections list
|
||||
- Move WiFi controls out of headerbar
|
||||
+ Notifications: Replace "Applications" with "App Notifications"
|
||||
+ Power:
|
||||
- Label the main "battery" as UPS if that's what it is
|
||||
- Hide automatic suspend row in VM
|
||||
+ Region: Fix label of formats for the login screen
|
||||
+ Sharing:
|
||||
- Disable AdwActionRow markup for networks
|
||||
- Fix network row visible name bug
|
||||
- Remove global master switch
|
||||
- Fix visual bug for active indicators
|
||||
- Add icons next to each row
|
||||
- Add subtitle to each panel row
|
||||
+ Sound:
|
||||
- Make bass audible on low quality hardware
|
||||
- Prevent duplicate sound device entries
|
||||
+ Thunderbolt:
|
||||
- Update page to be more similar to other pages
|
||||
- Modernize Device Dialog UI
|
||||
+ Usage: Fix confirmation dialog when clearing history
|
||||
+ Users:
|
||||
- Remove account activity window
|
||||
- Set language-chooser to hide on close
|
||||
- Add popover explaining about the "Administrator" option
|
||||
- Add a popover describing the autologin functionality
|
||||
- Move "Add User" button out of the user listbox
|
||||
- Improve avatar crop mechanics
|
||||
- Improve rounding of avatar crop edges
|
||||
- Draw avatar crop corners to inside of crop
|
||||
+ Wacom: Rename "Test Your Settings" button to "Test Settings"
|
||||
+ Updated translations.
|
||||
- Rebase patch with quilt, but still disable it, breaks build in
|
||||
current form, so needs reworking or possibly dropping.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 30 07:54:43 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 44.3:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 26 13:28:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 44.2:
|
||||
+ Various small accessibility fixes.
|
||||
+ Fixes in Gtk template usage that causes crashes on some
|
||||
systems.
|
||||
+ Appearance: Clear dconf when resetting to defaults.
|
||||
+ Mouse: Hide entire "Touchpad" row when touchpad cannot be
|
||||
disabled.
|
||||
+ Network: Fix racy radio buttons in connection editor.
|
||||
+ Users: Remove autologin row tooltip when unlocked.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 21 07:49:24 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
@ -178,6 +592,12 @@ Tue Dec 6 04:31:50 UTC 2022 - Alynx Zhou <alynx.zhou@suse.com>
|
||||
when method is WPA3 Personal
|
||||
(glgo#GNOME/gnome-control-center!1520).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 18 08:50:23 UTC 2022 - Milachew <milachew@mail.lv>
|
||||
|
||||
- Add gnome-control-center-info-fix-distro-logo.patch: Fix the size
|
||||
of logo icon in About system (boo#1200581).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 18 08:00:32 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
name: gnome-control-center
|
||||
version: 44.1
|
||||
mtime: 1682033982
|
||||
commit: da661203820d5766ff10fd7f64d2117470c70a2a
|
||||
version: 45.2
|
||||
mtime: 1701946236
|
||||
commit: cc5da95fecaeb5486435c54917edf9633addc02d
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gnome-control-center
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,17 +26,23 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 44.1
|
||||
Version: 45.2
|
||||
Release: 0
|
||||
Summary: The GNOME Control Center
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/GUI/GNOME
|
||||
URL: https://apps.gnome.org/app/org.gnome.Settings
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source0: %{name}-%{version}.tar.zst
|
||||
Source99: %{name}-rpmlintrc
|
||||
|
||||
# PATCH-FIX-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 WAS:PATCH-FIX-OPENSUSE
|
||||
# PATCH-FIX-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
|
||||
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
|
||||
Patch2: gnome-control-center-add-user-button.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-control-center-fix-region-preview-crash.patch bsc#1218528 glgo#GNOME/gnome-control-center!2122 alynx.zhou@suse.com -- Fix crash of region preview dialog
|
||||
Patch3: gnome-control-center-fix-region-preview-crash.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-control-center-datetime-Avoid-emitting-the-time-changed-signal.patch bsc#1222149 glgo#GNOME/gnome-control-center#2943 xwang@suse.com -- Avoid emitting the time-changed signal
|
||||
Patch4: gnome-control-center-datetime-Avoid-emitting-the-time-changed-signal.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.
|
||||
@ -45,6 +51,8 @@ Patch1001: gnome-control-center-info-never-use-gnome-software.patch
|
||||
Patch1002: gnome-control-center-more-power-button-actions.patch
|
||||
# PATCH-FEATURE-SLE gnome-control-center-bring-back-firewall-zone.patch fate#316719 sckang@suse.com -- network: Bring back the firewall zone combo box to select proper firewall zone for each connection.
|
||||
Patch1003: gnome-control-center-bring-back-firewall-zone.patch
|
||||
# PATCH-NEEDS-REBASE gnome-control-center-info-fix-distro-logo.patch boo#1200581 milachew@mail.lv -- Fix the size of logo icon in About system
|
||||
Patch1004: gnome-control-center-info-fix-distro-logo.patch
|
||||
|
||||
BuildRequires: /usr/bin/Xvfb
|
||||
BuildRequires: cups-devel >= 1.4
|
||||
@ -94,6 +102,7 @@ BuildRequires: pkgconfig(mm-glib) >= 0.7
|
||||
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
|
||||
BuildRequires: pkgconfig(pwquality) >= 1.2.2
|
||||
BuildRequires: pkgconfig(smbclient)
|
||||
BuildRequires: pkgconfig(tecla)
|
||||
BuildRequires: pkgconfig(udisks2) >= 2.8.2
|
||||
BuildRequires: pkgconfig(upower-glib) >= 0.99.8
|
||||
BuildRequires: pkgconfig(x11)
|
||||
@ -113,9 +122,8 @@ Requires: gnome-settings-daemon >= 41
|
||||
Requires: gnome-themes-accessibility
|
||||
Requires: gnome-version
|
||||
Requires: iso-codes
|
||||
# Needed for showing keyboard layout, boo#898096
|
||||
# Require the package providing /usr/bin/gkbd-keyboard-display
|
||||
Requires: gnomekbd-tools
|
||||
# Needed for showing keyboard layout
|
||||
Requires: tecla-keyboard-layout-viewer
|
||||
# For the thunderbolt panel
|
||||
Recommends: bolt
|
||||
Recommends: %{name}-user-faces
|
||||
@ -181,13 +189,18 @@ GNOME control center.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
|
||||
# patches for Leap >= 15 plus SLE >= 15, but not TW
|
||||
%if 0%{?sle_version} >= 150000
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
%patch1003 -p1
|
||||
%patch -P 1001 -p1
|
||||
%patch -P 1002 -p1
|
||||
%patch -P 1003 -p1
|
||||
# patch needs rebase
|
||||
# %patch -P 1004 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -195,6 +208,7 @@ GNOME control center.
|
||||
-Ddocumentation=true \
|
||||
%{!?with_ibus: -Dibus=false} \
|
||||
-Dmalcontent=true \
|
||||
-Dtests=false \
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user