diff --git a/.gitignore b/.gitignore index d202b61..825665a 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /gnome-control-center-42.3.tar.xz /gnome-control-center-43.alpha.tar.xz /gnome-control-center-43.beta.tar.xz +/gnome-control-center-43.rc.tar.xz diff --git a/1439.patch b/1439.patch deleted file mode 100644 index 2a9a8e8..0000000 --- a/1439.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 37f5cbe6af5ea71221309669f8b02d5e423956e7 Mon Sep 17 00:00:00 2001 -From: Felipe Borges -Date: Tue, 23 Aug 2022 12:02:56 +0200 -Subject: [PATCH 1/2] power: Fix blank-screen settings not applying - -The AdwComboRow widget has a selected-item property, while we were -connecting to selected-index (which doesn't exist. - -It is likely that selected-index existed in the past in libhandy -or libadwaita and this is a regression during the port to GTK4. - -Fixes #2025 ---- - panels/power/cc-power-panel.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui -index d7836e671..d9d0193ce 100644 ---- a/panels/power/cc-power-panel.ui -+++ b/panels/power/cc-power-panel.ui -@@ -151,7 +151,7 @@ - Screen _Blank - Turns the screen off after a period of inactivity. - True -- -+ - - - --- -GitLab - - -From 3a31e34514e77aeca2b6290be2d77b17ea25d0e6 Mon Sep 17 00:00:00 2001 -From: Felipe Borges -Date: Tue, 23 Aug 2022 12:07:50 +0200 -Subject: [PATCH 2/2] power: Fix "Power Button Behavior" setting now applying - -The AdwComboRow widget has a selected-item property, while we were -connecting to selected-index (which doesn't exist. - -It is likely that selected-index existed in the past in libhandy -or libadwaita and this is a regression during the port to GTK4. - -Fixes #2025 ---- - panels/power/cc-power-panel.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui -index d9d0193ce..44c515b95 100644 ---- a/panels/power/cc-power-panel.ui -+++ b/panels/power/cc-power-panel.ui -@@ -199,7 +199,7 @@ - False - Po_wer Button Behavior - True -- -+ - - - --- -GitLab - diff --git a/1440-rediffed.patch b/1440-rediffed.patch deleted file mode 100644 index fb2eb3f..0000000 --- a/1440-rediffed.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 37921f8a469fcbb78bb44d3f7d6fd403622e4423 Mon Sep 17 00:00:00 2001 -From: Felipe Borges -Date: Tue, 23 Aug 2022 17:31:31 +0200 -Subject: [PATCH] display: Fix primary monitor selection issue with AdwComboRow - -We were connecting to the selected-index property when AdwComboRow -actually has a selected-item property. This is the same as -issue #2025 - -Fixes #2028 ---- - panels/display/cc-display-panel.c | 4 ++-- - panels/display/cc-display-panel.ui | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c -index b361a00a9..6958e1976 100644 ---- a/panels/display/cc-display-panel.c -+++ b/panels/display/cc-display-panel.c -@@ -502,7 +502,7 @@ on_night_light_row_activated_cb (GtkListBoxRow *row, - } - - static void --on_primary_display_selected_index_changed_cb (CcDisplayPanel *panel) -+on_primary_display_selected_item_changed_cb (CcDisplayPanel *panel) - { - gint idx = adw_combo_row_get_selected (panel->primary_display_row); - g_autoptr(CcDisplayMonitor) output = NULL; -@@ -604,7 +604,7 @@ cc_display_panel_class_init (CcDisplayPanelClass *klass) - gtk_widget_class_bind_template_callback (widget_class, on_config_type_toggled_cb); - gtk_widget_class_bind_template_callback (widget_class, on_night_light_list_box_row_activated_cb); - gtk_widget_class_bind_template_callback (widget_class, on_night_light_row_activated_cb); -- gtk_widget_class_bind_template_callback (widget_class, on_primary_display_selected_index_changed_cb); -+ gtk_widget_class_bind_template_callback (widget_class, on_primary_display_selected_item_changed_cb); - gtk_widget_class_bind_template_callback (widget_class, on_screen_changed); - gtk_widget_class_bind_template_callback (widget_class, on_toplevel_escape_pressed_cb); - } -diff --git a/panels/display/cc-display-panel.ui b/panels/display/cc-display-panel.ui -index 00197bd62..9337b1804 100644 ---- a/panels/display/cc-display-panel.ui -+++ b/panels/display/cc-display-panel.ui -@@ -154,7 +154,7 @@ - - Contains top bar and Activities - Primary Display -- -+ - - - --- -GitLab - diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 46b7618..959f838 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -12,7 +12,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-control-center -Version: 43~beta +Version: 43~rc Release: %autorelease Summary: Utilities to configure the GNOME desktop @@ -20,18 +20,6 @@ License: GPLv2+ and CC-BY-SA URL: https://gitlab.gnome.org/GNOME/gnome-control-center/ Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz -# Bug references for both the following two patches: -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2025 -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2028 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5767 -# https://bugzilla.redhat.com/show_bug.cgi?id=2118152 -# Fix blank-screen and power button behavior settings not applying -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1439 -Patch0: 1439.patch -# Fix primary monitor selection not working -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1440 -Patch1: 1440-rediffed.patch - BuildRequires: desktop-file-utils BuildRequires: docbook-style-xsl libxslt BuildRequires: gcc diff --git a/sources b/sources index 39b1fba..ce8d1d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-43.beta.tar.xz) = 3ce153ade1d8343a80fbcb08135738c968cdf076a67af14f6516e13d9f4d9446b9e1018577d328254f02babf157638bf7c3bcefe435e452ce1a6eeacc59886cb +SHA512 (gnome-control-center-43.rc.tar.xz) = e4feee0caf6e102f0c8054e99dd51d712cd6cd929bbf54c7503ac12d8333014e8851b1aa1dcf2cb7a4cb9a72ab21fe1382f0c558944555f12a69c8216a4df981