diff --git a/gnome-control-center-40.1.tar.xz b/gnome-control-center-40.1.tar.xz deleted file mode 100644 index 70fcd31..0000000 --- a/gnome-control-center-40.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:610f360ce6c6545fb8876466ddfde35768705b22dd3f19c6ca5b1c256a692467 -size 6493984 diff --git a/gnome-control-center-41.0.tar.xz b/gnome-control-center-41.0.tar.xz new file mode 100644 index 0000000..f3b928c --- /dev/null +++ b/gnome-control-center-41.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5696222ad353fcf9a07c406e287ecc9138e250645cb2a5941a88ff0685658c1 +size 6633372 diff --git a/gnome-control-center-bring-back-firewall-zone.patch b/gnome-control-center-bring-back-firewall-zone.patch index 33bd462..23eb974 100644 --- a/gnome-control-center-bring-back-firewall-zone.patch +++ b/gnome-control-center-bring-back-firewall-zone.patch @@ -1,7 +1,7 @@ -Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethernet.c +Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-ethernet.c -+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethernet.c +--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-ethernet.c ++++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-ethernet.c @@ -27,6 +27,7 @@ #include "ce-page.h" @@ -96,10 +96,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-ethern self->setting_connection = nm_connection_get_setting_connection (connection); self->setting_wired = nm_connection_get_setting_wired (connection); -Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-security.c +Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-security.c -+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-security.c +--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-security.c ++++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-security.c @@ -27,6 +27,7 @@ #include "ce-page.h" @@ -171,10 +171,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-securi } static void -Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c +Index: gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/ce-page-vpn.c -+++ gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c +--- gnome-control-center-41.0.orig/panels/network/connection-editor/ce-page-vpn.c ++++ gnome-control-center-41.0/panels/network/connection-editor/ce-page-vpn.c @@ -35,6 +35,8 @@ struct _CEPageVpn GtkLabel *failure_label; @@ -211,10 +211,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ce-page-vpn.c } static void -Index: gnome-control-center-40.0/panels/network/connection-editor/ethernet-page.ui +Index: gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/ethernet-page.ui -+++ gnome-control-center-40.0/panels/network/connection-editor/ethernet-page.ui +--- gnome-control-center-41.0.orig/panels/network/connection-editor/ethernet-page.ui ++++ gnome-control-center-41.0/panels/network/connection-editor/ethernet-page.ui @@ -159,6 +159,36 @@ @@ -252,10 +252,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/ethernet-page. -Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.c +Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c =================================================================== --- /dev/null -+++ gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.c ++++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.c @@ -0,0 +1,125 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -382,10 +382,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpe + g_object_set (setting, NM_SETTING_CONNECTION_ZONE, zone, NULL); + g_free (zone); +} -Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.h +Index: gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h =================================================================== --- /dev/null -+++ gnome-control-center-40.0/panels/network/connection-editor/firewall-helpers.h ++++ gnome-control-center-41.0/panels/network/connection-editor/firewall-helpers.h @@ -0,0 +1,33 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -420,10 +420,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/firewall-helpe + + +#endif /* _FIREWALL_HELPERS_H_ */ -Index: gnome-control-center-40.0/panels/network/connection-editor/meson.build +Index: gnome-control-center-41.0/panels/network/connection-editor/meson.build =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/meson.build -+++ gnome-control-center-40.0/panels/network/connection-editor/meson.build +--- gnome-control-center-41.0.orig/panels/network/connection-editor/meson.build ++++ gnome-control-center-41.0/panels/network/connection-editor/meson.build @@ -12,6 +12,7 @@ sources = files( 'ce-page-vpn.c', 'ce-page-wifi.c', @@ -432,10 +432,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/meson.build 'net-connection-editor.c', 'vpn-helpers.c' ) -Index: gnome-control-center-40.0/panels/network/connection-editor/security-page.ui +Index: gnome-control-center-41.0/panels/network/connection-editor/security-page.ui =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/security-page.ui -+++ gnome-control-center-40.0/panels/network/connection-editor/security-page.ui +--- gnome-control-center-41.0.orig/panels/network/connection-editor/security-page.ui ++++ gnome-control-center-41.0/panels/network/connection-editor/security-page.ui @@ -47,6 +47,37 @@ False vertical @@ -474,10 +474,10 @@ Index: gnome-control-center-40.0/panels/network/connection-editor/security-page. -Index: gnome-control-center-40.0/panels/network/connection-editor/vpn-page.ui +Index: gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui =================================================================== ---- gnome-control-center-40.0.orig/panels/network/connection-editor/vpn-page.ui -+++ gnome-control-center-40.0/panels/network/connection-editor/vpn-page.ui +--- gnome-control-center-41.0.orig/panels/network/connection-editor/vpn-page.ui ++++ gnome-control-center-41.0/panels/network/connection-editor/vpn-page.ui @@ -51,6 +51,45 @@ diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch new file mode 100644 index 0000000..feb87cd --- /dev/null +++ b/gnome-control-center-disable-error-message-for-NM.patch @@ -0,0 +1,193 @@ +From b5ae9ddfa0df356ae7bf9445631b756883226825 Mon Sep 17 00:00:00 2001 +From: Jonathan Kang +Date: Sun, 26 Sep 2021 11:04:13 +0800 +Subject: [PATCH] add error messages when wicked is used as network manager + +--- + panels/network/cc-network-panel.c | 37 ++++++++++++++++++++++++++- + panels/network/cc-wifi-panel.c | 22 +++++++++++++++- + panels/network/cc-wifi-panel.ui | 42 +++++++++++++++++++++++++++++++ + tests/meson.build | 3 +++ + 4 files changed, 102 insertions(+), 2 deletions(-) + +diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c +index 01b164ea0..d32e94d09 100644 +--- a/panels/network/cc-network-panel.c ++++ b/panels/network/cc-network-panel.c +@@ -643,10 +643,24 @@ static void + panel_check_network_manager_version (CcNetworkPanel *self) + { + 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 (self->client); +- if (version == NULL) { ++ if (version == NULL && g_strcmp0 (state, "inactive") == 0) { + GtkWidget *box; + GtkWidget *label; + g_autofree gchar *markup = NULL; +@@ -671,10 +685,31 @@ panel_check_network_manager_version (CcNetworkPanel *self) + gtk_widget_set_valign (label, GTK_ALIGN_START); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + ++ gtk_widget_show_all (box); ++ } else if (version == NULL && g_strcmp0 (state, "active") == 0) { ++ GtkWidget *box; ++ GtkWidget *label; ++ ++ gtk_container_remove (GTK_CONTAINER (self), gtk_bin_get_child (GTK_BIN (self))); ++ ++ 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 (self), 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 (self); + } ++ ++ 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 9ca6e6ee5..c4622e684 100644 +--- a/panels/network/cc-wifi-panel.c ++++ b/panels/network/cc-wifi-panel.c +@@ -439,21 +439,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 = cc_list_row_get_active (self->rfkill_row); + +- 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 2ac7570f9..5a53f9a57 100644 +--- a/panels/network/cc-wifi-panel.ui ++++ b/panels/network/cc-wifi-panel.ui +@@ -318,6 +318,48 @@ + nm-not-running + + ++ ++ ++ ++ ++ True ++ False ++ True ++ center ++ center ++ vertical ++ 18 ++ 18 ++ ++ ++ True ++ False ++ face-sad-symbolic ++ 128 ++ ++ ++ ++ ++ ++ True ++ False ++ True ++ Please use YaST2 to configure your network. ++ ++ ++ ++ ++ ++ end ++ ++ ++ ++ ++ wicked-running ++ ++ + + + +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 + diff --git a/gnome-control-center-info-never-use-gnome-software.patch b/gnome-control-center-info-never-use-gnome-software.patch index c0cace2..006e76d 100644 --- a/gnome-control-center-info-never-use-gnome-software.patch +++ b/gnome-control-center-info-never-use-gnome-software.patch @@ -1,8 +1,8 @@ -Index: gnome-control-center-40.0/panels/info-overview/cc-info-overview-panel.c +Index: gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c =================================================================== ---- gnome-control-center-40.0.orig/panels/info-overview/cc-info-overview-panel.c -+++ gnome-control-center-40.0/panels/info-overview/cc-info-overview-panel.c -@@ -777,8 +777,8 @@ info_overview_panel_setup_overview (CcIn +--- gnome-control-center-41.0.orig/panels/info-overview/cc-info-overview-panel.c ++++ gnome-control-center-41.0/panels/info-overview/cc-info-overview-panel.c +@@ -791,8 +791,8 @@ does_gnome_software_allow_updates (void) static gboolean does_gnome_software_exist (void) { diff --git a/gnome-control-center-more-power-button-actions.patch b/gnome-control-center-more-power-button-actions.patch index 1180179..44f4457 100644 --- a/gnome-control-center-more-power-button-actions.patch +++ b/gnome-control-center-more-power-button-actions.patch @@ -1,17 +1,13 @@ -Index: gnome-control-center-40.0/panels/power/cc-power-panel.c +Index: gnome-control-center-41.0/panels/power/cc-power-panel.c =================================================================== ---- gnome-control-center-40.0.orig/panels/power/cc-power-panel.c -+++ gnome-control-center-40.0/panels/power/cc-power-panel.c -@@ -1078,10 +1078,11 @@ populate_power_button_model (GtkTreeMode - char *name; - GsdPowerButtonActionType value; - } actions[] = { -+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }, +--- gnome-control-center-41.0.orig/panels/power/cc-power-panel.c ++++ gnome-control-center-41.0/panels/power/cc-power-panel.c +@@ -796,7 +796,8 @@ populate_power_button_row (HdyComboRow * { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND }, -- { N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE }, + { 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_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }, + { N_("Force Off"), GSD_POWER_BUTTON_ACTION_SHUTDOWN } }; guint i; diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 9061f48..a1d2b02 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Sun Sep 26 07:09:41 UTC 2021 - Jonathan Kang + +- Bring back gnome-control-center-disable-error-message-for-NM.patch + and rebase it against latest code base(bsc#1190875). + +------------------------------------------------------------------- +Fri Sep 24 19:39:55 UTC 2021 - Bjørn Lie + +- Add power-profiles-daemon Recommends: Support the new power + profiles available. +- Refresh patches with quilt. + +------------------------------------------------------------------- +Mon Sep 20 21:43:27 UTC 2021 - Bjørn Lie + +- Update to version 41.0: + + Cleanup the development Flatpak manifest. + + User Accounts: Add parental controls keywords. + + Updated translations. + +------------------------------------------------------------------- +Sun Sep 19 07:18:22 UTC 2021 - Dominique Leuenberger + +- Update to version 41.rc1: + + Cellular: Various translation fixes. + + User Accounts: Improve parental controls behavior. + + Updated translations. + +------------------------------------------------------------------- +Sat Sep 18 14:16:03 UTC 2021 - Dominique Leuenberger + +- Update to version 41.beta: + + Introduce the new Cellular panel. + + Introduce the new Multitasking panel. + + About: Fix a crash due to uninitialized variables. + + Bluetooth: Fix Bluetooth switch transitions. + + Location: Fix permission store id (again). + + Power: Polish power profiles section. +- Changes from version 41.alpha: + + Improve and fix the development Flatpak manifest. + + Drop dependency on grilo. + + About: + - Don't show GNOME micro version number. + - Look for dark and text distro logo variants. + + Accessibility: Add "Enable Animations" option. + + Location: Fix permission store id. + + Mouse & Touchpad: Update artwork. + + Online Accounts: Present all online accounts providers at once. + + Power: + - Integrate with new power profiles daemon API. + - Show more information about power profiles. + - Cleanup some preferences. + + Updated translations. +- Drop pkgconfig(grilo-0.3) BuildRequires: no longer needed. +- Add pkgconfig(gcr-3) BuildRequires: dependency for the new + cellular panel. + ------------------------------------------------------------------- Fri Sep 17 21:40:23 UTC 2021 - Bjørn Lie diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 600e1f8..901b960 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -26,14 +26,16 @@ %endif Name: gnome-control-center -Version: 40.1 +Version: 41.0 Release: 0 Summary: The GNOME Control Center License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://www.gnome.org -Source0: https://download.gnome.org/sources/gnome-control-center/40/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-control-center/41/%{name}-%{version}.tar.xz +# 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 +Patch0: gnome-control-center-disable-error-message-for-NM.patch ### patches for Leap >= 15 plus SLE >= 15, but not TW # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. Patch1001: gnome-control-center-info-never-use-gnome-software.patch @@ -59,11 +61,12 @@ 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(gcr-3) 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(glib-2.0) >= 2.68.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.33.4 @@ -72,14 +75,13 @@ 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.37.1 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 40.alpha 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-1) >= 1.0.0 +BuildRequires: pkgconfig(libhandy-1) >= 1.2.0 BuildRequires: pkgconfig(libnm) >= 1.24.0 BuildRequires: pkgconfig(libnma) >= 1.8.0 BuildRequires: pkgconfig(libpulse) >= 2.0 @@ -114,6 +116,8 @@ Recommends: cups-pk-helper Recommends: dbus(com.intel.dleyna-server) # the printers panel can use the dbus service Recommends: system-config-printer-dbus-service +# For the power panel +Recommends: power-profiles-daemon Provides: acme Provides: fontilus Provides: themus @@ -187,6 +191,7 @@ GNOME control center. %prep %setup -q +%patch0 -p1 # patches for Leap >= 15 plus SLE >= 15, but not TW %if 0%{?sle_version} >= 150000 %patch1001 -p1 @@ -233,6 +238,8 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/*/*/*.svg +%{_datadir}/icons/gnome-logo-text-dark.svg +%{_datadir}/icons/gnome-logo-text.svg %{_datadir}/locale/en/ %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy %{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy