GNOME.org
 

[gnome-build-meta/alatiera/40-alpha] add patches for shell and gsd

commit 9490b17effc2be54503d67fce2cd0a554d323c97
Author: Jordan Petridis <jpetridis gnome org>
Date:   Fri Jan 15 21:04:52 2021 +0200

    add patches for shell and gsd

 elements/core/gnome-settings-daemon.bst  |  2 +
 elements/core/gnome-shell.bst            |  3 +
 files/gnome-shell/settings-key-fix.patch | 30 ++++++++++
 files/gsd/218.patch                      | 95 ++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+)
---
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 34791159..b19170a8 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -3,6 +3,8 @@ sources:
 - kind: tar
   url: gnome_downloads:gnome-settings-daemon/40/gnome-settings-daemon-40.alpha.tar.xz
   ref: ce17d557f2ad5ef05656f8859eb48b017fdcf58ed4bcb3f1e2d8ceb7f8016219
+- kind: patch
+  path: files/gsd/218.patch
 build-depends:
 - freedesktop-sdk.bst:components/perl.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index f4067beb..7fb6408a 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -4,6 +4,9 @@ sources:
 - kind: tar
   url: gnome_downloads:gnome-shell/40/gnome-shell-40.alpha.1.tar.xz
   ref: 009ea033c97f313cba83d4d557d432041960b855d2c82f5cd58d18f90cd6e1dd
+- kind: patch
+  path: files/gnome-shell/settings-key-fix.patch
+
 build-depends:
 - sdk-deps/sassc.bst
 - freedesktop-sdk.bst:components/asciidoc.bst
diff --git a/files/gnome-shell/settings-key-fix.patch b/files/gnome-shell/settings-key-fix.patch
new file mode 100644
index 00000000..9c993553
--- /dev/null
+++ b/files/gnome-shell/settings-key-fix.patch
@@ -0,0 +1,30 @@
+From 4ff91aa1ceaf7db04601dcd19398da4a454df5e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner gnome org>
+Date: Fri, 15 Jan 2021 17:42:20 +0100
+Subject: [PATCH] st/settings: Adjust to moved GSettings schema
+
+Mouse settings moved from gnome-settings-daemon to
+gsettings-desktop-schemas, and we missed adjusting
+the shell side.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1573>
+---
+ src/st/st-settings.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/st/st-settings.c b/src/st/st-settings.c
+index 0ece3ccef7..4b6cf8efaf 100644
+--- a/src/st/st-settings.c
++++ b/src/st/st-settings.c
+@@ -358,7 +358,7 @@ st_settings_init (StSettings *settings)
+   g_signal_connect (settings->interface_settings, "changed",
+                     G_CALLBACK (on_interface_settings_changed), settings);
+ 
+-  settings->mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
++  settings->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
+   g_signal_connect (settings->interface_settings, "changed",
+                     G_CALLBACK (on_mouse_settings_changed), settings);
+ 
+-- 
+GitLab
+
diff --git a/files/gsd/218.patch b/files/gsd/218.patch
new file mode 100644
index 00000000..4ca07e3b
--- /dev/null
+++ b/files/gsd/218.patch
@@ -0,0 +1,95 @@
+From b03de7c06a81b08ea26cc4756b12a7ab5b5037f9 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg gnome org>
+Date: Wed, 13 Jan 2021 12:17:26 +0100
+Subject: [PATCH 1/3] xsettings: Use correct mouse settings schema
+
+This was missed porting drag-threshold/double-click to g-d-s, this
+was handled "elegantly" in testing/CI (the new settings were just
+ineffective) because the schema was still around in the environment
+coming from the system install, but will likely trigger GSetting
+asserts if it wasn't there as a fallback.
+---
+ plugins/xsettings/gsd-xsettings-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index 07ec543e..518db192 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -49,7 +49,7 @@
+ #include "gsd-remote-display-manager.h"
+ #include "wm-button-layout-translation.h"
+ 
+-#define MOUSE_SETTINGS_SCHEMA     "org.gnome.settings-daemon.peripherals.mouse"
++#define MOUSE_SETTINGS_SCHEMA     "org.gnome.desktop.peripherals.mouse"
+ #define BACKGROUND_SETTINGS_SCHEMA "org.gnome.desktop.background"
+ #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
+ #define SOUND_SETTINGS_SCHEMA     "org.gnome.desktop.sound"
+-- 
+GitLab
+
+
+From 5b065ee0bcc47d8e1c1eb0584b123427438b0512 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg gnome org>
+Date: Wed, 13 Jan 2021 12:18:50 +0100
+Subject: [PATCH 2/3] xsettings: Handle properly changes to font settings
+
+These come from different schemas now, so plugin_callback() is not
+the right place to look for changes anymore.
+---
+ plugins/xsettings/gsd-xsettings-manager.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index 518db192..5f1b4583 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -898,8 +898,6 @@ plugin_callback (GSettings           *settings,
+                 /* Do nothing, as GsdXsettingsGtk will handle it */
+         } else if (g_str_equal (key, XSETTINGS_OVERRIDE_KEY)) {
+                 override_callback (settings, key, manager);
+-        } else {
+-                xft_callback (settings, key, manager);
+         }
+ }
+ 
+@@ -1012,6 +1010,9 @@ xsettings_callback (GSettings           *settings,
+         GVariant         *value;
+ 
+         if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY) ||
++            g_str_equal (key, FONT_ANTIALIASING_KEY) ||
++            g_str_equal (key, FONT_HINTING_KEY) ||
++            g_str_equal (key, FONT_RGBA_ORDER_KEY) ||
+             g_str_equal (key, CURSOR_SIZE_KEY) ||
+             g_str_equal (key, CURSOR_THEME_KEY)) {
+               xft_callback (NULL, key, manager);
+-- 
+GitLab
+
+
+From 017a5b61895a520c2fed22cd05fec2f762121bbf Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg gnome org>
+Date: Wed, 13 Jan 2021 12:30:42 +0100
+Subject: [PATCH 3/3] data: Drop reference to non-existing schema
+
+The mouse schema went deprecated and renamed locally. We shouldn't reference
+the old child anymore.
+---
+ data/org.gnome.settings-daemon.peripherals.gschema.xml.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in 
b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
+index c2d716a7..be672773 100644
+--- a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
++++ b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
+@@ -3,7 +3,6 @@
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals" 
path="/org/gnome/settings-daemon/peripherals/">
+     <child name="smartcard" schema="org.gnome.settings-daemon.peripherals.smartcard"/>
+     <child name="keyboard" schema="org.gnome.settings-daemon.peripherals.keyboard"/>
+-    <child name="mouse" schema="org.gnome.settings-daemon.peripherals.mouse"/>
+     <child name="touchscreen" schema="org.gnome.settings-daemon.peripherals.touchscreen"/>
+   </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.smartcard" 
path="/org/gnome/settings-daemon/peripherals/smartcard/">
+-- 
+GitLab
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]