import CS gnome-control-center-40.0-38.el9
This commit is contained in:
parent
dedc7ca218
commit
7deac6fcfb
@ -0,0 +1,65 @@
|
|||||||
|
From 482c317e2bfd17297c886acd99317436926a210d Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Thu, 15 Aug 2024 02:03:23 +0200
|
||||||
|
Subject: [PATCH] wacom: Group devices using libwacom API too
|
||||||
|
|
||||||
|
---
|
||||||
|
panels/wacom/cc-wacom-device.c | 7 +++++++
|
||||||
|
panels/wacom/cc-wacom-device.h | 4 ++++
|
||||||
|
panels/wacom/cc-wacom-page.c | 9 +++++----
|
||||||
|
3 files changed, 16 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/wacom/cc-wacom-device.c b/panels/wacom/cc-wacom-device.c
|
||||||
|
index a273393..cd3be0a 100644
|
||||||
|
--- a/panels/wacom/cc-wacom-device.c
|
||||||
|
+++ b/panels/wacom/cc-wacom-device.c
|
||||||
|
@@ -406,3 +406,10 @@ cc_wacom_device_get_button_settings (CcWacomDevice *device,
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+gboolean
|
||||||
|
+cc_wacom_device_is_grouped (CcWacomDevice *device1,
|
||||||
|
+ CcWacomDevice *device2)
|
||||||
|
+{
|
||||||
|
+ return libwacom_compare (device1->wdevice, device2->wdevice, WCOMPARE_NORMAL) == 0;
|
||||||
|
+}
|
||||||
|
diff --git a/panels/wacom/cc-wacom-device.h b/panels/wacom/cc-wacom-device.h
|
||||||
|
index fae504a..18c5df0 100644
|
||||||
|
--- a/panels/wacom/cc-wacom-device.h
|
||||||
|
+++ b/panels/wacom/cc-wacom-device.h
|
||||||
|
@@ -61,3 +61,7 @@ guint cc_wacom_device_get_num_buttons (CcWacomDevice *wacom_device);
|
||||||
|
|
||||||
|
GSettings * cc_wacom_device_get_button_settings (CcWacomDevice *device,
|
||||||
|
guint button);
|
||||||
|
+
|
||||||
|
+gboolean cc_wacom_device_is_grouped (CcWacomDevice *device1,
|
||||||
|
+ CcWacomDevice *device2);
|
||||||
|
+
|
||||||
|
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
|
||||||
|
index b85bce7..25041c4 100644
|
||||||
|
--- a/panels/wacom/cc-wacom-page.c
|
||||||
|
+++ b/panels/wacom/cc-wacom-page.c
|
||||||
|
@@ -918,14 +918,15 @@ check_add_pad (CcWacomPage *page,
|
||||||
|
if ((gsd_device_get_device_type (gsd_device) & GSD_DEVICE_TYPE_PAD) == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- if (!gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
|
||||||
|
- gsd_device))
|
||||||
|
- return;
|
||||||
|
-
|
||||||
|
wacom_device = cc_wacom_device_new (gsd_device);
|
||||||
|
if (!wacom_device)
|
||||||
|
return;
|
||||||
|
|
||||||
|
+ if (!cc_wacom_device_is_grouped (page->stylus, wacom_device) &&
|
||||||
|
+ !gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
|
||||||
|
+ gsd_device))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
page->pads = g_list_prepend (page->pads, g_steal_pointer (&wacom_device));
|
||||||
|
update_pad_availability (page);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
69
SOURCES/background-solid-colors.patch
Normal file
69
SOURCES/background-solid-colors.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
From 46d66b310beafd7535281068a99656a789d620a5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Fri, 30 Aug 2024 11:59:21 +0200
|
||||||
|
Subject: [PATCH] background: Reinstate solid color backgrounds
|
||||||
|
|
||||||
|
---
|
||||||
|
panels/background/cc-background-chooser.c | 18 ++++++++++++++++++
|
||||||
|
1 file changed, 18 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/panels/background/cc-background-chooser.c b/panels/background/cc-background-chooser.c
|
||||||
|
index 6c8f56136..4deb9d252 100644
|
||||||
|
--- a/panels/background/cc-background-chooser.c
|
||||||
|
+++ b/panels/background/cc-background-chooser.c
|
||||||
|
@@ -41,6 +41,7 @@ struct _CcBackgroundChooser
|
||||||
|
gboolean recent_selected;
|
||||||
|
|
||||||
|
BgWallpapersSource *wallpapers_source;
|
||||||
|
+ BgColorsSource *colors_source;
|
||||||
|
BgRecentSource *recent_source;
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -174,6 +175,8 @@ static void
|
||||||
|
setup_flowbox (CcBackgroundChooser *self)
|
||||||
|
{
|
||||||
|
GListStore *store;
|
||||||
|
+ GListStore *colors;
|
||||||
|
+ int i;
|
||||||
|
|
||||||
|
store = bg_source_get_liststore (BG_SOURCE (self->wallpapers_source));
|
||||||
|
|
||||||
|
@@ -183,6 +186,19 @@ setup_flowbox (CcBackgroundChooser *self)
|
||||||
|
self->wallpapers_source,
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
+ /* Manually add solid colors to the end of the wallpapers flowbox. See RHEL-45317 */
|
||||||
|
+ colors = bg_source_get_liststore (BG_SOURCE (self->colors_source));
|
||||||
|
+ for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (colors)); i++)
|
||||||
|
+ {
|
||||||
|
+ g_autoptr(CcBackgroundItem) color = NULL;
|
||||||
|
+ GtkWidget *widget;
|
||||||
|
+
|
||||||
|
+ color = g_list_model_get_item (G_LIST_MODEL (colors), i);
|
||||||
|
+ widget = create_widget_func (color, self->colors_source);
|
||||||
|
+
|
||||||
|
+ gtk_flow_box_insert (self->flowbox, widget, -1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
store = bg_source_get_liststore (BG_SOURCE (self->recent_source));
|
||||||
|
|
||||||
|
gtk_flow_box_bind_model (self->recent_flowbox,
|
||||||
|
@@ -290,6 +306,7 @@ cc_background_chooser_finalize (GObject *object)
|
||||||
|
CcBackgroundChooser *self = (CcBackgroundChooser *)object;
|
||||||
|
|
||||||
|
g_clear_object (&self->recent_source);
|
||||||
|
+ g_clear_object (&self->colors_source);
|
||||||
|
g_clear_object (&self->wallpapers_source);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (cc_background_chooser_parent_class)->finalize (object);
|
||||||
|
@@ -326,6 +343,7 @@ cc_background_chooser_init (CcBackgroundChooser *self)
|
||||||
|
gtk_widget_init_template (GTK_WIDGET (self));
|
||||||
|
|
||||||
|
self->recent_source = bg_recent_source_new (GTK_WIDGET (self));
|
||||||
|
+ self->colors_source = bg_colors_source_new (GTK_WIDGET (self));
|
||||||
|
self->wallpapers_source = bg_wallpapers_source_new (GTK_WIDGET (self));
|
||||||
|
setup_flowbox (self);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
38
SOURCES/display-draw-larger-monitors-when-multiple.patch
Normal file
38
SOURCES/display-draw-larger-monitors-when-multiple.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From ba8f7d7e3ac9d841e719d6ef3abeec4936b19295 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Thu, 23 Jan 2025 15:33:24 +0100
|
||||||
|
Subject: [PATCH] display: Draw larger monitors in the arrangement widget when
|
||||||
|
multiple
|
||||||
|
|
||||||
|
(cherry picked from commit d12fd83f66f51f558ebd80ef1d704cd7e2fa340d)
|
||||||
|
---
|
||||||
|
panels/display/cc-display-arrangement.c | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c
|
||||||
|
index adbbcbc28..191291e9c 100644
|
||||||
|
--- a/panels/display/cc-display-arrangement.c
|
||||||
|
+++ b/panels/display/cc-display-arrangement.c
|
||||||
|
@@ -440,6 +440,7 @@ cc_display_arrangement_update_matrices (CcDisplayArrangement *self)
|
||||||
|
GtkAllocation allocation;
|
||||||
|
gdouble scale, scale_h, scale_w;
|
||||||
|
gint x1, y1, x2, y2, max_w, max_h;
|
||||||
|
+ gint monitors = 1;
|
||||||
|
|
||||||
|
g_assert (self->config);
|
||||||
|
|
||||||
|
@@ -450,8 +451,9 @@ cc_display_arrangement_update_matrices (CcDisplayArrangement *self)
|
||||||
|
get_bounding_box (self->config, &x1, &y1, &x2, &y2, &max_w, &max_h);
|
||||||
|
gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
|
||||||
|
|
||||||
|
- scale_h = (gdouble) (allocation.width - 2 * MARGIN_PX) / (x2 - x1 + max_w * 2 * MARGIN_MON);
|
||||||
|
- scale_w = (gdouble) (allocation.height - 2 * MARGIN_PX) / (y2 - y1 + max_h * 2 * MARGIN_MON);
|
||||||
|
+ monitors = cc_display_config_count_useful_monitors (self->config);
|
||||||
|
+ scale_h = (gdouble) (allocation.width - 2 * MARGIN_PX) / (x2 - x1 + max_w * 2 * MARGIN_MON/monitors);
|
||||||
|
+ scale_w = (gdouble) (allocation.height - 2 * MARGIN_PX) / (y2 - y1 + max_h * 2 * MARGIN_MON/monitors);
|
||||||
|
|
||||||
|
scale = MIN (scale_h, scale_w);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
210
SOURCES/keyboard-dont-force-compose-key-value.patch
Normal file
210
SOURCES/keyboard-dont-force-compose-key-value.patch
Normal file
@ -0,0 +1,210 @@
|
|||||||
|
From f00c4890be8a3d7e6e8f988e3baa9491bee496e7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ian Douglas Scott <idscott@system76.com>
|
||||||
|
Date: Wed, 9 Dec 2020 09:30:32 -0800
|
||||||
|
Subject: [PATCH] keyboard: Create CcXkbModifierDialog only when used
|
||||||
|
|
||||||
|
This should avoid issues where this setting is changed just by opening
|
||||||
|
Gnome Control Center, as reported in
|
||||||
|
https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/918
|
||||||
|
|
||||||
|
This should also mean someone can tweak the settings as desired outside
|
||||||
|
Gnome Control Center, and not have them clobbered unless they open the
|
||||||
|
dialog in g-c-c.
|
||||||
|
|
||||||
|
(cherry picked from commit edffd1b2959bb2ad1e27b441a937a73331f3ba1f)
|
||||||
|
|
||||||
|
keyboard: Rename `XkbOption` and `XkbModifier` with `Cc` prefix
|
||||||
|
|
||||||
|
(cherry picked from commit e224e5177a0bc1e9b4c13fb9e5bac0ff9bef8402)
|
||||||
|
---
|
||||||
|
panels/keyboard/cc-keyboard-panel.c | 21 +++++++++------------
|
||||||
|
panels/keyboard/cc-xkb-modifier-dialog.c | 18 +++++++++---------
|
||||||
|
panels/keyboard/cc-xkb-modifier-dialog.h | 8 ++++----
|
||||||
|
panels/keyboard/cc-xkb-modifier-dialog.ui | 1 -
|
||||||
|
4 files changed, 22 insertions(+), 26 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/keyboard/cc-keyboard-panel.c b/panels/keyboard/cc-keyboard-panel.c
|
||||||
|
index 7a3fb419b..80d75a249 100644
|
||||||
|
--- a/panels/keyboard/cc-keyboard-panel.c
|
||||||
|
+++ b/panels/keyboard/cc-keyboard-panel.c
|
||||||
|
@@ -46,9 +46,6 @@ struct _CcKeyboardPanel
|
||||||
|
GtkLabel *value_input_switch;
|
||||||
|
GSettings *keybindings_settings;
|
||||||
|
|
||||||
|
- /* "Type Special Characters" section */
|
||||||
|
- CcXkbModifierDialog *alt_chars_dialog;
|
||||||
|
- CcXkbModifierDialog *compose_dialog;
|
||||||
|
GSettings *input_source_settings;
|
||||||
|
GtkListBox *special_chars_list;
|
||||||
|
GtkListBoxRow *alt_chars_row;
|
||||||
|
@@ -66,11 +63,11 @@ enum {
|
||||||
|
PROP_PARAMETERS
|
||||||
|
};
|
||||||
|
|
||||||
|
-static const XkbModifier LV3_MODIFIER = {
|
||||||
|
+static const CcXkbModifier LV3_MODIFIER = {
|
||||||
|
"lv3:",
|
||||||
|
N_("Alternate Characters Key"),
|
||||||
|
N_("The alternate characters key can be used to enter additional characters. These are sometimes printed as a third-option on your keyboard."),
|
||||||
|
- (XkbOption[]){
|
||||||
|
+ (CcXkbOption[]){
|
||||||
|
{ NC_("keyboard key", "Left Alt"), "lv3:lalt_switch" },
|
||||||
|
{ NC_("keyboard key", "Right Alt"), "lv3:ralt_switch" },
|
||||||
|
{ NC_("keyboard key", "Left Super"), "lv3:lwin_switch" },
|
||||||
|
@@ -82,13 +79,13 @@ static const XkbModifier LV3_MODIFIER = {
|
||||||
|
"lv3:ralt_switch",
|
||||||
|
};
|
||||||
|
|
||||||
|
-static const XkbModifier COMPOSE_MODIFIER = {
|
||||||
|
+static const CcXkbModifier COMPOSE_MODIFIER = {
|
||||||
|
"compose:",
|
||||||
|
N_("Compose Key"),
|
||||||
|
N_("The compose key allows a wide variety of characters to be entered. To use it, press compose then a sequence of characters. "
|
||||||
|
" For example, compose key followed by <b>C</b> and <b>o</b> will enter <b>©</b>, "
|
||||||
|
"<b>a</b> followed by <b>'</b> will enter <b>á</b>."),
|
||||||
|
- (XkbOption[]){
|
||||||
|
+ (CcXkbOption[]){
|
||||||
|
{ NC_("keyboard key", "Left Alt"), "compose:lalt" },
|
||||||
|
{ NC_("keyboard key", "Right Alt"), "compose:ralt" },
|
||||||
|
{ NC_("keyboard key", "Left Super"), "compose:lwin" },
|
||||||
|
@@ -116,17 +113,20 @@ special_chars_activated (GtkWidget *button,
|
||||||
|
GtkListBoxRow *row,
|
||||||
|
CcKeyboardPanel *self)
|
||||||
|
{
|
||||||
|
+ const CcXkbModifier *modifier;
|
||||||
|
GtkWindow *window, *dialog;
|
||||||
|
|
||||||
|
window = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self))));
|
||||||
|
|
||||||
|
if (row == self->alt_chars_row)
|
||||||
|
- dialog = GTK_WINDOW (self->alt_chars_dialog);
|
||||||
|
+ modifier = &LV3_MODIFIER;
|
||||||
|
else if (row == self->compose_row)
|
||||||
|
- dialog = GTK_WINDOW (self->compose_dialog);
|
||||||
|
+ modifier = &COMPOSE_MODIFIER;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
+ dialog = GTK_WINDOW (cc_xkb_modifier_dialog_new (self->input_source_settings, modifier));
|
||||||
|
+
|
||||||
|
gtk_window_set_transient_for (dialog, window);
|
||||||
|
gtk_widget_show (GTK_WIDGET (dialog));
|
||||||
|
}
|
||||||
|
@@ -289,7 +289,4 @@ cc_keyboard_panel_init (CcKeyboardPanel *self)
|
||||||
|
NULL,
|
||||||
|
(gpointer)&COMPOSE_MODIFIER,
|
||||||
|
NULL);
|
||||||
|
-
|
||||||
|
- self->alt_chars_dialog = cc_xkb_modifier_dialog_new (self->input_source_settings, &LV3_MODIFIER);
|
||||||
|
- self->compose_dialog = cc_xkb_modifier_dialog_new (self->input_source_settings, &COMPOSE_MODIFIER);
|
||||||
|
}
|
||||||
|
diff --git a/panels/keyboard/cc-xkb-modifier-dialog.c b/panels/keyboard/cc-xkb-modifier-dialog.c
|
||||||
|
index 78ddb48ff..ae6326a96 100644
|
||||||
|
--- a/panels/keyboard/cc-xkb-modifier-dialog.c
|
||||||
|
+++ b/panels/keyboard/cc-xkb-modifier-dialog.c
|
||||||
|
@@ -36,7 +36,7 @@ struct _CcXkbModifierDialog
|
||||||
|
HdyActionRow *switch_row;
|
||||||
|
|
||||||
|
GSettings *input_source_settings;
|
||||||
|
- const XkbModifier *modifier;
|
||||||
|
+ const CcXkbModifier *modifier;
|
||||||
|
GSList *radio_group;
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -47,10 +47,10 @@ static const gchar *custom_css =
|
||||||
|
" padding: 12px"
|
||||||
|
"}";
|
||||||
|
|
||||||
|
-static const XkbOption*
|
||||||
|
-get_xkb_option_from_name (const XkbModifier *modifier, const gchar* name)
|
||||||
|
+static const CcXkbOption*
|
||||||
|
+get_xkb_option_from_name (const CcXkbModifier *modifier, const gchar* name)
|
||||||
|
{
|
||||||
|
- const XkbOption *options = modifier->options;
|
||||||
|
+ const CcXkbOption *options = modifier->options;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; options[i].label && options[i].xkb_option; i++)
|
||||||
|
@@ -84,7 +84,7 @@ update_active_radio (CcXkbModifierDialog *self)
|
||||||
|
{
|
||||||
|
g_auto(GStrv) options = NULL;
|
||||||
|
GtkRadioButton *rightalt_radio;
|
||||||
|
- const XkbOption *default_option;
|
||||||
|
+ const CcXkbOption *default_option;
|
||||||
|
guint i;
|
||||||
|
|
||||||
|
options = g_settings_get_strv (self->input_source_settings, "xkb-options");
|
||||||
|
@@ -246,7 +246,7 @@ static void
|
||||||
|
add_radio_buttons (CcXkbModifierDialog *self)
|
||||||
|
{
|
||||||
|
GtkWidget *row, *radio_button, *label, *last_button = NULL;
|
||||||
|
- XkbOption *options = self->modifier->options;
|
||||||
|
+ CcXkbOption *options = self->modifier->options;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; options[i].label && options[i].xkb_option; i++)
|
||||||
|
@@ -310,7 +310,7 @@ cc_xkb_modifier_dialog_init (CcXkbModifierDialog *self)
|
||||||
|
|
||||||
|
CcXkbModifierDialog *
|
||||||
|
cc_xkb_modifier_dialog_new (GSettings *input_settings,
|
||||||
|
- const XkbModifier *modifier)
|
||||||
|
+ const CcXkbModifier *modifier)
|
||||||
|
{
|
||||||
|
CcXkbModifierDialog *self;
|
||||||
|
|
||||||
|
@@ -336,8 +336,8 @@ xcb_modifier_transform_binding_to_label (GValue *value,
|
||||||
|
GVariant *variant,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
- const XkbModifier *modifier = user_data;
|
||||||
|
- const XkbOption *entry = NULL;
|
||||||
|
+ const CcXkbModifier *modifier = user_data;
|
||||||
|
+ const CcXkbOption *entry = NULL;
|
||||||
|
const char **items;
|
||||||
|
guint i;
|
||||||
|
|
||||||
|
diff --git a/panels/keyboard/cc-xkb-modifier-dialog.h b/panels/keyboard/cc-xkb-modifier-dialog.h
|
||||||
|
index 1b2d180a4..91efbcdde 100644
|
||||||
|
--- a/panels/keyboard/cc-xkb-modifier-dialog.h
|
||||||
|
+++ b/panels/keyboard/cc-xkb-modifier-dialog.h
|
||||||
|
@@ -28,21 +28,21 @@ typedef struct
|
||||||
|
{
|
||||||
|
gchar *label;
|
||||||
|
gchar *xkb_option;
|
||||||
|
-} XkbOption;
|
||||||
|
+} CcXkbOption;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
gchar *prefix;
|
||||||
|
gchar *title;
|
||||||
|
gchar *description;
|
||||||
|
- XkbOption *options;
|
||||||
|
+ CcXkbOption *options;
|
||||||
|
gchar *default_option;
|
||||||
|
-} XkbModifier;
|
||||||
|
+} CcXkbModifier;
|
||||||
|
|
||||||
|
#define CC_TYPE_XKB_MODIFIER_DIALOG (cc_xkb_modifier_dialog_get_type())
|
||||||
|
G_DECLARE_FINAL_TYPE (CcXkbModifierDialog, cc_xkb_modifier_dialog, CC, XKB_MODIFIER_DIALOG, GtkDialog)
|
||||||
|
|
||||||
|
-CcXkbModifierDialog *cc_xkb_modifier_dialog_new (GSettings *input_settings, const XkbModifier*);
|
||||||
|
+CcXkbModifierDialog *cc_xkb_modifier_dialog_new (GSettings *input_settings, const CcXkbModifier*);
|
||||||
|
|
||||||
|
gboolean xcb_modifier_transform_binding_to_label (GValue*, GVariant*, gpointer);
|
||||||
|
|
||||||
|
diff --git a/panels/keyboard/cc-xkb-modifier-dialog.ui b/panels/keyboard/cc-xkb-modifier-dialog.ui
|
||||||
|
index 8c2cf8e87..851b92d6b 100644
|
||||||
|
--- a/panels/keyboard/cc-xkb-modifier-dialog.ui
|
||||||
|
+++ b/panels/keyboard/cc-xkb-modifier-dialog.ui
|
||||||
|
@@ -6,7 +6,6 @@
|
||||||
|
<property name="resizable">False</property>
|
||||||
|
<property name="default_width">500</property>
|
||||||
|
<property name="type_hint">dialog</property>
|
||||||
|
- <signal name="delete-event" handler="gtk_widget_hide_on_delete" />
|
||||||
|
<child internal-child="vbox">
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
@ -0,0 +1,71 @@
|
|||||||
|
From 26ed29be848571235ad8df43dc1cd06a2d65b5d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Thu, 23 Jan 2025 13:14:03 +0100
|
||||||
|
Subject: [PATCH] Don't disambiguate wired networks titles
|
||||||
|
|
||||||
|
In RHEL-50729 the customer wants the ethernet device name to appear
|
||||||
|
consistent regardless of the name of the device.
|
||||||
|
|
||||||
|
What GNOME Settings upstream does is to use
|
||||||
|
nm_device_disambiguate_names() so that it can show a simple "Wired"
|
||||||
|
device when there's only one (usually embedded) device and still
|
||||||
|
change the device name when there are multiple devices connected
|
||||||
|
(corner case) to disambiguate.
|
||||||
|
|
||||||
|
These changes make the Ethernet devices always appear as "Wired $IFACE",
|
||||||
|
where $IFACE is the result of nm_device_get_iface ().
|
||||||
|
|
||||||
|
See https://networkmanager.dev/docs/libnm/latest/NMDevice.html#nm-device-disambiguate-names
|
||||||
|
|
||||||
|
Related: RHEL-50729
|
||||||
|
---
|
||||||
|
panels/network/cc-network-panel.c | 26 ++++++++++++++++++++++++--
|
||||||
|
1 file changed, 24 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
|
||||||
|
index bd4e55df8..418a353c4 100644
|
||||||
|
--- a/panels/network/cc-network-panel.c
|
||||||
|
+++ b/panels/network/cc-network-panel.c
|
||||||
|
@@ -230,6 +230,23 @@ cc_network_panel_get_help_uri (CcPanel *self)
|
||||||
|
return "help:gnome-help/net";
|
||||||
|
}
|
||||||
|
|
||||||
|
+static gchar *
|
||||||
|
+get_ethernet_device_name (NMDevice *device)
|
||||||
|
+{
|
||||||
|
+ const gchar *type_name;
|
||||||
|
+
|
||||||
|
+ switch (nm_device_get_device_type (device)) {
|
||||||
|
+ case NM_DEVICE_TYPE_ETHERNET:
|
||||||
|
+ case NM_DEVICE_TYPE_INFINIBAND:
|
||||||
|
+ type_name = _("Wired");
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return g_strdup_printf ("%s (%s)", type_name, nm_device_get_iface (device));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void
|
||||||
|
panel_refresh_device_titles (CcNetworkPanel *self)
|
||||||
|
{
|
||||||
|
@@ -269,8 +286,13 @@ panel_refresh_device_titles (CcNetworkPanel *self)
|
||||||
|
for (i = 0; i < num_devices; i++) {
|
||||||
|
if (NM_IS_DEVICE_BT (nm_devices[i]))
|
||||||
|
net_device_bluetooth_set_title (NET_DEVICE_BLUETOOTH (devices[i]), nm_device_bt_get_name (NM_DEVICE_BT (nm_devices[i])));
|
||||||
|
- else if (NET_IS_DEVICE_ETHERNET (devices[i]))
|
||||||
|
- net_device_ethernet_set_title (NET_DEVICE_ETHERNET (devices[i]), titles[i]);
|
||||||
|
+ else if (NET_IS_DEVICE_ETHERNET (devices[i])) {
|
||||||
|
+ g_autofree gchar *device_name = NULL;
|
||||||
|
+
|
||||||
|
+ device_name = get_ethernet_device_name (net_device_ethernet_get_device (NET_DEVICE_ETHERNET (devices[i])));
|
||||||
|
+ net_device_ethernet_set_title (NET_DEVICE_ETHERNET (devices[i]),
|
||||||
|
+ device_name ? device_name : titles[i]);
|
||||||
|
+ }
|
||||||
|
else if (NET_IS_DEVICE_MOBILE (devices[i]))
|
||||||
|
net_device_mobile_set_title (NET_DEVICE_MOBILE (devices[i]), titles[i]);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
54
SOURCES/power-button-action-server.patch
Normal file
54
SOURCES/power-button-action-server.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From 59a502e833a389d310df4f1cdfb19b835e711878 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felipe Borges <felipeborges@gnome.org>
|
||||||
|
Date: Mon, 20 Jan 2025 15:43:34 +0100
|
||||||
|
Subject: [PATCH] power: Honor "power-button-action-server"
|
||||||
|
|
||||||
|
See https://gitlab.com/redhat/centos-stream/rpms/gnome-settings-daemon/-/merge_requests/26
|
||||||
|
---
|
||||||
|
panels/power/cc-power-panel.c | 10 ++++++++--
|
||||||
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
|
||||||
|
index 04987ff98..bb381ff70 100644
|
||||||
|
--- a/panels/power/cc-power-panel.c
|
||||||
|
+++ b/panels/power/cc-power-panel.c
|
||||||
|
@@ -679,13 +679,16 @@ power_button_row_changed_cb (CcPowerPanel *self)
|
||||||
|
gint selected_index;
|
||||||
|
HdyValueObject *value_object;
|
||||||
|
gint value;
|
||||||
|
+ gboolean is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
||||||
|
|
||||||
|
model = hdy_combo_row_get_model (self->power_button_row);
|
||||||
|
selected_index = hdy_combo_row_get_selected_index (self->power_button_row);
|
||||||
|
value_object = g_list_model_get_item (model, selected_index);
|
||||||
|
value = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (value_object), "value"));
|
||||||
|
|
||||||
|
- g_settings_set_enum (self->gsd_settings, "power-button-action", value);
|
||||||
|
+ g_settings_set_enum (self->gsd_settings,
|
||||||
|
+ is_server ? "power-button-action-server" : "power-button-action",
|
||||||
|
+ value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -1501,6 +1504,8 @@ setup_general_section (CcPowerPanel *self)
|
||||||
|
g_strcmp0 (self->chassis_type, "tablet") != 0 &&
|
||||||
|
g_strcmp0 (self->chassis_type, "handset") != 0)
|
||||||
|
{
|
||||||
|
+ gboolean is_server = g_strcmp0 (self->chassis_type, "server") == 0;
|
||||||
|
+
|
||||||
|
gtk_widget_show (GTK_WIDGET (self->power_button_row));
|
||||||
|
|
||||||
|
g_signal_handlers_block_by_func (self->power_button_row,
|
||||||
|
@@ -1510,7 +1515,8 @@ setup_general_section (CcPowerPanel *self)
|
||||||
|
can_suspend,
|
||||||
|
can_hibernate);
|
||||||
|
set_value_for_combo_row (self->power_button_row,
|
||||||
|
- g_settings_get_enum (self->gsd_settings, "power-button-action"));
|
||||||
|
+ g_settings_get_enum (self->gsd_settings,
|
||||||
|
+ is_server ? "power-button-action-server" : "power-button-action"));
|
||||||
|
g_signal_handlers_unblock_by_func (self->power_button_row,
|
||||||
|
power_button_row_changed_cb,
|
||||||
|
self);
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
%define gnome_online_accounts_version 3.25.3
|
%define gnome_online_accounts_version 3.25.3
|
||||||
%define glib2_version 2.56.0
|
%define glib2_version 2.56.0
|
||||||
%define gnome_desktop_version 3.35.4
|
%define gnome_desktop_version 3.35.4
|
||||||
%define gsd_version 3.35.0
|
%define gsd_version 40.0.1-19
|
||||||
%define gsettings_desktop_schemas_version 3.37.1
|
%define gsettings_desktop_schemas_version 3.37.1
|
||||||
%define upower_version 0.99.8
|
%define upower_version 0.99.8
|
||||||
%define gtk3_version 3.22.20
|
%define gtk3_version 3.22.20
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
Name: gnome-control-center
|
Name: gnome-control-center
|
||||||
Version: 40.0
|
Version: 40.0
|
||||||
Release: 31%{?dist}
|
Release: 38%{?dist}
|
||||||
Summary: Utilities to configure the GNOME desktop
|
Summary: Utilities to configure the GNOME desktop
|
||||||
|
|
||||||
License: GPLv2+ and CC-BY-SA
|
License: GPLv2+ and CC-BY-SA
|
||||||
@ -55,6 +55,23 @@ Patch14: 0001-shell-Avoid-handling-map-events-from-other-windows.patch
|
|||||||
|
|
||||||
Patch15: 0001-wacom-Provide-connector-name-for-disambiguation.patch
|
Patch15: 0001-wacom-Provide-connector-name-for-disambiguation.patch
|
||||||
|
|
||||||
|
# https://issues.redhat.com/browse/RHEL-45317
|
||||||
|
Patch16: background-solid-colors.patch
|
||||||
|
|
||||||
|
Patch17: 0001-wacom-Group-devices-using-libwacom-API-too.patch
|
||||||
|
|
||||||
|
# Needs Jira ticket
|
||||||
|
Patch18: power-button-action-server.patch
|
||||||
|
|
||||||
|
# https://issues.redhat.com/browse/RHEL-50729
|
||||||
|
Patch19: network-dont-disambiguate-ethernet-device-names.patch
|
||||||
|
|
||||||
|
# https://issues.redhat.com/browse/RHEL-4226
|
||||||
|
Patch20: keyboard-dont-force-compose-key-value.patch
|
||||||
|
|
||||||
|
# https://issues.redhat.com/browse/RHEL-4196
|
||||||
|
Patch21: display-draw-larger-monitors-when-multiple.patch
|
||||||
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
@ -116,7 +133,7 @@ Requires: gnome-settings-daemon%{?_isa} >= 40.0.1-4
|
|||||||
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
||||||
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
||||||
Requires: upower%{?_isa} >= %{upower_version}
|
Requires: upower%{?_isa} >= %{upower_version}
|
||||||
Requires: power-profiles-daemon >= %{power_profiles_daemon_version}
|
Requires: (power-profiles-daemon or tuned-ppd)
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
Requires: gnome-bluetooth%{?_isa} >= 1:%{gnome_bluetooth_version}
|
Requires: gnome-bluetooth%{?_isa} >= 1:%{gnome_bluetooth_version}
|
||||||
%endif
|
%endif
|
||||||
@ -152,7 +169,7 @@ Recommends: switcheroo-control
|
|||||||
Requires: /usr/bin/gkbd-keyboard-display
|
Requires: /usr/bin/gkbd-keyboard-display
|
||||||
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
|
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
|
||||||
# For the power panel
|
# For the power panel
|
||||||
Recommends: power-profiles-daemon
|
Recommends: tuned-ppd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Renamed in F28
|
# Renamed in F28
|
||||||
@ -244,6 +261,34 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
|||||||
%dir %{_datadir}/gnome/wm-properties
|
%dir %{_datadir}/gnome/wm-properties
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 23 2025 Felipe Borges <feborges@redhat.com> - 40.0-38
|
||||||
|
- Scale up monitors drawing in display arrangment settings when multiple monitors
|
||||||
|
Related: RHEL-4196
|
||||||
|
|
||||||
|
* Thu Jan 23 2025 Felipe Borges <feborges@redhat.com> - 40.0-36
|
||||||
|
- Don't accidentally set value of compose key when loading Keyboard settings
|
||||||
|
Related: RHEL-4226
|
||||||
|
|
||||||
|
* Thu Jan 23 2025 Felipe Borges <feborges@redhat.com> - 40.0-35
|
||||||
|
- Don't disambiguate ethernet network devices names
|
||||||
|
Related: RHEL-50729
|
||||||
|
|
||||||
|
* Wed Jan 22 2025 Felipe Borges <feborges@redhat.com> - 40.0-34
|
||||||
|
- Replace power-profiles-daemon requirement with tuned-ppd
|
||||||
|
Resolves: RHEL-68152
|
||||||
|
|
||||||
|
* Mon Jan 20 2025 Felipe Borges <feborges@redhat.com> - 40.0-34
|
||||||
|
- Honor "power-button-action-server" side setting
|
||||||
|
Related: RHEL-71937
|
||||||
|
|
||||||
|
* Fri Dec 13 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-33
|
||||||
|
- Look up grouped devices through libwacom API too
|
||||||
|
Resolves: RHEL-17712
|
||||||
|
|
||||||
|
* Fri Aug 30 2024 Felipe Borges <feborges@redhat.com> - 40.0-32
|
||||||
|
- Reintroduce solid color wallpapers
|
||||||
|
Resolves: RHEL-45317
|
||||||
|
|
||||||
* Fri Apr 19 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-31
|
* Fri Apr 19 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-31
|
||||||
- Provide connector name for disambiguation in Wacom display mapping
|
- Provide connector name for disambiguation in Wacom display mapping
|
||||||
Resolves: RHEL-23162
|
Resolves: RHEL-23162
|
||||||
|
Loading…
Reference in New Issue
Block a user