Sync from SUSE:SLFO:Main gnome-control-center revision fe947321980b37e5e58e09c8233f3b41
This commit is contained in:
parent
aee10a32e5
commit
c3d60c75c5
2
_service
2
_service
@ -3,7 +3,7 @@
|
|||||||
<service name="obs_scm" mode="manual">
|
<service name="obs_scm" mode="manual">
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
|
<param name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
|
||||||
<param name="revision">refs/tags/45.2</param>
|
<param name="revision">46.4</param>
|
||||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||||
<param name="versionrewrite-replacement">\1</param>
|
<param name="versionrewrite-replacement">\1</param>
|
||||||
|
BIN
gnome-control-center-45.2.obscpio
(Stored with Git LFS)
BIN
gnome-control-center-45.2.obscpio
(Stored with Git LFS)
Binary file not shown.
BIN
gnome-control-center-46.4.obscpio
(Stored with Git LFS)
Normal file
BIN
gnome-control-center-46.4.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,13 +0,0 @@
|
|||||||
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,26 +1,6 @@
|
|||||||
From c7e0b3b8d993c2edaaafa54cd40da9378d641263 Mon Sep 17 00:00:00 2001
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-ethernet.c gnome-control-center-46.3/panels/network/connection-editor/ce-page-ethernet.c
|
||||||
From: Jonathan Kang <jonathankang@gnome.org>
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-ethernet.c 2024-07-30 14:27:24.406647244 -0500
|
||||||
Date: Fri, 27 Oct 2023 16:51:26 +0800
|
+++ gnome-control-center-46.3/panels/network/connection-editor/ce-page-ethernet.c 2024-07-30 14:43:34.541519398 -0500
|
||||||
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 @@
|
@@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#include "ce-page.h"
|
#include "ce-page.h"
|
||||||
@ -49,7 +29,7 @@ index dce05a3..bba438f 100644
|
|||||||
char **mac_list;
|
char **mac_list;
|
||||||
const char *s_mac_str;
|
const char *s_mac_str;
|
||||||
const gchar *name;
|
const gchar *name;
|
||||||
@@ -107,6 +112,10 @@ connect_ethernet_page (CEPageEthernet *self)
|
@@ -107,6 +112,10 @@ connect_ethernet_page (CEPageEthernet *s
|
||||||
|
|
||||||
g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
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);
|
g_signal_connect_object (self->mtu_spin, "value-changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
||||||
@ -69,11 +49,10 @@ index dce05a3..bba438f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const gchar *
|
static const gchar *
|
||||||
@@ -177,6 +188,16 @@ ce_page_ethernet_validate (CEPage *page,
|
@@ -178,6 +189,16 @@ ce_page_ethernet_validate (CEPage
|
||||||
nm_setting_verify (NM_SETTING (self->setting_wired), NULL, error);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+static void
|
static void
|
||||||
+ce_page_ethernet_dispose (GObject *object)
|
+ce_page_ethernet_dispose (GObject *object)
|
||||||
+{
|
+{
|
||||||
+ CEPageEthernet *self = CE_PAGE_ETHERNET (object);
|
+ CEPageEthernet *self = CE_PAGE_ETHERNET (object);
|
||||||
@ -83,10 +62,11 @@ index dce05a3..bba438f 100644
|
|||||||
+ G_OBJECT_CLASS (ce_page_ethernet_parent_class)->dispose (object);
|
+ G_OBJECT_CLASS (ce_page_ethernet_parent_class)->dispose (object);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
static void
|
+static void
|
||||||
ce_page_ethernet_init (CEPageEthernet *self)
|
ce_page_ethernet_init (CEPageEthernet *self)
|
||||||
{
|
{
|
||||||
@@ -186,8 +207,11 @@ ce_page_ethernet_init (CEPageEthernet *self)
|
gtk_widget_init_template (GTK_WIDGET (self));
|
||||||
|
@@ -186,8 +207,11 @@ ce_page_ethernet_init (CEPageEthernet *s
|
||||||
static void
|
static void
|
||||||
ce_page_ethernet_class_init (CEPageEthernetClass *klass)
|
ce_page_ethernet_class_init (CEPageEthernetClass *klass)
|
||||||
{
|
{
|
||||||
@ -98,7 +78,7 @@ index dce05a3..bba438f 100644
|
|||||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/ethernet-page.ui");
|
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);
|
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, cloned_mac_combo);
|
||||||
@@ -195,6 +219,8 @@ ce_page_ethernet_class_init (CEPageEthernetClass *klass)
|
@@ -195,6 +219,8 @@ ce_page_ethernet_class_init (CEPageEther
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, mtu_spin);
|
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, mtu_label);
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, name_entry);
|
gtk_widget_class_bind_template_child (widget_class, CEPageEthernet, name_entry);
|
||||||
@ -107,7 +87,7 @@ index dce05a3..bba438f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -213,6 +239,7 @@ ce_page_ethernet_new (NMConnection *connection,
|
@@ -213,6 +239,7 @@ ce_page_ethernet_new (NMConnection *
|
||||||
self = CE_PAGE_ETHERNET (g_object_new (ce_page_ethernet_get_type (), NULL));
|
self = CE_PAGE_ETHERNET (g_object_new (ce_page_ethernet_get_type (), NULL));
|
||||||
|
|
||||||
self->client = client;
|
self->client = client;
|
||||||
@ -115,10 +95,9 @@ index dce05a3..bba438f 100644
|
|||||||
self->setting_connection = nm_connection_get_setting_connection (connection);
|
self->setting_connection = nm_connection_get_setting_connection (connection);
|
||||||
self->setting_wired = nm_connection_get_setting_wired (connection);
|
self->setting_wired = nm_connection_get_setting_wired (connection);
|
||||||
|
|
||||||
diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-security.c gnome-control-center-46.3/panels/network/connection-editor/ce-page-security.c
|
||||||
index ae6fbd4..b8a1b83 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-security.c 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/ce-page-security.c
|
+++ gnome-control-center-46.3/panels/network/connection-editor/ce-page-security.c 2024-07-30 14:43:34.541519398 -0500
|
||||||
+++ b/panels/network/connection-editor/ce-page-security.c
|
|
||||||
@@ -27,6 +27,7 @@
|
@@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#include "ce-page.h"
|
#include "ce-page.h"
|
||||||
@ -136,7 +115,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
|
|
||||||
NMConnection *connection;
|
NMConnection *connection;
|
||||||
const gchar *security_setting;
|
const gchar *security_setting;
|
||||||
@@ -165,6 +168,7 @@ security_combo_changed (CEPageSecurity *self)
|
@@ -164,6 +167,7 @@ security_combo_changed (CEPageSecurity *
|
||||||
gtk_box_remove (self->box, GTK_WIDGET (sec));
|
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, GTK_WIDGET (self->security_label));
|
||||||
@ -144,7 +123,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
nma_ws_add_to_size_group (sec, self->group);
|
nma_ws_add_to_size_group (sec, self->group);
|
||||||
|
|
||||||
gtk_box_append (self->box, g_object_ref (GTK_WIDGET (sec)));
|
gtk_box_append (self->box, g_object_ref (GTK_WIDGET (sec)));
|
||||||
@@ -222,6 +226,7 @@ finish_setup (CEPageSecurity *self)
|
@@ -221,6 +225,7 @@ finish_setup (CEPageSecurity *self)
|
||||||
{
|
{
|
||||||
NMSettingWireless *sw;
|
NMSettingWireless *sw;
|
||||||
NMSettingWirelessSecurity *sws;
|
NMSettingWirelessSecurity *sws;
|
||||||
@ -152,7 +131,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
gboolean is_adhoc = FALSE;
|
gboolean is_adhoc = FALSE;
|
||||||
g_autoptr(GtkListStore) sec_model = NULL;
|
g_autoptr(GtkListStore) sec_model = NULL;
|
||||||
GtkTreeIter iter;
|
GtkTreeIter iter;
|
||||||
@@ -388,6 +393,10 @@ finish_setup (CEPageSecurity *self)
|
@@ -387,6 +392,10 @@ finish_setup (CEPageSecurity *self)
|
||||||
|
|
||||||
gtk_combo_box_set_active (self->security_combo, active < 0 ? 0 : (guint32) active);
|
gtk_combo_box_set_active (self->security_combo, active < 0 ? 0 : (guint32) active);
|
||||||
|
|
||||||
@ -163,7 +142,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
security_combo_changed (self);
|
security_combo_changed (self);
|
||||||
g_signal_connect_object (self->security_combo, "changed",
|
g_signal_connect_object (self->security_combo, "changed",
|
||||||
G_CALLBACK (security_combo_changed), self, G_CONNECT_SWAPPED);
|
G_CALLBACK (security_combo_changed), self, G_CONNECT_SWAPPED);
|
||||||
@@ -423,6 +432,7 @@ ce_page_security_validate (CEPage *page,
|
@@ -422,6 +431,7 @@ ce_page_security_validate (CEPage
|
||||||
{
|
{
|
||||||
CEPageSecurity *self = CE_PAGE_SECURITY (page);
|
CEPageSecurity *self = CE_PAGE_SECURITY (page);
|
||||||
NMSettingWireless *sw;
|
NMSettingWireless *sw;
|
||||||
@ -171,7 +150,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
NMAWs *sec;
|
NMAWs *sec;
|
||||||
gboolean valid = FALSE;
|
gboolean valid = FALSE;
|
||||||
const char *mode;
|
const char *mode;
|
||||||
@@ -479,6 +489,9 @@ ce_page_security_validate (CEPage *page,
|
@@ -478,6 +488,9 @@ ce_page_security_validate (CEPage
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,7 +160,7 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
return valid;
|
return valid;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -501,6 +514,8 @@ ce_page_security_class_init (CEPageSecurityClass *klass)
|
@@ -500,6 +513,8 @@ ce_page_security_class_init (CEPageSecur
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, box);
|
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_label);
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, security_combo);
|
gtk_widget_class_bind_template_child (widget_class, CEPageSecurity, security_combo);
|
||||||
@ -190,12 +169,11 @@ index ae6fbd4..b8a1b83 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-vpn.c gnome-control-center-46.3/panels/network/connection-editor/ce-page-vpn.c
|
||||||
index 36afde5..edbf331 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-vpn.c 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/ce-page-vpn.c
|
+++ gnome-control-center-46.3/panels/network/connection-editor/ce-page-vpn.c 2024-07-30 14:43:34.541519398 -0500
|
||||||
+++ b/panels/network/connection-editor/ce-page-vpn.c
|
@@ -36,6 +36,8 @@ struct _CEPageVpn
|
||||||
@@ -35,6 +35,8 @@ struct _CEPageVpn
|
GtkBox *box;
|
||||||
|
|
||||||
GtkLabel *failure_label;
|
GtkLabel *failure_label;
|
||||||
GtkEntry *name_entry;
|
GtkEntry *name_entry;
|
||||||
+ GtkLabel *firewall_heading;
|
+ GtkLabel *firewall_heading;
|
||||||
@ -203,7 +181,7 @@ index 36afde5..edbf331 100644
|
|||||||
|
|
||||||
NMConnection *connection;
|
NMConnection *connection;
|
||||||
NMSettingConnection *setting_connection;
|
NMSettingConnection *setting_connection;
|
||||||
@@ -123,6 +125,9 @@ connect_vpn_page (CEPageVpn *self)
|
@@ -124,6 +126,9 @@ connect_vpn_page (CEPageVpn *self)
|
||||||
name = nm_setting_connection_get_id (self->setting_connection);
|
name = nm_setting_connection_get_id (self->setting_connection);
|
||||||
gtk_editable_set_text (GTK_EDITABLE (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);
|
g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
|
||||||
@ -213,7 +191,7 @@ index 36afde5..edbf331 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -158,6 +163,7 @@ ce_page_vpn_validate (CEPage *page,
|
@@ -159,6 +164,7 @@ ce_page_vpn_validate (CEPage *pag
|
||||||
g_object_set (self->setting_connection,
|
g_object_set (self->setting_connection,
|
||||||
NM_SETTING_CONNECTION_ID, gtk_editable_get_text (GTK_EDITABLE (self->name_entry)),
|
NM_SETTING_CONNECTION_ID, gtk_editable_get_text (GTK_EDITABLE (self->name_entry)),
|
||||||
NULL);
|
NULL);
|
||||||
@ -221,8 +199,8 @@ index 36afde5..edbf331 100644
|
|||||||
|
|
||||||
if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL, error))
|
if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL, error))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -186,6 +192,8 @@ ce_page_vpn_class_init (CEPageVpnClass *class)
|
@@ -188,6 +194,8 @@ ce_page_vpn_class_init (CEPageVpnClass *
|
||||||
|
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, box);
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, failure_label);
|
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, failure_label);
|
||||||
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, name_entry);
|
gtk_widget_class_bind_template_child (widget_class, CEPageVpn, name_entry);
|
||||||
+ gtk_widget_class_bind_template_child (widget_class, CEPageVpn, firewall_heading);
|
+ gtk_widget_class_bind_template_child (widget_class, CEPageVpn, firewall_heading);
|
||||||
@ -230,12 +208,11 @@ index 36afde5..edbf331 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/ethernet-page.ui gnome-control-center-46.3/panels/network/connection-editor/ethernet-page.ui
|
||||||
index e35a18a..c3618a9 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/ethernet-page.ui 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/ethernet-page.ui
|
+++ gnome-control-center-46.3/panels/network/connection-editor/ethernet-page.ui 2024-07-30 14:43:34.541519398 -0500
|
||||||
+++ b/panels/network/connection-editor/ethernet-page.ui
|
@@ -127,5 +127,31 @@
|
||||||
@@ -117,5 +117,31 @@
|
</child>
|
||||||
</layout>
|
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
+ <child>
|
+ <child>
|
||||||
@ -266,11 +243,9 @@ index e35a18a..c3618a9 100644
|
|||||||
+ </child>
|
+ </child>
|
||||||
</template>
|
</template>
|
||||||
</interface>
|
</interface>
|
||||||
diff --git a/panels/network/connection-editor/firewall-helpers.c b/panels/network/connection-editor/firewall-helpers.c
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.c gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.c
|
||||||
new file mode 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.c 1969-12-31 18:00:00.000000000 -0600
|
||||||
index 0000000..2e2c29f
|
+++ gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.c 2024-07-30 14:43:34.541519398 -0500
|
||||||
--- /dev/null
|
|
||||||
+++ b/panels/network/connection-editor/firewall-helpers.c
|
|
||||||
@@ -0,0 +1,125 @@
|
@@ -0,0 +1,125 @@
|
||||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||||
+ *
|
+ *
|
||||||
@ -397,11 +372,9 @@ index 0000000..2e2c29f
|
|||||||
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
|
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
|
||||||
+ g_free (zone);
|
+ g_free (zone);
|
||||||
+}
|
+}
|
||||||
diff --git a/panels/network/connection-editor/firewall-helpers.h b/panels/network/connection-editor/firewall-helpers.h
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.h gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.h
|
||||||
new file mode 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.h 1969-12-31 18:00:00.000000000 -0600
|
||||||
index 0000000..213c515
|
+++ gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.h 2024-07-30 14:43:34.541519398 -0500
|
||||||
--- /dev/null
|
|
||||||
+++ b/panels/network/connection-editor/firewall-helpers.h
|
|
||||||
@@ -0,0 +1,33 @@
|
@@ -0,0 +1,33 @@
|
||||||
+/*
|
+/*
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
+ * This program is free software; you can redistribute it and/or modify
|
||||||
@ -436,11 +409,10 @@ index 0000000..213c515
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+#endif /* _FIREWALL_HELPERS_H_ */
|
+#endif /* _FIREWALL_HELPERS_H_ */
|
||||||
diff --git a/panels/network/connection-editor/meson.build b/panels/network/connection-editor/meson.build
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/meson.build gnome-control-center-46.3/panels/network/connection-editor/meson.build
|
||||||
index c544b21..7377fc0 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/meson.build 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/meson.build
|
+++ gnome-control-center-46.3/panels/network/connection-editor/meson.build 2024-07-30 14:43:34.541519398 -0500
|
||||||
+++ b/panels/network/connection-editor/meson.build
|
@@ -14,6 +14,7 @@ sources = files(
|
||||||
@@ -13,6 +13,7 @@ sources = files(
|
|
||||||
'ce-page-wireguard.c',
|
'ce-page-wireguard.c',
|
||||||
'ce-page-wifi.c',
|
'ce-page-wifi.c',
|
||||||
'ce-page.c',
|
'ce-page.c',
|
||||||
@ -448,12 +420,11 @@ index c544b21..7377fc0 100644
|
|||||||
'net-connection-editor.c',
|
'net-connection-editor.c',
|
||||||
'vpn-helpers.c'
|
'vpn-helpers.c'
|
||||||
)
|
)
|
||||||
diff --git a/panels/network/connection-editor/security-page.ui b/panels/network/connection-editor/security-page.ui
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/security-page.ui gnome-control-center-46.3/panels/network/connection-editor/security-page.ui
|
||||||
index 9a1c0de..ba31a81 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/security-page.ui 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/security-page.ui
|
+++ gnome-control-center-46.3/panels/network/connection-editor/security-page.ui 2024-07-30 14:43:34.541519398 -0500
|
||||||
+++ b/panels/network/connection-editor/security-page.ui
|
@@ -51,5 +51,32 @@
|
||||||
@@ -41,5 +41,32 @@
|
</child>
|
||||||
</layout>
|
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
+ <child>
|
+ <child>
|
||||||
@ -485,41 +456,37 @@ index 9a1c0de..ba31a81 100644
|
|||||||
+ </child>
|
+ </child>
|
||||||
</template>
|
</template>
|
||||||
</interface>
|
</interface>
|
||||||
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
|
diff -urpN gnome-control-center-46.3.orig/panels/network/connection-editor/vpn-page.ui gnome-control-center-46.3/panels/network/connection-editor/vpn-page.ui
|
||||||
index 98f801b..73bbef8 100644
|
--- gnome-control-center-46.3.orig/panels/network/connection-editor/vpn-page.ui 2024-07-30 14:27:24.406647244 -0500
|
||||||
--- a/panels/network/connection-editor/vpn-page.ui
|
+++ gnome-control-center-46.3/panels/network/connection-editor/vpn-page.ui 2024-07-30 16:41:59.561246367 -0500
|
||||||
+++ b/panels/network/connection-editor/vpn-page.ui
|
@@ -35,6 +35,30 @@
|
||||||
@@ -28,6 +28,30 @@
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
<child>
|
||||||
</child>
|
+ <object class="GtkBox" id="box1">
|
||||||
+ <child>
|
+ <property name="visible">True</property>
|
||||||
+ <object class="GtkBox" id="box1">
|
+ <property name="can_focus">False</property>
|
||||||
+ <property name="visible">True</property>
|
+ <property name="spacing">6</property>
|
||||||
+ <property name="can_focus">False</property>
|
+ <child>
|
||||||
+ <property name="spacing">6</property>
|
+ <object class="GtkLabel" id="firewall_heading">
|
||||||
+ <child>
|
+ <property name="visible">True</property>
|
||||||
+ <object class="GtkLabel" id="firewall_heading">
|
+ <property name="can_focus">False</property>
|
||||||
+ <property name="visible">True</property>
|
+ <property name="label" translatable="yes">Firewall _Zone</property>
|
||||||
+ <property name="can_focus">False</property>
|
+ <property name="use_underline">True</property>
|
||||||
+ <property name="label" translatable="yes">Firewall _Zone</property>
|
+ <property name="mnemonic_widget">firewall_combo</property>
|
||||||
+ <property name="use_underline">True</property>
|
+ </object>
|
||||||
+ <property name="mnemonic_widget">firewall_combo</property>
|
+ </child>
|
||||||
+ </object>
|
+ <child>
|
||||||
+ </child>
|
+ <object class="GtkComboBoxText" id="firewall_combo">
|
||||||
+ <child>
|
+ <property name="visible">True</property>
|
||||||
+ <object class="GtkComboBoxText" id="firewall_combo">
|
+ <property name="can_focus">False</property>
|
||||||
+ <property name="visible">True</property>
|
+ <property name="entry_text_column">0</property>
|
||||||
+ <property name="can_focus">False</property>
|
+ <property name="id_column">1</property>
|
||||||
+ <property name="entry_text_column">0</property>
|
+ </object>
|
||||||
+ <property name="id_column">1</property>
|
+ </child>
|
||||||
+ </object>
|
+ </object>
|
||||||
+ </child>
|
+ </child>
|
||||||
+ </object>
|
+ <child>
|
||||||
+ </child>
|
<object class="GtkLabel" id="failure_label">
|
||||||
<child>
|
<property name="xalign">0</property>
|
||||||
<object class="GtkLabel" id="failure_label">
|
<property name="label" translatable="yes">(Error: unable to load VPN connection editor)</property>
|
||||||
<property name="xalign">0</property>
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
||||||
|
@ -1,114 +0,0 @@
|
|||||||
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,7 +1,8 @@
|
|||||||
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
|
Index: gnome-control-center-46.3/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
|
--- gnome-control-center-46.3.orig/panels/network/cc-network-panel.c
|
||||||
@@ -653,10 +653,24 @@
|
+++ gnome-control-center-46.3/panels/network/cc-network-panel.c
|
||||||
|
@@ -667,10 +667,24 @@ static void
|
||||||
panel_check_network_manager_version (CcNetworkPanel *self)
|
panel_check_network_manager_version (CcNetworkPanel *self)
|
||||||
{
|
{
|
||||||
const gchar *version;
|
const gchar *version;
|
||||||
@ -27,7 +28,7 @@ diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-network-panel.c gno
|
|||||||
GtkWidget *status_page;
|
GtkWidget *status_page;
|
||||||
|
|
||||||
status_page = adw_status_page_new ();
|
status_page = adw_status_page_new ();
|
||||||
@@ -667,10 +681,23 @@
|
@@ -681,10 +695,23 @@ panel_check_network_manager_version (CcN
|
||||||
adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
|
||||||
_("An error has occurred and network cannot be used."
|
_("An error has occurred and network cannot be used."
|
||||||
"\n Error details: NetworkManager not running."));
|
"\n Error details: NetworkManager not running."));
|
||||||
@ -51,10 +52,11 @@ diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-network-panel.c gno
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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
|
Index: gnome-control-center-46.3/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
|
--- gnome-control-center-46.3.orig/panels/network/cc-wifi-panel.c
|
||||||
@@ -298,21 +298,41 @@
|
+++ gnome-control-center-46.3/panels/network/cc-wifi-panel.c
|
||||||
|
@@ -298,21 +298,41 @@ static void
|
||||||
check_main_stack_page (CcWifiPanel *self)
|
check_main_stack_page (CcWifiPanel *self)
|
||||||
{
|
{
|
||||||
const gchar *nm_version;
|
const gchar *nm_version;
|
||||||
@ -97,9 +99,10 @@ diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.c gnome-
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
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
|
Index: gnome-control-center-46.3/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
|
--- gnome-control-center-46.3.orig/panels/network/cc-wifi-panel.ui
|
||||||
|
+++ gnome-control-center-46.3/panels/network/cc-wifi-panel.ui
|
||||||
@@ -197,6 +197,51 @@
|
@@ -197,6 +197,51 @@
|
||||||
</property>
|
</property>
|
||||||
</object>
|
</object>
|
||||||
@ -152,10 +155,12 @@ diff -uraBN temp/gnome-control-center-45.1/panels/network/cc-wifi-panel.ui gnome
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
diff -uraBN temp/gnome-control-center-45.1/tests/meson.build gnome-control-center-45.1/tests/meson.build
|
Index: gnome-control-center-46.3/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
|
--- gnome-control-center-46.3.orig/tests/meson.build
|
||||||
@@ -1,8 +1,11 @@
|
+++ gnome-control-center-46.3/tests/meson.build
|
||||||
|
@@ -3,9 +3,12 @@ Xvfb = find_program('Xvfb', required: fa
|
||||||
|
|
||||||
subdir('common')
|
subdir('common')
|
||||||
#subdir('datetime')
|
#subdir('datetime')
|
||||||
+# Disable tests for network panel, boo#1128195
|
+# Disable tests for network panel, boo#1128195
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
|||||||
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)
|
|
||||||
{
|
|
||||||
- g_autofree gchar *path = g_find_program_in_path ("gnome-software");
|
|
||||||
- return path != NULL;
|
|
||||||
+ /* Don't use gnome-software in SLE. */
|
|
||||||
+ return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
|
14
gnome-control-center-system-never-use-gnome-software.patch
Normal file
14
gnome-control-center-system-never-use-gnome-software.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -urp gnome-control-center-46.3.orig/panels/system/cc-system-panel.c gnome-control-center-46.3/panels/system/cc-system-panel.c
|
||||||
|
--- gnome-control-center-46.3.orig/panels/system/cc-system-panel.c 2024-07-30 14:27:24.426647687 -0500
|
||||||
|
+++ gnome-control-center-46.3/panels/system/cc-system-panel.c 2024-07-30 14:36:02.188142991 -0500
|
||||||
|
@@ -77,8 +77,8 @@ gnome_software_allows_updates (void)
|
||||||
|
static gboolean
|
||||||
|
gnome_software_exists (void)
|
||||||
|
{
|
||||||
|
- g_autofree gchar *path = g_find_program_in_path ("gnome-software");
|
||||||
|
- return path != NULL;
|
||||||
|
+ /* Don't use gnome-software in SLE. */
|
||||||
|
+ return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
@ -0,0 +1,27 @@
|
|||||||
|
From cf0a84f2a79d3685b0f7a516e4c9d9ade1b888dc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Xiaoguang Wang <xwang@suse.com>
|
||||||
|
Date: Thu, 23 May 2024 09:32:43 +0800
|
||||||
|
Subject: [PATCH] users-page: Don't show the system accounts
|
||||||
|
|
||||||
|
When handling user-added signal, omit the system accounts.
|
||||||
|
|
||||||
|
Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/3066
|
||||||
|
---
|
||||||
|
panels/system/users/cc-users-page.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
Index: gnome-control-center-46.3/panels/system/users/cc-users-page.c
|
||||||
|
===================================================================
|
||||||
|
--- gnome-control-center-46.3.orig/panels/system/users/cc-users-page.c
|
||||||
|
+++ gnome-control-center-46.3/panels/system/users/cc-users-page.c
|
||||||
|
@@ -172,6 +172,10 @@ on_user_added (CcUsersPage *self,
|
||||||
|
CcUserPage *page;
|
||||||
|
g_list_store_insert_sorted (self->model, user, sort_users, self);
|
||||||
|
|
||||||
|
+ if (act_user_is_system_account (user)) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
page = CC_USER_PAGE (adw_navigation_view_get_visible_page (self->navigation));
|
||||||
|
if (page != self->current_user_page)
|
||||||
|
return;
|
@ -1,10 +1,119 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 21 08:42:35 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
Sun Aug 11 13:10:26 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 46.4:
|
||||||
|
+ Accessibility: Fix enum value for follow centered
|
||||||
|
+ Apps: Fix memory leak for MMManager object in default apps page
|
||||||
|
+ Network: Don't set empty ignored hosts
|
||||||
|
+ Privacy: Fix visibility issue of Bolt settings when Bolt isn't
|
||||||
|
available
|
||||||
|
+ Users:
|
||||||
|
- Avoid accidental mnemonics for user name rows
|
||||||
|
- Show correctly the remaining list of fingerprints to enroll
|
||||||
|
+ WWAN: Fix crash on Unlock SIM dialog
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 30 19:37:27 UTC 2024 - Michael Gorse <mgorse@suse.com>
|
||||||
|
|
||||||
|
- Rebase gnome-control-center-info-never-use-gnome-software.patch
|
||||||
|
and rename to
|
||||||
|
gnome-control-center-system-never-use-gnome-software.patch
|
||||||
|
- Rebase gnome-control-center-bring-back-firewall-zone.patch.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 28 20:33:21 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 46.3:
|
||||||
|
+ CI fixes
|
||||||
|
+ Mouse: Make Mouse test click indicator not respond for middle
|
||||||
|
clicks
|
||||||
|
+ Network: Reference icon-name proper for wifi panel
|
||||||
|
+ Tests: Don't require Xvfb or setxkbmap for tests
|
||||||
|
+ Sharing: Make Orca read the "Add Folder" row in Media Sharing
|
||||||
|
settings
|
||||||
|
+ Update translations.
|
||||||
|
- Refresh patches with quilt.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 4 09:31:03 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
||||||
|
|
||||||
- Update gnome-control-center-disable-error-message-for-NM.patch:
|
- Update gnome-control-center-disable-error-message-for-NM.patch:
|
||||||
Add info page to toolbar view instead of navigation page to
|
Add info page to toolbar view instead of navigation page to
|
||||||
prevent hiding close button (bsc#1222099).
|
prevent hiding close button (bsc#1222099).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 3 09:40:10 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.2:
|
||||||
|
+ Enable the "Location" settings panel by default.
|
||||||
|
+ Improve accessibility of some secondary-labels in settings
|
||||||
|
rows.
|
||||||
|
+ Increase default log verbosity level.
|
||||||
|
+ Accessibility:
|
||||||
|
- Fix icon name of accessibility panel desktop file.
|
||||||
|
- Fix flash area settings selection shown incorrectly.
|
||||||
|
+ Display: Fix crash when closing laptop lid.
|
||||||
|
+ Keyboard: Fix keyboard navigation of keyboard shortcuts dialog
|
||||||
|
categories.
|
||||||
|
+ Mouse and Touchpad: Remove unnecessary a11y label.
|
||||||
|
+ Network:
|
||||||
|
- Fix crash when removing bluetooth network adapter row.
|
||||||
|
- Sort VPN connections list alphabetically.
|
||||||
|
- Remove incorrect assertion that breaks proxy settings page.
|
||||||
|
+ Sound:
|
||||||
|
- Make sliders more accessible by keyboard.
|
||||||
|
- Remove need for translating speaker test button tooltip.
|
||||||
|
+ System:
|
||||||
|
- Improve accessibility of "Copy" buttons in Remote Desktop.
|
||||||
|
- Fix crash in Date And Time settings closing before async
|
||||||
|
calls finish.
|
||||||
|
- Fix reuse of remote-desktop verify encryption fingerprint
|
||||||
|
dialog.
|
||||||
|
+ Users: Fix visibility issue in parental controls row.
|
||||||
|
+ Updated translations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 24 02:33:07 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
||||||
|
|
||||||
|
- Add gnome-control-center-users-page-Don-t-show-the-system-accounts.patch:
|
||||||
|
not show system account in Users panel
|
||||||
|
(bsc#1224199 glgo#GNOME/Settings#3066).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 13 23:02:40 UTC 2024 - Richard Rahl <rrahl0@disroot.org>
|
||||||
|
|
||||||
|
- Re-Enable location-services support:
|
||||||
|
+ Pass -Dlocation-services=enabled to meson.
|
||||||
|
** Support had been disabled by upstream as the mozilla location
|
||||||
|
service will shut down. which in turn means location service
|
||||||
|
will not be very accurate anymore.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 2 08:14:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.1:
|
||||||
|
+ Accessibility: Improve accessibility of "Typing" settings
|
||||||
|
sliders.
|
||||||
|
+ Display: Fix crash when pressing Escape in the display
|
||||||
|
settings.
|
||||||
|
+ Network: Add stable-ssid support for cloned-mac.
|
||||||
|
+ Privacy:
|
||||||
|
- Add build option to enable Location services
|
||||||
|
- Fix opening of Help pages while viewing Privacy settings
|
||||||
|
+ Sharing: Auto hide Sharing panel when Rygel AND
|
||||||
|
gnome-user-share are not available.
|
||||||
|
+ System:
|
||||||
|
- Don't show auto-timezone setting when Location services
|
||||||
|
unavailable.
|
||||||
|
- Avoid unnecessary time-change requests.
|
||||||
|
- Fix issue with sensitivity of "Add" and "Enroll" Enterprise
|
||||||
|
Login buttons.
|
||||||
|
- Improve generated passwords capacity in Remote Desktop
|
||||||
|
settings.
|
||||||
|
+ Wacom: Check for the right output connector name.
|
||||||
|
- Drop upstream merged
|
||||||
|
gnome-control-center-datetime-Avoid-emitting-the-time-changed-signal.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 8 03:14:11 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
Mon Apr 8 03:14:11 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
||||||
|
|
||||||
@ -12,6 +121,160 @@ Mon Apr 8 03:14:11 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
|
|||||||
Avoid emitting the time-changed signal
|
Avoid emitting the time-changed signal
|
||||||
(bsc#1222149, bsc#1221799, glgo#GNOME/gnome-control-center#2943).
|
(bsc#1222149, bsc#1221799, glgo#GNOME/gnome-control-center#2943).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 27 18:23:40 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.0.1:
|
||||||
|
+ Handle legacy panel arguments
|
||||||
|
+ Accessibility: Allow launching subpages directly.
|
||||||
|
+ Privacy: Fix Thunderbolt panel not launching.
|
||||||
|
+ System:
|
||||||
|
- Avoid setting auto time sync when it isn't needed.
|
||||||
|
- Improve startup time by loading subpages on demand.
|
||||||
|
+ Updated translations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 19 08:48:25 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Split out users panel: it shall not be installed by default on
|
||||||
|
Aeon.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 18 12:28:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.0:
|
||||||
|
+ Update links in appdata file
|
||||||
|
+ Improve sidebar search results
|
||||||
|
+ Appearance: Add a transition to the selected background check.
|
||||||
|
+ Color: Fix visibility of calibration button.
|
||||||
|
+ Online Accounts: Reorder online account providers list.
|
||||||
|
+ Privacy & Security: Allow launching subpages of the privacy
|
||||||
|
panel directly.
|
||||||
|
+ Wacom:
|
||||||
|
- Bump libwacom dependency requirement to >= 1.4.
|
||||||
|
- Add AES styli as separate stylus SVG.
|
||||||
|
- Accept eraser types of button when matching stylus IDs.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 15 11:52:05 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.rc+75:
|
||||||
|
+ Allow launching some subpages from the command line.
|
||||||
|
+ Various ports of custom widgets to libadwaita widgets.
|
||||||
|
+ Appearance: Track current active background better.
|
||||||
|
+ Display:
|
||||||
|
- Add support for Variable Refresh Rate (VRR) modes.
|
||||||
|
- Show the full VRR range for a monitor when possible.
|
||||||
|
+ System:
|
||||||
|
- Introduce the "Remote Login" settings.
|
||||||
|
- Rename the old "Remote Desktop" settings to "Desktop
|
||||||
|
Sharing".
|
||||||
|
- Reintroduce some of "System" pages as search results.
|
||||||
|
+ Users:
|
||||||
|
- Fix issue with newly created user page showing other user's
|
||||||
|
info.
|
||||||
|
- Introduce a new "Add Enterprise User" dialog.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 13 15:47:18 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.beta.2:
|
||||||
|
+ Exceptional release to fix translations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 13 11:48:39 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.beta.1:
|
||||||
|
+ Exceptional release to include gnome-online-accounts changes.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 12 16:58:00 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 46.beta:
|
||||||
|
+ Drop pkexec dependency.
|
||||||
|
+ Bump gcr dependency to gcr4.
|
||||||
|
+ Reorder sidebar/panel list.
|
||||||
|
+ Use g_clear_handle_id with g_source_remove to remove GSources.
|
||||||
|
+ Add CcHostname as a wrapper to interact with system-hostnamed.
|
||||||
|
+ Remove periods in subtitles/descriptions/labels according to
|
||||||
|
the HIG.
|
||||||
|
+ Various string/sentence rewording (for clarity).
|
||||||
|
+ Various style changes in symbolic icons.
|
||||||
|
+ Various ports of custom widgets to modern libadwaita
|
||||||
|
alternatives.
|
||||||
|
+ Various new mnemonics added.
|
||||||
|
+ Accessibility:
|
||||||
|
- Expose new "show-status-shapes" setting.
|
||||||
|
- Rephrase overamplification string in the "Hearing" settings.
|
||||||
|
- Stop tracking old GTK theme.
|
||||||
|
- Stop forcing HighContrast icon theme (The theme is considered
|
||||||
|
deprecated).
|
||||||
|
+ Apps:
|
||||||
|
- Tweak headings & descriptions from Default Apps sections.
|
||||||
|
- Tweak the autorun-never option design (inverting the
|
||||||
|
autorun-never option logic).
|
||||||
|
- Use modern libadwaita widgets in the Removable Media
|
||||||
|
settings.
|
||||||
|
+ Keyboard: Use AdwActionRow to show the key modifier options.
|
||||||
|
+ Network: Fix missing VPN entries.
|
||||||
|
+ Mouse:
|
||||||
|
- Add "Test Settings" button to the body of the panel.
|
||||||
|
- Modernize mouse test dialog (adds secondary-click test).
|
||||||
|
+ Printers:
|
||||||
|
- Add padding to the sidebar items from "Printer Options".
|
||||||
|
- Add .suggested-action style class to "Test Page" button.
|
||||||
|
+ Privacy:
|
||||||
|
- Hide non-functional microphone panel.
|
||||||
|
+ Search:
|
||||||
|
- Add commandline parameter for opening the Search Locations
|
||||||
|
dialog directly.
|
||||||
|
- Stop removing non-existent folders from tracker.
|
||||||
|
- Expose single directory setting.
|
||||||
|
- Add placeholder for custom locations.
|
||||||
|
- Set title for non-existent bookmarks.
|
||||||
|
- Always show switch for default/bookmarks.
|
||||||
|
- Handle unset XDG dirs.
|
||||||
|
- Tweak search locations labels.
|
||||||
|
+ Sharing:
|
||||||
|
- Fix alignment of networks section in the File/Media sharing
|
||||||
|
dialogs.
|
||||||
|
- Use edit-delete-symbolic in networks list rather than
|
||||||
|
window-close-symbolic.
|
||||||
|
- Move main switches from dialog headerbars into the dialog's
|
||||||
|
content area.
|
||||||
|
+ Sound:
|
||||||
|
- Show radio buttons as prefix for the Alert Sound rows.
|
||||||
|
- Add tooltips to all speaker test buttons.
|
||||||
|
+ System:
|
||||||
|
- Move "Remote Login" from sharing panel to System (now named
|
||||||
|
"Secure Shell").
|
||||||
|
- Use polkit to request permissions to enable/disable sshd.
|
||||||
|
- Create CcSystemDetailsWindow upon opening (speed up System
|
||||||
|
panel startup time).
|
||||||
|
- Fix crash in About page after dark mode switch.
|
||||||
|
- Don't show Remote Desktop settings when backend is not
|
||||||
|
available.
|
||||||
|
- Show gnome-control-center version on the "GNOME Version" row
|
||||||
|
in the About page.
|
||||||
|
- Fix language chooser dialog not closing in Users page.
|
||||||
|
+ Wi-Fi:
|
||||||
|
- Show password when sharing QR Code.
|
||||||
|
- Fix crash with toast notifications in the Saved Networks
|
||||||
|
dialog.
|
||||||
|
+ Updated translations.
|
||||||
|
- Drop gnome-control-center-add-user-button.patch: no longer
|
||||||
|
applicable.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 12 16:56:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 45.3:
|
||||||
|
+ Datetime: Fix build with -Wincompatible-pointer-types.
|
||||||
|
+ Region: Prevent preview crash from accessing invalid pointer.
|
||||||
|
+ Wifi: Fix build with -Wincompatible-pointer-types.
|
||||||
|
- Drop gnome-control-center-fix-region-preview-crash.patch: fixed
|
||||||
|
upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 4 02:08:39 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
Thu Jan 4 02:08:39 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
name: gnome-control-center
|
name: gnome-control-center
|
||||||
version: 45.2
|
version: 46.4
|
||||||
mtime: 1701946236
|
mtime: 1722850427
|
||||||
commit: cc5da95fecaeb5486435c54917edf9633addc02d
|
commit: e8aa31c9da651b858bfc0809d7c43ad5bfdc53f6
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: gnome-control-center
|
Name: gnome-control-center
|
||||||
Version: 45.2
|
Version: 46.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: The GNOME Control Center
|
Summary: The GNOME Control Center
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -37,16 +37,12 @@ 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
|
# 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
|
Patch1: gnome-control-center-disable-error-message-for-NM.patch
|
||||||
# PATCH-FIX-UPSTREAM gnome-control-center-add-user-button.patch bsc#1215556 glgo#GNOME/Settings!1927 xwang@suse.com -- Show add user button
|
# PATCH-FIX-UPSTREAM gnome-control-center-users-page-Don-t-show-the-system-accounts.patch bsc#1224199 glgo#GNOME/Settings#3066 xwang@suse.com -- not show system account in Users panel
|
||||||
Patch2: gnome-control-center-add-user-button.patch
|
Patch2: gnome-control-center-users-page-Don-t-show-the-system-accounts.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
|
### patches for Leap >= 15 plus SLE >= 15, but not TW
|
||||||
# PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
|
# PATCH-FEATURE-SLE gnome-control-center-system-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.
|
||||||
Patch1001: gnome-control-center-info-never-use-gnome-software.patch
|
Patch1001: gnome-control-center-system-never-use-gnome-software.patch
|
||||||
# PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions.
|
# PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions.
|
||||||
Patch1002: gnome-control-center-more-power-button-actions.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.
|
# 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.
|
||||||
@ -60,7 +56,7 @@ BuildRequires: desktop-file-utils
|
|||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: meson >= 0.57.0
|
BuildRequires: meson >= 0.58.0
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3-dbusmock
|
BuildRequires: python3-dbusmock
|
||||||
BuildRequires: xsltproc
|
BuildRequires: xsltproc
|
||||||
@ -69,22 +65,22 @@ BuildRequires: pkgconfig(cairo-gobject)
|
|||||||
BuildRequires: pkgconfig(colord) >= 0.1.34
|
BuildRequires: pkgconfig(colord) >= 0.1.34
|
||||||
BuildRequires: pkgconfig(colord-gtk4)
|
BuildRequires: pkgconfig(colord-gtk4)
|
||||||
BuildRequires: pkgconfig(fontconfig)
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: pkgconfig(gcr-base-3)
|
BuildRequires: pkgconfig(gcr-4) >= 4.1.0
|
||||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0
|
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0
|
||||||
BuildRequires: pkgconfig(gdk-wayland-3.0)
|
BuildRequires: pkgconfig(gdk-wayland-3.0)
|
||||||
BuildRequires: pkgconfig(gio-2.0)
|
BuildRequires: pkgconfig(gio-2.0)
|
||||||
BuildRequires: pkgconfig(gl)
|
BuildRequires: pkgconfig(gl)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= 2.68.0
|
BuildRequires: pkgconfig(glib-2.0) >= 2.76.6
|
||||||
BuildRequires: pkgconfig(gmodule-2.0)
|
BuildRequires: pkgconfig(gmodule-2.0)
|
||||||
BuildRequires: pkgconfig(gnome-bluetooth-3.0)
|
BuildRequires: pkgconfig(gnome-bluetooth-3.0)
|
||||||
BuildRequires: pkgconfig(gnome-desktop-4)
|
BuildRequires: pkgconfig(gnome-desktop-4)
|
||||||
BuildRequires: pkgconfig(gnome-settings-daemon) >= 41
|
BuildRequires: pkgconfig(gnome-settings-daemon) >= 41
|
||||||
BuildRequires: pkgconfig(gnutls)
|
BuildRequires: pkgconfig(gnutls)
|
||||||
BuildRequires: pkgconfig(goa-1.0) >= 3.25.3
|
BuildRequires: pkgconfig(goa-1.0) >= 3.49.1
|
||||||
BuildRequires: pkgconfig(goa-backend-1.0)
|
BuildRequires: pkgconfig(goa-backend-1.0)
|
||||||
BuildRequires: pkgconfig(gobject-2.0)
|
BuildRequires: pkgconfig(gobject-2.0)
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 40.alpha
|
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 46.beta
|
||||||
BuildRequires: pkgconfig(gsound)
|
BuildRequires: pkgconfig(gsound)
|
||||||
BuildRequires: pkgconfig(gthread-2.0)
|
BuildRequires: pkgconfig(gthread-2.0)
|
||||||
BuildRequires: pkgconfig(gtk4) >= 4.8
|
BuildRequires: pkgconfig(gtk4) >= 4.8
|
||||||
@ -111,7 +107,7 @@ BuildRequires: pkgconfig(xft)
|
|||||||
BuildRequires: pkgconfig(xi) >= 1.2
|
BuildRequires: pkgconfig(xi) >= 1.2
|
||||||
## CONDITIONAL BUILD REQUIREMENTS
|
## CONDITIONAL BUILD REQUIREMENTS
|
||||||
%if %{with wacom}
|
%if %{with wacom}
|
||||||
BuildRequires: pkgconfig(libwacom) >= 0.7
|
BuildRequires: pkgconfig(libwacom) >= 1.4
|
||||||
%endif
|
%endif
|
||||||
%if %{with ibus}
|
%if %{with ibus}
|
||||||
BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2
|
BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2
|
||||||
@ -185,14 +181,23 @@ BuildArch: noarch
|
|||||||
This package provides the online accounts onfiguration panel for
|
This package provides the online accounts onfiguration panel for
|
||||||
GNOME control center.
|
GNOME control center.
|
||||||
|
|
||||||
|
%package users
|
||||||
|
Summary: Configuration panel for User accounts
|
||||||
|
Group: System/GUI/GNOME
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Supplements: %{name}
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description users
|
||||||
|
This package provides the online accounts onfiguration panel for
|
||||||
|
GNOME control center.
|
||||||
|
|
||||||
%lang_package
|
%lang_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -P 1 -p1
|
%patch -P 1 -p1
|
||||||
%patch -P 2 -p1
|
%patch -P 2 -p1
|
||||||
%patch -P 3 -p1
|
|
||||||
%patch -P 4 -p1
|
|
||||||
|
|
||||||
# patches for Leap >= 15 plus SLE >= 15, but not TW
|
# patches for Leap >= 15 plus SLE >= 15, but not TW
|
||||||
%if 0%{?sle_version} >= 150000
|
%if 0%{?sle_version} >= 150000
|
||||||
@ -209,12 +214,11 @@ GNOME control center.
|
|||||||
%{!?with_ibus: -Dibus=false} \
|
%{!?with_ibus: -Dibus=false} \
|
||||||
-Dmalcontent=true \
|
-Dmalcontent=true \
|
||||||
-Dtests=false \
|
-Dtests=false \
|
||||||
|
-Dsnap=false \
|
||||||
|
-Dlocation-services=enabled \
|
||||||
%{nil}
|
%{nil}
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
#%%check
|
|
||||||
#%%meson_test
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
%find_lang %{name}-2.0 %{?no_lang_C}
|
%find_lang %{name}-2.0 %{?no_lang_C}
|
||||||
@ -224,6 +228,9 @@ GNOME control center.
|
|||||||
# We do not package gnome-control-center.rules (bnc#804966)
|
# We do not package gnome-control-center.rules (bnc#804966)
|
||||||
rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
||||||
|
|
||||||
|
%check
|
||||||
|
%meson_test
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS README.md
|
%doc NEWS README.md
|
||||||
@ -231,6 +238,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
|||||||
%{_datadir}/metainfo/org.gnome.Settings.appdata.xml
|
%{_datadir}/metainfo/org.gnome.Settings.appdata.xml
|
||||||
%exclude %{_datadir}/applications/gnome-color-panel.desktop
|
%exclude %{_datadir}/applications/gnome-color-panel.desktop
|
||||||
%exclude %{_datadir}/applications/gnome-online-accounts-panel.desktop
|
%exclude %{_datadir}/applications/gnome-online-accounts-panel.desktop
|
||||||
|
%exclude %{_datadir}/applications/gnome-users-panel.desktop
|
||||||
%{_datadir}/applications/*.desktop
|
%{_datadir}/applications/*.desktop
|
||||||
%{_datadir}/bash-completion/completions/gnome-control-center
|
%{_datadir}/bash-completion/completions/gnome-control-center
|
||||||
%{_datadir}/dbus-1/services/org.gnome.Settings.service
|
%{_datadir}/dbus-1/services/org.gnome.Settings.service
|
||||||
@ -244,8 +252,9 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
|||||||
%{_datadir}/icons/gnome-logo-text-dark.svg
|
%{_datadir}/icons/gnome-logo-text-dark.svg
|
||||||
%{_datadir}/icons/gnome-logo-text.svg
|
%{_datadir}/icons/gnome-logo-text.svg
|
||||||
%{_datadir}/locale/en/
|
%{_datadir}/locale/en/
|
||||||
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
|
|
||||||
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
|
||||||
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-session-helper.policy
|
||||||
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.system.policy
|
||||||
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
|
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
|
||||||
# We do not package gnome-control-center.rules
|
# We do not package gnome-control-center.rules
|
||||||
#{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
#{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
||||||
@ -253,8 +262,6 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
|||||||
%dir %{_datadir}/sounds/gnome/default
|
%dir %{_datadir}/sounds/gnome/default
|
||||||
%dir %{_datadir}/sounds/gnome/default/alerts
|
%dir %{_datadir}/sounds/gnome/default/alerts
|
||||||
%{_datadir}/sounds/gnome/default/alerts/*.ogg
|
%{_datadir}/sounds/gnome/default/alerts/*.ogg
|
||||||
%{_libexecdir}/cc-remote-login-helper
|
|
||||||
%{_libexecdir}/gnome-control-center-goa-helper
|
|
||||||
%{_libexecdir}/gnome-control-center-print-renderer
|
%{_libexecdir}/gnome-control-center-print-renderer
|
||||||
%{_libexecdir}/gnome-control-center-search-provider
|
%{_libexecdir}/gnome-control-center-search-provider
|
||||||
%{_mandir}/man1/gnome-control-center.1%{?ext_man}
|
%{_mandir}/man1/gnome-control-center.1%{?ext_man}
|
||||||
@ -268,6 +275,9 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
|
|||||||
%files goa
|
%files goa
|
||||||
%{_datadir}/applications/gnome-online-accounts-panel.desktop
|
%{_datadir}/applications/gnome-online-accounts-panel.desktop
|
||||||
|
|
||||||
|
%files users
|
||||||
|
%{_datadir}/applications/gnome-users-panel.desktop
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc gnome-control-center.doap
|
%doc gnome-control-center.doap
|
||||||
%{_datadir}/pkgconfig/gnome-keybindings.pc
|
%{_datadir}/pkgconfig/gnome-keybindings.pc
|
||||||
|
Loading…
Reference in New Issue
Block a user