Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2025-03-20 19:23:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Thu Mar 20 19:23:58 2025 rev:261 rq:1254681 version:48.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2025-03-18 17:40:34.363712368 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new.2696/gnome-control-center.changes
2025-03-20 19:24:12.907711101 +0100
@@ -1,0 +2,14 @@
+Thu Mar 20 01:15:04 UTC 2025 - Xiaoguang Wang <[email protected]>
+
+- Drop gnome-control-center-users-page-Don-t-show-the-system-accounts.patch:
+ fixed upstream.
+
+-------------------------------------------------------------------
+Wed Mar 19 03:35:30 UTC 2025 - Jonathan Kang <[email protected]>
+
+- Rebase gnome-control-center-bring-back-firewall-zone.patch
+ (bsc#1239711).
+- Drop gnome-control-center-info-fix-distro-logo.patch: not needed
+ any more.
+
+-------------------------------------------------------------------
Old:
----
gnome-control-center-info-fix-distro-logo.patch
gnome-control-center-users-page-Don-t-show-the-system-accounts.patch
BETA DEBUG BEGIN:
Old: (bsc#1239711).
- Drop gnome-control-center-info-fix-distro-logo.patch: not needed
any more.
Old:
- Drop gnome-control-center-users-page-Don-t-show-the-system-accounts.patch:
fixed upstream.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.QsXXpZ/_old 2025-03-20 19:24:13.723744827 +0100
+++ /var/tmp/diff_new_pack.QsXXpZ/_new 2025-03-20 19:24:13.723744827 +0100
@@ -36,11 +36,8 @@
Source1: libgxdp-0.gitmodule.tar.zst
Source99: %{name}-rpmlintrc
-# PATCH-NEEDS-REBASE Patch1
# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch
bsc#989801 [email protected] -- 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-users-page-Don-t-show-the-system-accounts.patch
bsc#1224199 glgo#GNOME/Settings#3066 [email protected] -- not show system account
in Users panel
-Patch2:
gnome-control-center-users-page-Don-t-show-the-system-accounts.patch
### patches for Leap >= 15 plus SLE >= 15, but not TW
# PATCH-FEATURE-SLE gnome-control-center-system-never-use-gnome-software.patch
bsc#999336 [email protected] -- 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.
@@ -49,8 +46,6 @@
Patch1002: gnome-control-center-more-power-button-actions.patch
# PATCH-FEATURE-SLE gnome-control-center-bring-back-firewall-zone.patch
fate#316719 [email protected] -- 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 [email protected] -- 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
@@ -206,16 +201,11 @@
tar xf %{SOURCE1}
mv libgxdp-0.gitmodule libgxdp
popd
-%patch -P 1 -p1
-%patch -P 2 -p1
+%autopatch -p1 -M 999
# patches for Leap >= 15 plus SLE >= 15, but not TW
%if !0%{?is_opensuse} || 0%{?suse_version} <= 1600
-%patch -P 1001 -p1
-%patch -P 1002 -p1
-%patch -P 1003 -p1
-# patch needs rebase
-# %%patch -P 1004 -p1
+%autopatch -p1 -m 1000
%endif
%build
++++++ gnome-control-center-bring-back-firewall-zone.patch ++++++
--- /var/tmp/diff_new_pack.QsXXpZ/_old 2025-03-20 19:24:13.767746645 +0100
+++ /var/tmp/diff_new_pack.QsXXpZ/_new 2025-03-20 19:24:13.771746810 +0100
@@ -1,6 +1,26 @@
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-ethernet.c
2024-07-30 14:27:24.406647244 -0500
-+++
gnome-control-center-46.3/panels/network/connection-editor/ce-page-ethernet.c
2024-07-30 14:43:34.541519398 -0500
+From 493841c19ca1a006f8e040612918dd0942693566 Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <[email protected]>
+Date: Wed, 19 Mar 2025 10:09:42 +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 | 9 ++
+ .../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, 287 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 e276b0d59..5c1114330 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"
@@ -29,7 +49,7 @@
char **mac_list;
const char *s_mac_str;
const gchar *name;
-@@ -107,6 +112,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);
@@ -49,10 +69,11 @@
}
static const gchar *
-@@ -178,6 +189,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);
@@ -62,11 +83,10 @@
+ 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));
-@@ -186,8 +207,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)
{
@@ -78,7 +98,7 @@
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);
-@@ -195,6 +219,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);
@@ -87,17 +107,18 @@
}
static void
-@@ -213,6 +239,7 @@ ce_page_ethernet_new (NMConnection *
- self = CE_PAGE_ETHERNET (g_object_new (ce_page_ethernet_get_type (),
NULL));
+@@ -213,6 +239,7 @@ ce_page_ethernet_new (NMConnection *connection,
+ self = g_object_new (CE_TYPE_PAGE_ETHERNET, NULL);
self->client = client;
+ self->connection = g_object_ref (connection);
self->setting_connection = nm_connection_get_setting_connection
(connection);
self->setting_wired = nm_connection_get_setting_wired (connection);
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-security.c
2024-07-30 14:27:24.406647244 -0500
-+++
gnome-control-center-46.3/panels/network/connection-editor/ce-page-security.c
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/ce-page-security.c
b/panels/network/connection-editor/ce-page-security.c
+index 273ba8bc9..246be0315 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"
@@ -115,7 +136,7 @@
NMConnection *connection;
const gchar *security_setting;
-@@ -164,6 +167,7 @@ security_combo_changed (CEPageSecurity *
+@@ -164,6 +167,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));
@@ -142,7 +163,7 @@
security_combo_changed (self);
g_signal_connect_object (self->security_combo, "changed",
G_CALLBACK (security_combo_changed), self,
G_CONNECT_SWAPPED);
-@@ -422,6 +431,7 @@ ce_page_security_validate (CEPage
+@@ -422,6 +431,7 @@ ce_page_security_validate (CEPage *page,
{
CEPageSecurity *self = CE_PAGE_SECURITY (page);
NMSettingWireless *sw;
@@ -150,7 +171,7 @@
NMAWs *sec;
gboolean valid = FALSE;
const char *mode;
-@@ -478,6 +488,9 @@ ce_page_security_validate (CEPage
+@@ -478,6 +488,9 @@ ce_page_security_validate (CEPage *page,
}
@@ -160,7 +181,7 @@
return valid;
}
-@@ -500,6 +513,8 @@ ce_page_security_class_init (CEPageSecur
+@@ -500,6 +513,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);
@@ -169,10 +190,19 @@
}
static void
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/ce-page-vpn.c
2024-07-30 14:27:24.406647244 -0500
-+++ gnome-control-center-46.3/panels/network/connection-editor/ce-page-vpn.c
2024-07-30 14:43:34.541519398 -0500
-@@ -36,6 +36,8 @@ struct _CEPageVpn
+diff --git a/panels/network/connection-editor/ce-page-vpn.c
b/panels/network/connection-editor/ce-page-vpn.c
+index 48892b1b4..453d5b897 100644
+--- a/panels/network/connection-editor/ce-page-vpn.c
++++ b/panels/network/connection-editor/ce-page-vpn.c
+@@ -27,6 +27,7 @@
+
+ #include "ce-page.h"
+ #include "ce-page-vpn.h"
++#include "firewall-helpers.h"
+ #include "vpn-helpers.h"
+
+ struct _CEPageVpn
+@@ -36,6 +37,8 @@ struct _CEPageVpn
GtkBox *box;
GtkLabel *failure_label;
GtkEntry *name_entry;
@@ -181,7 +211,7 @@
NMConnection *connection;
NMSettingConnection *setting_connection;
-@@ -124,6 +126,9 @@ connect_vpn_page (CEPageVpn *self)
+@@ -124,6 +127,9 @@ connect_vpn_page (CEPageVpn *self)
name = nm_setting_connection_get_id (self->setting_connection);
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);
@@ -191,7 +221,7 @@
}
static void
-@@ -159,6 +164,7 @@ ce_page_vpn_validate (CEPage *pag
+@@ -159,6 +165,7 @@ ce_page_vpn_validate (CEPage *page,
g_object_set (self->setting_connection,
NM_SETTING_CONNECTION_ID, gtk_editable_get_text
(GTK_EDITABLE (self->name_entry)),
NULL);
@@ -199,7 +229,7 @@
if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL,
error))
return FALSE;
-@@ -188,6 +194,8 @@ ce_page_vpn_class_init (CEPageVpnClass *
+@@ -188,6 +195,8 @@ ce_page_vpn_class_init (CEPageVpnClass *class)
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,
name_entry);
@@ -208,9 +238,10 @@
}
static void
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/ethernet-page.ui
2024-07-30 14:27:24.406647244 -0500
-+++
gnome-control-center-46.3/panels/network/connection-editor/ethernet-page.ui
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/ethernet-page.ui
b/panels/network/connection-editor/ethernet-page.ui
+index 89cdf8f3d..d6c6ad085 100644
+--- a/panels/network/connection-editor/ethernet-page.ui
++++ b/panels/network/connection-editor/ethernet-page.ui
@@ -127,5 +127,31 @@
</child>
</object>
@@ -243,9 +274,11 @@
+ </child>
</template>
</interface>
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.c
1969-12-31 18:00:00.000000000 -0600
-+++
gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.c
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/firewall-helpers.c
b/panels/network/connection-editor/firewall-helpers.c
+new file mode 100644
+index 000000000..2e2c29f5a
+--- /dev/null
++++ 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 -*-
+ *
@@ -372,9 +405,11 @@
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
+ g_free (zone);
+}
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/firewall-helpers.h
1969-12-31 18:00:00.000000000 -0600
-+++
gnome-control-center-46.3/panels/network/connection-editor/firewall-helpers.h
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/firewall-helpers.h
b/panels/network/connection-editor/firewall-helpers.h
+new file mode 100644
+index 000000000..213c515e8
+--- /dev/null
++++ b/panels/network/connection-editor/firewall-helpers.h
@@ -0,0 +1,33 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -409,9 +444,10 @@
+
+
+#endif /* _FIREWALL_HELPERS_H_ */
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/meson.build
2024-07-30 14:27:24.406647244 -0500
-+++ gnome-control-center-46.3/panels/network/connection-editor/meson.build
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/meson.build
b/panels/network/connection-editor/meson.build
+index a9e14f594..73f2e8e59 100644
+--- a/panels/network/connection-editor/meson.build
++++ b/panels/network/connection-editor/meson.build
@@ -14,6 +14,7 @@ sources = files(
'ce-page-wireguard.c',
'ce-page-wifi.c',
@@ -420,9 +456,10 @@
'net-connection-editor.c',
'vpn-helpers.c'
)
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/security-page.ui
2024-07-30 14:27:24.406647244 -0500
-+++
gnome-control-center-46.3/panels/network/connection-editor/security-page.ui
2024-07-30 14:43:34.541519398 -0500
+diff --git a/panels/network/connection-editor/security-page.ui
b/panels/network/connection-editor/security-page.ui
+index affba837b..23c73ef12 100644
+--- a/panels/network/connection-editor/security-page.ui
++++ b/panels/network/connection-editor/security-page.ui
@@ -51,5 +51,32 @@
</child>
</object>
@@ -456,13 +493,15 @@
+ </child>
</template>
</interface>
-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
----
gnome-control-center-46.3.orig/panels/network/connection-editor/vpn-page.ui
2024-07-30 14:27:24.406647244 -0500
-+++ gnome-control-center-46.3/panels/network/connection-editor/vpn-page.ui
2024-07-30 16:41:59.561246367 -0500
-@@ -35,6 +35,30 @@
+diff --git a/panels/network/connection-editor/vpn-page.ui
b/panels/network/connection-editor/vpn-page.ui
+index d087e5e29..614e26582 100644
+--- a/panels/network/connection-editor/vpn-page.ui
++++ b/panels/network/connection-editor/vpn-page.ui
+@@ -34,6 +34,30 @@
+ </child>
</object>
</child>
- <child>
++ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
@@ -486,8 +525,10 @@
+ </child>
+ </object>
+ </child>
-+ <child>
+ <child>
<object class="GtkLabel" id="failure_label">
<property name="xalign">0</property>
- <property name="label" translatable="yes">(Error: unable to
load VPN connection editor)</property>
+--
+2.48.1
+
