diff --git a/_service b/_service
index c175c71..d676b07 100644
--- a/_service
+++ b/_service
@@ -3,11 +3,11 @@
git
https://gitlab.gnome.org/GNOME/gnome-control-center.git
- 46.4
+ 9c6b639a45e2e5643d7e7541dededef43751c79c
@PARENT_TAG@+@TAG_OFFSET@
(.*)\+0
\1
- disable
+ enable
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..12451d5
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ https://gitlab.gnome.org/GNOME/gnome-control-center.git
+ 9c6b639a45e2e5643d7e7541dededef43751c79c
\ No newline at end of file
diff --git a/gnome-control-center-46.4.obscpio b/gnome-control-center-46.4.obscpio
deleted file mode 100644
index 2d38732..0000000
--- a/gnome-control-center-46.4.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:465dfb9a470f18dc51d79b1a87f1bce42824633cc82c392c0f155cc3532abc58
-size 48211469
diff --git a/gnome-control-center-47.0.1+8.obscpio b/gnome-control-center-47.0.1+8.obscpio
new file mode 100644
index 0000000..0233b3e
--- /dev/null
+++ b/gnome-control-center-47.0.1+8.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83ab943f511773c6a33f2f381f73c56027c05c27e652f27f0752ea3fdd8cc09b
+size 47702029
diff --git a/gnome-control-center-disable-error-message-for-NM.patch b/gnome-control-center-disable-error-message-for-NM.patch
index 62f0c81..2a1b246 100644
--- a/gnome-control-center-disable-error-message-for-NM.patch
+++ b/gnome-control-center-disable-error-message-for-NM.patch
@@ -1,109 +1,8 @@
-Index: gnome-control-center-46.3/panels/network/cc-network-panel.c
+Index: gnome-control-center-47.beta/panels/network/cc-wifi-panel.ui
===================================================================
---- gnome-control-center-46.3.orig/panels/network/cc-network-panel.c
-+++ gnome-control-center-46.3/panels/network/cc-network-panel.c
-@@ -667,10 +667,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 *status_page;
-
- status_page = adw_status_page_new ();
-@@ -681,10 +695,23 @@ panel_check_network_manager_version (CcN
- adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
- _("An error has occurred and network cannot be used."
- "\n Error details: NetworkManager not running."));
-+ } else if (version == NULL && g_strcmp0 (state, "active") == 0) {
-+ GtkWidget *status_page;
-+
-+ status_page = adw_status_page_new ();
-+ adw_toolbar_view_set_content (ADW_TOOLBAR_VIEW (self->toolbar_view), status_page);
-
-+ adw_status_page_set_icon_name (ADW_STATUS_PAGE (status_page), "network-error-symbolic");
-+ adw_status_page_set_title (ADW_STATUS_PAGE (status_page), _("Wicked is running"));
-+ adw_status_page_set_description (ADW_STATUS_PAGE (status_page),
-+ _("Please use YaST2 to configure your network."));
- } else {
- manager_running (self);
- }
-+
-+ g_object_unref (connection);
-+ g_object_unref (proxy);
-+ g_variant_unref (variant);
- }
-
- static void
-Index: gnome-control-center-46.3/panels/network/cc-wifi-panel.c
-===================================================================
---- gnome-control-center-46.3.orig/panels/network/cc-wifi-panel.c
-+++ gnome-control-center-46.3/panels/network/cc-wifi-panel.c
-@@ -298,21 +298,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 = adw_switch_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
-Index: gnome-control-center-46.3/panels/network/cc-wifi-panel.ui
-===================================================================
---- 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 @@
+--- gnome-control-center-47.beta.orig/panels/network/cc-wifi-panel.ui
++++ gnome-control-center-47.beta/panels/network/cc-wifi-panel.ui
+@@ -217,6 +217,51 @@ Error details: NetworkManager not runnin
@@ -155,10 +54,10 @@ Index: gnome-control-center-46.3/panels/network/cc-wifi-panel.ui
-Index: gnome-control-center-46.3/tests/meson.build
+Index: gnome-control-center-47.beta/tests/meson.build
===================================================================
---- gnome-control-center-46.3.orig/tests/meson.build
-+++ gnome-control-center-46.3/tests/meson.build
+--- gnome-control-center-47.beta.orig/tests/meson.build
++++ gnome-control-center-47.beta/tests/meson.build
@@ -3,9 +3,12 @@ Xvfb = find_program('Xvfb', required: fa
subdir('common')
diff --git a/gnome-control-center-more-power-button-actions.patch b/gnome-control-center-more-power-button-actions.patch
index 89d376b..487216e 100644
--- a/gnome-control-center-more-power-button-actions.patch
+++ b/gnome-control-center-more-power-button-actions.patch
@@ -1,8 +1,7 @@
-diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
-index 26e3837..3fa91db 100644
---- a/panels/power/cc-power-panel.c
-+++ b/panels/power/cc-power-panel.c
-@@ -680,7 +680,8 @@ populate_power_button_row (AdwComboRow *combo_row,
+diff -urp gnome-control-center-47.rc.orig/panels/power/cc-power-panel.c gnome-control-center-47.rc/panels/power/cc-power-panel.c
+--- gnome-control-center-47.rc.orig/panels/power/cc-power-panel.c 2024-09-10 10:09:29.314005144 -0500
++++ gnome-control-center-47.rc/panels/power/cc-power-panel.c 2024-09-10 10:10:46.471756741 -0500
+@@ -433,7 +433,8 @@ populate_power_button_row (CcNumberRow *
{ N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND },
{ N_("Power Off"), GSD_POWER_BUTTON_ACTION_INTERACTIVE },
{ N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE },
@@ -10,5 +9,5 @@ index 26e3837..3fa91db 100644
+ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING },
+ { N_("Force Off"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }
};
- guint item_index = 0;
guint i;
+
diff --git a/gnome-control-center-users-page-Don-t-show-the-system-accounts.patch b/gnome-control-center-users-page-Don-t-show-the-system-accounts.patch
index ad6d6d5..dfdd13e 100644
--- a/gnome-control-center-users-page-Don-t-show-the-system-accounts.patch
+++ b/gnome-control-center-users-page-Don-t-show-the-system-accounts.patch
@@ -10,12 +10,12 @@ 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
+Index: gnome-control-center-47.beta/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;
+--- gnome-control-center-47.beta.orig/panels/system/users/cc-users-page.c
++++ gnome-control-center-47.beta/panels/system/users/cc-users-page.c
+@@ -174,6 +174,10 @@ on_user_added (CcUsersPage *self,
+
g_list_store_insert_sorted (self->model, user, sort_users, self);
+ if (act_user_is_system_account (user)) {
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index d2858a6..10a8414 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,108 @@
+-------------------------------------------------------------------
+Fri Sep 27 17:25:17 UTC 2024 - bjorn.lie@gmail.com
+
+- Update to version 47.0.1+8:
+ * online-accounts: Fix gettext use for row
+ * online-accounts: fix gettext calls to static strings
+ * Updated translations.
+
+-------------------------------------------------------------------
+Mon Sep 16 10:09:03 UTC 2024 - Dominique Leuenberger
+
+- Update to version 47.0.1:
+ + Fix invalid appstream release notes syntax.
+- Changes from version 47.0:
+ + Appearance: Fix accessibility regression on background names.
+ + Apps: Handle opening details of Epiphany webapps.
+ + Color:
+ - Fix visibility of control buttons when expanding rows.
+ - Fix "Show details" link on profile warning.
+ + Sharing: Make "Media Sharing" dialog use GtkFileDialog for
+ adding new folders.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Sep 10 15:16:21 UTC 2024 - Michael Gorse
+
+- Rebase gnome-control-center-more-power-button-actions.patch.
+- Update some version requirements.
+
+-------------------------------------------------------------------
+Tue Sep 3 12:06:51 UTC 2024 - Bjørn Lie
+
+- Update to version 47.rc:
+ + Various ports from deprecated GTK and Libadwaita APIs
+ + Appearance: Improve performance when loading wallpapers
+ + Apps: Fix crash when handling invalid app permissions
+ + Date and Time: Fix "Auto Timezone" setting visibility when
+ Location Services are unavailable
+ + Online Accounts: Update description of MS365 online account
+ provider
+ + Sharing: Fix adding "Shared Media" folders
+ + Users:
+ - Update feedback icons for validating username and passwords
+ - Use a dialog to confirm removable of user fingerprints
+ + WiFi: Fix crash when unplugging removable WiFi adapters
+ + Updated translations.
+
+-------------------------------------------------------------------
+Thu Aug 29 19:35:16 UTC 2024 - Bjørn Lie
+
+- Update to version 47.beta:
+ + Various CI fixes
+ + Various ports to modern libadwaita widgets
+ + Various mnemonics additions
+ + Use GtkWindow.set_default_icon_name for legacy sessions
+ + Accessibility: Rename "Reduce Animation" setting to "Animation
+ Effects"
+ + Apps:
+ - Rename "File and Link Associations" page to "Files and Links"
+ - Show status page when Parental Controls aren't available
+ - Don't show "App is not sandboxed" banner for system
+ components
+ + Display:
+ - Adapt rotation labels to the screen ratio
+ - Don't set automatic Night Light when Location Services are
+ unavailable
+ + Keyboard
+ - Load input choice locales asynchronously
+ - Fix "Move" buttons in input rows
+ + Location: Remove reference to now retired Mozilla Location
+ Services
+ + Mouse:
+ - Use monochrome assets to support different accent colors
+ - Separate "Touchpad" row into its own preferences row group
+ + Network: Don't set empty ignored hosts
+ + Notifications: Turn "App Notifications" dialog into a subpage
+ + Online Accounts: Add a toast overlay for panel
+ notifications/error messages
+ + Users:
+ - Modernize the "Add User" dialog
+ - Respect password "enforcing" based on
+ /etc/security/pwquality.conf
+ - Avoid user names with underscores being interpreted as
+ mnemonics
+ - Show correctly the remaining list of fingerprints to enroll
+ - Reverse sorting of finger names list to prioritize most used
+ ones
+ + Printers:
+ - Various tweaks for the PPD Selection dialog
+ - Add button instead of link to open printer cups web page
+ + Privacy:
+ - Don't leak Bolt and Location subpages
+ - Fix visibility of Bolt settings when Bolt isn't available
+ + Remote Desktop:
+ - Fix loop resetting credentials
+ - Use new gnome-remote-desktop server configuration DBUs
+ interface
+ + Sound: Add an empty state page for when no sound device is
+ available
+ + Wacom: Set up Wacom stylus keyboard shortcuts and switch
+ monitor
+ + WWAN: Fix crash preventing the load of the SIM Unlock dialog
+ + Updated translations.
+- Rebase patch, and disable patch 1, needs manual rebase.
+
-------------------------------------------------------------------
Sun Aug 11 13:10:26 UTC 2024 - Bjørn Lie
diff --git a/gnome-control-center.obsinfo b/gnome-control-center.obsinfo
index cec1e83..3f7b00b 100644
--- a/gnome-control-center.obsinfo
+++ b/gnome-control-center.obsinfo
@@ -1,4 +1,4 @@
name: gnome-control-center
-version: 46.4
-mtime: 1722850427
-commit: e8aa31c9da651b858bfc0809d7c43ad5bfdc53f6
+version: 47.0.1+8
+mtime: 1727359874
+commit: 9c6b639a45e2e5643d7e7541dededef43751c79c
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 596a08b..d9cba71 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -26,7 +26,7 @@
%endif
Name: gnome-control-center
-Version: 46.4
+Version: 47.0.1+8
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0-or-later
@@ -35,6 +35,7 @@ URL: https://apps.gnome.org/app/org.gnome.Settings
Source0: %{name}-%{version}.tar.zst
Source99: %{name}-rpmlintrc
+# PATCH-NEEDS-REBASE Patch1
# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running
Patch1: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-UPSTREAM gnome-control-center-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
@@ -76,16 +77,16 @@ BuildRequires: pkgconfig(gnome-bluetooth-3.0)
BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gnome-settings-daemon) >= 41
BuildRequires: pkgconfig(gnutls)
-BuildRequires: pkgconfig(goa-1.0) >= 3.49.1
+BuildRequires: pkgconfig(goa-1.0) >= 3.51.0
BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 46.beta
+BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 47.alpha
BuildRequires: pkgconfig(gsound)
BuildRequires: pkgconfig(gthread-2.0)
-BuildRequires: pkgconfig(gtk4) >= 4.8
+BuildRequires: pkgconfig(gtk4) >= 4.15.2
BuildRequires: pkgconfig(gudev-1.0)
-BuildRequires: pkgconfig(libadwaita-1) >= 1.2.alpha
+BuildRequires: pkgconfig(libadwaita-1) >= 1.6.beta
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libnm) >= 1.24.0
BuildRequires: pkgconfig(libnma-gtk4)