Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-control-center.17153 for
openSUSE:Leap:15.2:Update checked in at 2021-11-09 14:21:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2:Update/gnome-control-center.17153 (Old)
and
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-control-center.17153.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center.17153"
Tue Nov 9 14:21:28 2021 rev:1 rq:930358 version:3.34.6
Changes:
--------
New Changes file:
--- /dev/null 2021-10-14 08:13:55.193858881 +0200
+++
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-control-center.17153.new.1890/gnome-control-center.changes
2021-11-09 14:21:40.763320411 +0100
@@ -0,0 +1,7527 @@
+-------------------------------------------------------------------
+Sun Sep 26 07:09:41 UTC 2021 - Jonathan Kang <[email protected]>
+
+- Bring back gnome-control-center-disable-error-message-for-NM.patch
+ and rebase it against latest code base(bsc#1190875).
+
+-------------------------------------------------------------------
+Wed May 13 20:08:38 UTC 2020 - Michael Gorse <[email protected]>
+
+- Update to version 3.34.6:
+ + Sound: fix translation of "System Sounds".
+
+-------------------------------------------------------------------
+Mon Mar 30 08:25:48 UTC 2020 - Bj??rn Lie <[email protected]>
+
+- Update to version 3.34.5:
+ + Remove some dead code.
+ + Display: Fix resolution options getting stuck in a low
+ resolution (bsc#1160173 glgo#GNOME/Settings#903).
+ + Network:
+ - Print warning if failed to save to libsecret.
+ - Handle security combo box being not selected correctly.
+ - Fix small memory leaks.
+ + Sharing: Fix small memory leak.
+ + User Accounts:
+ - Fix uninitialized variable.
+ - Fix small memory leak.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Thu Feb 13 22:43:51 UTC 2020 - Bj??rn Lie <[email protected]>
+
+- Update to version 3.34.4:
+ + Thunderbolt: Fix memory leak.
+ + Printers: Fix read of freed memory.
+ + User Accounts:
+ - Use absolute path of command usermod.
+ - Fix carousel arrow location when animations are disabled.
+ - Fix memory leak.
+ - Fix uninitialized variable.
+ + Region & Language: Fix LC_* variables not being correctly
+ reset.
+ + Sound: Add missing subwoofer icons.
+ + Updated translations.
+- Drop gnome-control-center-can-not-find-usermod.patch: Fixed
+ upstream.
+
+-------------------------------------------------------------------
+Fri Jan 10 18:56:00 UTC 2020 - Bj??rn Lie <[email protected]>
+
+- No longer recommend gnome-control-center-lang: the lang package
+ has relevant supplements which pulls it in whenever needed.
+- Move /usr/share/locale/en from the -lang package to the main
+ package: English is installed on all systems. This avoids
+ gnome-control-center-lang being triggered for installation on
+ english-only systems.
+
+-------------------------------------------------------------------
+Thu Jan 9 20:24:39 UTC 2020 - Michael Gorse <[email protected]>
+
+- Add gnome-control-center-fno-common.patch: fix build with
+ -fno-common (boo#1160393 glgo#GNOME/gnome-control-center!681).
+
+-------------------------------------------------------------------
+Thu Dec 12 02:25:20 UTC 2019 - Xiaoguang Wang <[email protected]>
+
+- Add gnome-control-center-Initialize-GError-to-NULL-before-use.patch:
+ backport upstream commit 54caab7b, initialize GError* to NULL
+ before use, fix g-c-c crash.
+
+-------------------------------------------------------------------
+Fri Dec 6 09:21:09 UTC 2019 - QK ZHU <[email protected]>
+
+- Rebase gnome-control-center-more-power-button-actions.patch for 3.34:
+ Rename 'Shutdown' to 'Force Off' and adjust the order by severity
+ (bsc#1091796, bsc#1158476).
+
+-------------------------------------------------------------------
+Thu Dec 5 01:45:59 UTC 2019 - Xiaoguang Wang <[email protected]>
+
+- Add gnome-control-center-can-not-find-usermod.patch:
+ g-c-c use command usermod to verify user is valid, usermod is in
+ /usr/sbin, environment PATH doesn't include this path, so g-c-c
+ can't find this command. Upstream commit c6be204
+ (bsc#1158341 glgo#GNOME/gnome-control-center!653).
+
+-------------------------------------------------------------------
+Mon Nov 25 15:22:25 UTC 2019 - Bj??rn Lie <[email protected]>
+
+- Update to version 3.34.2:
+ + Applications: Fix a memory leak.
+ + Background: Fix crash if a BgRecentSource is unreffed during an
+ async operation.
+ + Display: Use correct mode for supported scale checking.
+ + Printer: Provide a scheme to address parser.
+ + User Accounts: Fix password dialog crashes and hangs.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Nov 19 08:19:16 UTC 2019 - Alynx Zhou <[email protected]>
+
+- Drop patches fixed upstream:
+ + control-center-fix-crash-due-to-object-name-clashes.patch
+ + control-center-fix-crash-opening-hidden-network.patch
+ + control-center-sharing-fix-margin-issue.patch
+ + gnome-control-center-fix-users-crash.patch
+ + gnome-control-center-periodic-wifi-scan.patch
+ + gnome-control-center-users-empty-state.patch
+
+-------------------------------------------------------------------
+Fri Nov 15 04:40:33 UTC 2019 - Alynx Zhou <[email protected]>
+
+- Rebase gnome-control-center-bring-back-firewall-zone.patch
+
+-------------------------------------------------------------------
+Thu Nov 14 08:15:55 UTC 2019 - Yifan Jiang <[email protected]>
+
+- BuildRequires /usr/bin/Xvfb instead of the xorg-x11-server-Xvfb
+ package. This is for the compatibility with older X packages where
+ Xvfb is not splitted.
+
+-------------------------------------------------------------------
+Sat Oct 5 14:34:11 UTC 2019 - Bj??rn Lie <[email protected]>
+
+- Update to version 3.34.1:
+ + Background:
+ - Allow load background file relative to XML file.
+ - Update clock in both preview modes.
+ + Date & Time: Allow changing the timezone when auto-update is
+ prohibited.
+ + Network:
+ - Disable the "Apply" button until a change has been made.
+ - Fix Add Connection dialog.
+ - Accept empty values for the cloned mac address.
+ + Online Accounts: Fix a crash.
+ + Printers:
+ - Give printer name fewer characters in width.
+ - Check whether URI is valid while searching for printers.
+ + Region & Language: Fix crash in keyboard layout population.
+ + Search: Fix crash on clicking 'Search Locations'.
+ + Sharing: Set new shared folder visible as soon as it gets
+ added.
+ + Sound: Remove leftover canberra-gtk header inclusion.
+ + Updated translations.
+- Drop patches fixed upstream:
+ + gnome-control-center-Remove-leftover-canberra-gtk.patch.
+ + control-center-network-fix-ce-apply-button.patch.
+
+-------------------------------------------------------------------
+Sat Sep 21 09:38:32 UTC 2019 - Bj??rn Lie <[email protected]>
+
+- Add gnome-control-center-Remove-leftover-canberra-gtk.patch:
+ sound: Remove leftover canberra-gtk header inclusion. Following
+ this, drop pkgconfig(libcanberra-gtk3) BuildRequires: No longer
+ needed, nor used.
+- Add explicit xorg-x11-server-Xvfb BuildRequires: Previously
+ pulled in by libcanberra-gtk3. Needed for tests to succeed.
+
+-------------------------------------------------------------------
+Mon Sep 9 14:46:21 CDT 2019 - [email protected]
+
+- Update to version 3.34.0.1:
+ + Sound: fix sliders not behaving properly.
+ + Changes in version 3.34.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep 4 15:28:03 NZST 2019 - [email protected]
+
+- Update to version 3.33.90:
+ + Background: Clarify remove background button.
+ + Display: Various bugfixes.
+ + Search:
+ - Introduce Drag n' Drop
+ - Visual polishment.
+ + Updated translations.
+- Changes from version 3.33.3:
+ + Various minor improvements from the Every Detail Matters
+ session.
+ + Add shadows to application icons
+ + Documented Communication Guidelines
+ + Development builds with Flatpak working again
+ + Background: Redesigned panel.
+ + Display: Move Night Light to a tab, instead of a dialog.
+ + Keyboard Shortcuts:
+ - Panel renamed from "Keyboard".
+ - Minor UI adjustments.
+ + Mouse & Touchpad: Reinstate keyboard navitation.
+ + Power: Don't treat all batteries as laptop batteries.
+ + Sharing: Use a HdyLeaflet.
+ + User Accounts: Present the default avatar in the avatar
+ popover.
+ + Wacom: Ensure calibrator UI CSS only applies to its UI.
+ + Updated translations.
+- Remove control-center-fix-mtu-label.patch
+- Remove control-center-network-add-domain-suffix-match.patch
+- Remove gnome-control-center-disable-error-message-for-NM.patch
++++ 7330 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Leap:15.2:Update/.gnome-control-center.17153.new.1890/gnome-control-center.changes
New:
----
_service
gnome-control-center-3.34.6.obscpio
gnome-control-center-Initialize-GError-to-NULL-before-use.patch
gnome-control-center-bring-back-firewall-zone.patch
gnome-control-center-disable-error-message-for-NM.patch
gnome-control-center-fno-common.patch
gnome-control-center-info-never-use-gnome-software.patch
gnome-control-center-more-power-button-actions.patch
gnome-control-center.changes
gnome-control-center.obsinfo
gnome-control-center.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
#
# spec file for package gnome-control-center
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Allow to enable/disable ibus, as GNOME is rather strict on new versions.
%bcond_without ibus
# Wacom input support
%ifarch s390 s390x
%bcond_with wacom
%else
%bcond_without wacom
%endif
Name: gnome-control-center
Version: 3.34.6
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
Source0: %{name}-%{version}.tar.xz
# 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
Patch0: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-UPSTREAM
gnome-control-center-Initialize-GError-to-NULL-before-use.patch [email protected]
-- user-accounts: Initialize GError* to NULL before use
Patch1: gnome-control-center-Initialize-GError-to-NULL-before-use.patch
# PATCH-FIX-UPSTREAM gnome-control-center-fno-common.patch boo#1160393
[email protected] -- fix build with -fno-common.
Patch2: gnome-control-center-fno-common.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 [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.
Patch1001: gnome-control-center-info-never-use-gnome-software.patch
# PATCH-FEATURE-SLE gnome-control-center-more-power-button-actions.patch
bsc#993381 [email protected] -- power: Bring back the "shutdown" and
"interactive" power button actions.
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
BuildRequires: /usr/bin/Xvfb
BuildRequires: cups-devel >= 1.4
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: krb5-devel
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: python3-dbusmock
BuildRequires: python3-pytest-xvfb
BuildRequires: translation-update-upstream
BuildRequires: xsltproc
BuildRequires: pkgconfig(accountsservice) >= 0.6.39
BuildRequires: pkgconfig(cairo-gobject)
BuildRequires: pkgconfig(cheese) >= 3.28.0
BuildRequires: pkgconfig(cheese-gtk) >= 3.5.91
BuildRequires: pkgconfig(colord) >= 0.1.34
BuildRequires: pkgconfig(colord-gtk) >= 0.1.24
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.23.0
BuildRequires: pkgconfig(gdk-wayland-3.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0) >= 2.53.0
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.27.90
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90
BuildRequires: pkgconfig(goa-1.0) >= 3.25.3
BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(grilo-0.3) >= 0.3.0
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.31.0
BuildRequires: pkgconfig(gsound)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libhandy-0.0) >= 0.0.9
BuildRequires: pkgconfig(libnm) >= 1.10.0
BuildRequires: pkgconfig(libnma) >= 1.8.0
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib) >= 0.7
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(pwquality) >= 1.2.2
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(udisks2)
BuildRequires: pkgconfig(upower-glib) >= 0.99.6
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xft)
BuildRequires: pkgconfig(xi) >= 1.2
Requires: gnome-settings-daemon
# needed for universal access panel
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
# For the thunderbolt panel
Recommends: bolt
Recommends: %{name}-user-faces
# cups-pk-helper should only be recommended, rather than a hard Requires, see
boo#904047
Recommends: cups-pk-helper
Recommends: dbus(com.intel.dleyna-server)
# the printers panel can use the dbus service
Recommends: system-config-printer-dbus-service
Provides: acme
Provides: fontilus
Provides: themus
Obsoletes: acme
Obsoletes: fontilus
Obsoletes: themus
Provides: control-center2 = 2.22.1
Obsoletes: control-center2 < 2.22.1
# gnome-control-center-branding was obsoleted with g-c-c 3.8.0 (after openSUSE
12.3)
Obsoletes: gnome-control-center-branding <= 12.3
Obsoletes: gnome-control-center-branding-openSUSE <= 12.3
Obsoletes: gnome-control-center-branding-upstream <= 12.3
%if %{with wacom}
BuildRequires: pkgconfig(clutter-1.0) >= 1.11.3
BuildRequires: pkgconfig(libwacom) >= 0.7
%endif
%if %{with ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2
%endif
%description
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package user-faces
Summary: Login manager user avatars
Group: System/GUI/GNOME
%description user-faces
This package provides user avatars to be used by display managers
%package devel
Summary: Header files for the GNOME Control Center
Group: Development/Libraries/GNOME
Requires: %{name} = %{version}
Provides: control-center2-devel = 2.22.1
Obsoletes: control-center2-devel < 2.22.1
%description devel
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package color
Summary: Configuration panel for color management
Group: System/GUI/GNOME
Requires: %{name} = %{version}
# The color panel requires colord to be present for the glib schema
Requires: colord
# The color panel interacts with binaries from gnome-color-manager
Requires: gnome-color-manager
Supplements: %{name}
%description color
This package provides the color management configuration panel for
GNOME control center.
%package goa
Summary: Configuration panel for online accounts
Group: System/GUI/GNOME
Requires: %{name} = %{version}
# The online accounts panel interacts with binaries and icons from
gnome-online-accounts
Requires: gnome-online-accounts
Supplements: packageand(%{name}:gnome-online-accounts)
%description goa
This package provides the online accounts onfiguration panel for
GNOME control center.
%lang_package
%prep
%setup -q
translation-update-upstream po gnome-control-center-2.0
%patch0 -p1
%patch1 -p1
%patch2 -p1
# patches for Leap >= 15 plus SLE >= 15, but not TW
%if 0%{?sle_version} >= 150000
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%endif
%build
%meson \
-Dcheese=true \
-Ddocumentation=true \
%{!?with_ibus: -Dibus=false} \
%{nil}
%meson_build
%check
%meson_test
%install
%meson_install
%find_lang %{name}-2.0 %{?no_lang_C}
%find_lang %{name}-2.0-timezones %{name}-2.0.lang
%fdupes %{buildroot}/%{_prefix}
# We do not package gnome-control-center.rules (bnc#804966)
rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%files
%license COPYING
%doc NEWS README.md
%{_bindir}/*
%{_datadir}/metainfo/gnome-control-center.appdata.xml
%exclude %{_datadir}/applications/gnome-color-panel.desktop
%exclude %{_datadir}/applications/gnome-online-accounts-panel.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/bash-completion/completions/gnome-control-center
%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml
%{_datadir}/gnome-control-center/
%dir %{_datadir}/gnome-shell/
%dir %{_datadir}/gnome-shell/search-providers/
%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/*/*/*.svg
%{_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.user-accounts.policy
# We do not package gnome-control-center.rules
#{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%dir %{_datadir}/sounds/gnome
%dir %{_datadir}/sounds/gnome/default
%dir %{_datadir}/sounds/gnome/default/alerts
%{_datadir}/sounds/gnome/default/alerts/*.ogg
%{_libexecdir}/cc-remote-login-helper
%{_libexecdir}/gnome-control-center-search-provider
%{_mandir}/man1/gnome-control-center.1%{?ext_man}
%files user-faces
%{_datadir}/pixmaps/faces/
%files color
%{_datadir}/applications/gnome-color-panel.desktop
%files goa
%{_datadir}/applications/gnome-online-accounts-panel.desktop
%files devel
%doc gnome-control-center.doap
%{_datadir}/pkgconfig/gnome-keybindings.pc
%{_datadir}/gettext/its/gnome-keybindings.its
%{_datadir}/gettext/its/gnome-keybindings.loc
%{_datadir}/gettext/its/sounds.its
%{_datadir}/gettext/its/sounds.loc
%files lang -f %{name}-2.0.lang
# english locale should be in the main package
%exclude %{_datadir}/locale/en
%changelog
++++++ _service ++++++
<services>
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://gitlab.gnome.org/GNOME/gnome-control-center.git</param>
<param name="revision">refs/tags/3.34.6</param>
<param name="versionformat">@PARENT_TAG@</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled" />
</services>
++++++ gnome-control-center-Initialize-GError-to-NULL-before-use.patch ++++++
>From 54caab7b0762b553e1e6663f416474fce77e4c51 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <[email protected]>
Date: Thu, 29 Aug 2019 11:58:02 +0800
Subject: [PATCH] user-accounts: Initialize GError* to NULL before use
Otherwise, it causes warnings to be shown on the terminal when it is
used and quickly leads to a crash.
---
panels/user-accounts/user-utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/user-accounts/user-utils.c
b/panels/user-accounts/user-utils.c
index dfd3a2949..72401e40b 100644
--- a/panels/user-accounts/user-utils.c
+++ b/panels/user-accounts/user-utils.c
@@ -458,7 +458,7 @@ is_valid_username_async (const gchar *username,
isValidUsernameData *data;
gchar *argv[6];
GPid pid;
- GError *error;
+ GError *error = NULL;
task = g_task_new (NULL, cancellable, callback, callback_data);
g_task_set_source_tag (task, is_valid_username_async);
--
2.16.4
++++++ gnome-control-center-bring-back-firewall-zone.patch ++++++
>From 1614c8ba1e288242b1eafd96a1669b6fb59ded70 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <[email protected]>
Date: Tue, 24 Oct 2017 16:46:51 +0800
Subject: [PATCH] Revert "network: Remove support for firewalld zones"
This reverts commit b36924567e16839fbdc8796b975970e214719d81.
---
panels/network/connection-editor/Makefile.am | 2 +
.../network/connection-editor/ce-page-ethernet.c | 11 ++
.../network/connection-editor/ce-page-security.c | 14 +++
.../network/connection-editor/ce-page-security.h | 2 +
panels/network/connection-editor/ce-page-vpn.c | 11 ++
panels/network/connection-editor/ethernet-page.ui | 30 +++++
.../network/connection-editor/firewall-helpers.c | 125 +++++++++++++++++++++
.../network/connection-editor/firewall-helpers.h | 33 ++++++
panels/network/connection-editor/security-page.ui | 32 ++++++
panels/network/connection-editor/vpn-page.ui | 39 +++++++
10 files changed, 299 insertions(+)
Index: gnome-control-center-3.34.1/panels/network/connection-editor/meson.build
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/meson.build
+++ gnome-control-center-3.34.1/panels/network/connection-editor/meson.build
@@ -10,6 +10,7 @@ sources = files(
'ce-page-vpn.c',
'ce-page-wifi.c',
'ce-page.c',
+ 'firewall-helpers.c',
'net-connection-editor.c',
'ui-helpers.c',
'vpn-helpers.c'
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-ethernet.c
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-ethernet.c
+++
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-ethernet.c
@@ -28,6 +28,7 @@
#include <NetworkManager.h>
+#include "firewall-helpers.h"
#include "ce-page-ethernet.h"
#include "ui-helpers.h"
@@ -46,9 +47,12 @@ static void
connect_ethernet_page (CEPageEthernet *page)
{
NMSettingWired *setting = page->setting_wired;
+ NMSettingConnection *sc;
int mtu_def;
char **mac_list;
const char *s_mac_str;
+ GtkWidget *widget;
+ GtkWidget *heading;
const gchar *name;
const gchar *cloned_mac;
@@ -80,6 +84,12 @@ connect_ethernet_page (CEPageEthernet *p
g_signal_connect_swapped (page->name, "changed", G_CALLBACK
(ce_page_changed), page);
g_signal_connect_swapped (page->mtu, "value-changed", G_CALLBACK
(ce_page_changed), page);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_zone"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_zone"));
+ sc = nm_connection_get_setting_connection (CE_PAGE (page)->connection);
+ firewall_ui_setup (sc, widget, heading, CE_PAGE (page)->cancellable);
+ g_signal_connect_swapped (widget, "changed", G_CALLBACK
(ce_page_changed), page);
}
static void
@@ -110,6 +120,9 @@ ui_to_setting (CEPageEthernet *page)
NM_SETTING_CONNECTION_ID, gtk_entry_get_text
(page->name),
NULL);
+ entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_zone"));
+ firewall_ui_to_setting (page->setting_connection, entry);
+
g_free (cloned_mac);
g_free (device_mac);
}
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.c
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-security.c
+++
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.c
@@ -28,6 +28,7 @@
#include "wireless-security.h"
#include "ce-page-security.h"
+#include "firewall-helpers.h"
G_DEFINE_TYPE (CEPageSecurity, ce_page_security, CE_TYPE_PAGE)
@@ -147,6 +148,7 @@ security_combo_changed (GtkComboBox *com
gtk_container_remove (GTK_CONTAINER (parent),
sec_widget);
gtk_size_group_add_widget (page->group,
page->security_heading);
+ gtk_size_group_add_widget (page->group,
page->firewall_heading);
wireless_security_add_to_size_group (sec, page->group);
gtk_container_add (GTK_CONTAINER (vbox), sec_widget);
@@ -203,6 +205,7 @@ finish_setup (CEPageSecurity *page)
NMConnection *connection = CE_PAGE (page)->connection;
NMSettingWireless *sw;
NMSettingWirelessSecurity *sws;
+ NMSettingConnection *sc;
gboolean is_adhoc = FALSE;
GtkListStore *sec_model;
GtkTreeIter iter;
@@ -349,6 +352,13 @@ finish_setup (CEPageSecurity *page)
page->security_combo = combo;
+ page->firewall_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE
(page)->builder, "heading_zone"));
+ page->firewall_combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE
(page)->builder, "combo_zone"));
+
+ sc = nm_connection_get_setting_connection (CE_PAGE (page)->connection);
+ firewall_ui_setup (sc, GTK_WIDGET (page->firewall_combo),
page->firewall_heading, CE_PAGE (page)->cancellable);
+ g_signal_connect_swapped (page->firewall_combo, "changed", G_CALLBACK
(ce_page_changed), page);
+
security_combo_changed (combo, page);
g_signal_connect (combo, "changed",
G_CALLBACK (security_combo_changed), page);
@@ -360,6 +370,7 @@ validate (CEPage *page,
GError **error)
{
NMSettingWireless *sw;
+ NMSettingConnection *sc;
WirelessSecurity *sec;
gboolean valid = FALSE;
const char *mode;
@@ -402,6 +413,9 @@ validate (CEPage *page,
valid = TRUE;
}
+ sc = nm_connection_get_setting_connection (connection);
+ firewall_ui_to_setting (sc, GTK_WIDGET (CE_PAGE_SECURITY
(page)->firewall_combo));
+
return valid;
}
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.h
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-security.h
+++
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-security.h
@@ -45,6 +45,8 @@ struct _CEPageSecurity
GtkComboBox *security_combo;
GtkWidget *security_heading;
+ GtkComboBox *firewall_combo;
+ GtkWidget *firewall_heading;
GtkSizeGroup *group;
gboolean adhoc;
};
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-vpn.c
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ce-page-vpn.c
+++ gnome-control-center-3.34.1/panels/network/connection-editor/ce-page-vpn.c
@@ -28,6 +28,7 @@
#include "ce-page-vpn.h"
#include "vpn-helpers.h"
+#include "firewall-helpers.h"
G_DEFINE_TYPE (CEPageVpn, ce_page_vpn, CE_TYPE_PAGE)
@@ -106,10 +107,17 @@ static void
connect_vpn_page (CEPageVpn *page)
{
const gchar *name;
+ GtkWidget *widget;
+ GtkWidget *heading;
name = nm_setting_connection_get_id (page->setting_connection);
gtk_entry_set_text (page->name, name);
g_signal_connect_swapped (page->name, "changed", G_CALLBACK
(ce_page_changed), page);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_zone"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_zone"));
+ firewall_ui_setup (page->setting_connection, widget, heading, CE_PAGE
(page)->cancellable);
+ g_signal_connect_swapped (widget, "changed", G_CALLBACK
(ce_page_changed), page);
}
static gboolean
@@ -118,10 +126,13 @@ validate (CEPage *page,
GError **error)
{
CEPageVpn *self = CE_PAGE_VPN (page);
+ GtkWidget *widget;
g_object_set (self->setting_connection,
NM_SETTING_CONNECTION_ID, gtk_entry_get_text
(self->name),
NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_zone"));
+ firewall_ui_to_setting (self->setting_connection, widget);
if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL,
error))
return FALSE;
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/ethernet-page.ui
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/ethernet-page.ui
+++
gnome-control-center-3.34.1/panels/network/connection-editor/ethernet-page.ui
@@ -219,5 +219,35 @@
<child>
<placeholder/>
</child>
+ <child>
+ <object class="GtkLabel" id="heading_zone">
+ <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">combo_zone</property>
+ </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="combo_zone">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
</interface>
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.c
===================================================================
--- /dev/null
+++
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.c
@@ -0,0 +1,125 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2013 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+
+#include "firewall-helpers.h"
+
+typedef struct {
+ gchar *zone;
+ GtkWidget *combo;
+ GtkWidget *label;
+} GetZonesReplyData;
+
+static void
+get_zones_reply (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GDBusConnection *bus = G_DBUS_CONNECTION (source);
+ GetZonesReplyData *d = user_data;
+ GVariant *ret;
+ GError *error = NULL;
+ const gchar **zones;
+ gint idx;
+ gint i;
+
+ ret = g_dbus_connection_call_finish (bus, res, &error);
+
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (d->combo),
+ C_("Firewall zone", "Default"));
+ gtk_widget_set_tooltip_text (d->combo, _("The zone defines the trust
level of the connection"));
+
+ idx = 0;
+ if (error) {
+ gtk_widget_hide (d->combo);
+ gtk_widget_hide (d->label);
+ g_error_free (error);
+ }
+ else {
+ gtk_widget_show (d->combo);
+ gtk_widget_show (d->label);
+ g_variant_get (ret, "(^a&s)", &zones);
+
+ for (i = 0; zones[i]; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT
(d->combo),
+ zones[i]);
+ if (g_strcmp0 (d->zone, zones[i]) == 0)
+ idx = i + 1;
+ }
+ if (d->zone && idx == 0) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT
(d->combo),
+ d->zone);
+ idx = i + 1;
+ }
+ g_variant_unref (ret);
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX (d->combo), idx);
+
+ g_free (d->zone);
+ g_free (d);
+}
+
+void
+firewall_ui_setup (NMSettingConnection *setting,
+ GtkWidget *combo,
+ GtkWidget *label,
+ GCancellable *cancellable)
+{
+ GDBusConnection *bus;
+ GetZonesReplyData *d;
+
+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+
+ d = g_new0 (GetZonesReplyData, 1);
+ d->zone = g_strdup (nm_setting_connection_get_zone (setting));
+ d->combo = combo;
+ d->label = label;
+
+ g_dbus_connection_call (bus,
+ "org.fedoraproject.FirewallD1",
+ "/org/fedoraproject/FirewallD1",
+ "org.fedoraproject.FirewallD1.zone",
+ "getZones",
+ NULL,
+ NULL,
+ 0,
+ G_MAXINT,
+ cancellable,
+ get_zones_reply, d);
+ g_object_unref (bus);
+}
+
+void
+firewall_ui_to_setting (NMSettingConnection *setting, GtkWidget *combo)
+{
+ gchar *zone;
+
+ zone = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo));
+ if (g_strcmp0 (zone, C_("Firewall zone", "Default")) == 0) {
+ g_free (zone);
+ zone = NULL;
+ }
+
+ g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
+ g_free (zone);
+}
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.h
===================================================================
--- /dev/null
+++
gnome-control-center-3.34.1/panels/network/connection-editor/firewall-helpers.h
@@ -0,0 +1,33 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2013 Red Hat, Inc.
+ */
+
+#ifndef _FIREWALL_HELPERS_H_
+#define _FIREWALL_HELPERS_H_
+
+#include <NetworkManager.h>
+#include <gtk/gtk.h>
+
+void firewall_ui_setup (NMSettingConnection *setting,
+ GtkWidget *combo,
+ GtkWidget *label,
+ GCancellable *cancellable);
+void firewall_ui_to_setting (NMSettingConnection *setting,
+ GtkWidget *combo);
+
+
+#endif /* _FIREWALL_HELPERS_H_ */
Index:
gnome-control-center-3.34.1/panels/network/connection-editor/security-page.ui
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/security-page.ui
+++
gnome-control-center-3.34.1/panels/network/connection-editor/security-page.ui
@@ -63,6 +63,38 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="heading_zone">
+ <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">combo_zone</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="combo_zone">
+ <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>
+
</object>
</child>
<child type="tab">
Index: gnome-control-center-3.34.1/panels/network/connection-editor/vpn-page.ui
===================================================================
---
gnome-control-center-3.34.1.orig/panels/network/connection-editor/vpn-page.ui
+++ gnome-control-center-3.34.1/panels/network/connection-editor/vpn-page.ui
@@ -51,6 +51,45 @@
</packing>
</child>
<child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="heading_zone">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Firewall _Zone</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combo_zone</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="combo_zone">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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>
<object class="GtkLabel" id="failure_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++
>From 31925b7c112b0f1accdff91406f0d4590dc316be Mon Sep 17 00:00:00 2001
From: Jonathan Kang <[email protected]>
Date: Fri, 8 Oct 2021 13:24:19 +0800
Subject: [PATCH] add error messages when wicked is used as network manager
---
panels/network/cc-network-panel.c | 34 ++++++++++++++++++++++++-
panels/network/cc-wifi-panel.c | 22 +++++++++++++++-
panels/network/cc-wifi-panel.ui | 42 +++++++++++++++++++++++++++++++
tests/meson.build | 3 +++
4 files changed, 99 insertions(+), 2 deletions(-)
diff --git a/panels/network/cc-network-panel.c
b/panels/network/cc-network-panel.c
index 54e46814c..7c965e49b 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -775,10 +775,24 @@ panel_check_network_manager_version (CcNetworkPanel
*panel)
GtkWidget *label;
gchar *markup;
const gchar *version;
+ const gchar *state;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+
"/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
/* parse running version */
version = nm_client_get_version (panel->client);
- if (version == NULL) {
+ if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child
(GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@@ -801,9 +815,27 @@ panel_check_network_manager_version (CcNetworkPanel *panel)
gtk_widget_show_all (box);
g_free (markup);
+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
+ gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child
(GTK_BIN (panel)));
+
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
+ gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
+ gtk_widget_set_vexpand (box, TRUE);
+ gtk_container_add (GTK_CONTAINER (panel), box);
+
+ label = gtk_label_new (_("Please use YaST2 to configure your
network."));
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+
+ gtk_widget_show_all (box);
} else {
manager_running (panel->client, NULL, panel);
}
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 3dec9a85f..2a6fd49b8 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -186,21 +186,41 @@ static void
check_main_stack_page (CcWifiPanel *self)
{
const gchar *nm_version;
+ const gchar *state;
gboolean airplane_mode_active;
gboolean wireless_enabled;
+ GDBusConnection *connection;
+ GDBusProxy *proxy;
+ GVariant *variant;
+
+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+ proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+
"/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+ "org.freedesktop.systemd1.Unit",
+ NULL, NULL);
+ variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+ state = g_variant_get_string (variant, NULL);
nm_version = nm_client_get_version (self->client);
wireless_enabled = nm_client_wireless_get_enabled (self->client);
airplane_mode_active = gtk_switch_get_active (self->rfkill_switch);
- if (!nm_version)
+ if (!nm_version && g_strcmp0 (state, "inactive") == 0)
gtk_stack_set_visible_child_name (self->main_stack, "nm-not-running");
+ else if (!nm_version && g_strcmp0 (state, "active") == 0)
+ gtk_stack_set_visible_child_name (self->main_stack, "wicked-running");
else if (!wireless_enabled && airplane_mode_active)
gtk_stack_set_visible_child_name (self->main_stack, "airplane-mode");
else if (!wireless_enabled || self->devices->len == 0)
gtk_stack_set_visible_child_name (self->main_stack, "no-wifi-devices");
else
gtk_stack_set_visible_child_name (self->main_stack, "wifi-connections");
+
+ g_object_unref (connection);
+ g_object_unref (proxy);
+ g_variant_unref (variant);
}
static void
diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
index 8b86098ac..947b11f49 100644
--- a/panels/network/cc-wifi-panel.ui
+++ b/panels/network/cc-wifi-panel.ui
@@ -317,6 +317,48 @@
<property name="name">nm-not-running</property>
</packing>
</child>
+
+ <!-- "Wicked Running" page -->
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="expand">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="margin">18</property>
+ <property name="spacing">18</property>
+ <child type="center">
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="icon_name">face-sad-symbolic</property>
+ <property name="pixel_size">128</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="label" translatable="yes">Please
use YaST2 to configure your network.</property>
+ <attributes>
+ <attribute name="scale" value="1.42" />
+ </attributes>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="name">wicked-running</property>
+ </packing>
+ </child>
</object>
</child>
diff --git a/tests/meson.build b/tests/meson.build
index d4fe361ef..da3bd104d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,8 +1,11 @@
subdir('common')
#subdir('datetime')
+# Disable tests for network panel, boo#1128195
+if false
if host_is_linux
subdir('network')
endif
+endif
subdir('interactive-panels')
--
2.31.1
++++++ gnome-control-center-fno-common.patch ++++++
>From 92b50d6037ff4d6ccd888beb5b01b55c50bc33ed Mon Sep 17 00:00:00 2001
From: Mike Gorse <[email protected]>
Date: Thu, 9 Jan 2020 14:11:40 -0600
Subject: [PATCH] Thunderbolt: make BoltError enum a typedef
Fixes error when compiled with -fno-common
---
panels/thunderbolt/bolt-error.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h
index 39b3eee98..7d3823d35 100644
--- a/panels/thunderbolt/bolt-error.h
+++ b/panels/thunderbolt/bolt-error.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
*
* Error codes used inside Bolt.
*/
-enum {
+typedef enum {
BOLT_ERROR_FAILED = 0,
BOLT_ERROR_UDEV,
BOLT_ERROR_NOKEY,
--
2.24.1
++++++ gnome-control-center-info-never-use-gnome-software.patch ++++++
diff --git a/panels/info/cc-info-overview-panel.c
b/panels/info/cc-info-overview-panel.c
index 7a5879c..7b6c27b 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -829,7 +829,8 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel
*self)
static gboolean
does_gnome_software_exist (void)
{
- return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
+ /* no gnome-software for SLE */
+ return FALSE;
}
static gboolean
++++++ gnome-control-center-more-power-button-actions.patch ++++++
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index c31249c..5718c98 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -2169,10 +2169,11 @@ populate_power_button_model (GtkTreeModel *model,
char *name;
GsdPowerButtonActionType value;
} actions[] = {
+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING },
{ N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND },
- { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
{ N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE },
- { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }
+ { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
+ { N_("Force Off"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }
};
guint i;
++++++ gnome-control-center.obsinfo ++++++
name: gnome-control-center
version: 3.34.6
mtime: 1588281285
commit: 88ef6f011cf6c59530976b42e5a064b7bde18af0
