diff --git a/gnome-settings-daemon-bgo793253.patch b/gnome-settings-daemon-bgo793253.patch index 6f057e3..9a07757 100644 --- a/gnome-settings-daemon-bgo793253.patch +++ b/gnome-settings-daemon-bgo793253.patch @@ -1,8 +1,8 @@ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 1ad3f3df..5e2eb7e3 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -335,6 +335,7 @@ get_key_string (MediaKey *key) +Index: gnome-settings-daemon-3.32.1/plugins/media-keys/gsd-media-keys-manager.c +=================================================================== +--- gnome-settings-daemon-3.32.1.orig/plugins/media-keys/gsd-media-keys-manager.c ++++ gnome-settings-daemon-3.32.1/plugins/media-keys/gsd-media-keys-manager.c +@@ -341,6 +341,7 @@ get_key_string (MediaKey *key) return g_strdup_printf ("custom:%s", key->custom_path); else g_assert_not_reached (); @@ -10,7 +10,7 @@ index 1ad3f3df..5e2eb7e3 100644 } static char * -@@ -353,6 +354,7 @@ get_binding (GsdMediaKeysManager *manager, +@@ -359,6 +360,7 @@ get_binding (GsdMediaKeysManager *manage return g_settings_get_string (settings, "binding"); } else g_assert_not_reached (); @@ -18,11 +18,11 @@ index 1ad3f3df..5e2eb7e3 100644 } static void -diff --git a/plugins/rfkill/rfkill-glib.c b/plugins/rfkill/rfkill-glib.c -index 450e6533..6b2df693 100644 ---- a/plugins/rfkill/rfkill-glib.c -+++ b/plugins/rfkill/rfkill-glib.c -@@ -254,6 +254,7 @@ op_to_string (unsigned int op) +Index: gnome-settings-daemon-3.32.1/plugins/rfkill/rfkill-glib.c +=================================================================== +--- gnome-settings-daemon-3.32.1.orig/plugins/rfkill/rfkill-glib.c ++++ gnome-settings-daemon-3.32.1/plugins/rfkill/rfkill-glib.c +@@ -269,6 +269,7 @@ op_to_string (unsigned int op) return "CHANGE_ALL"; default: g_assert_not_reached (); @@ -30,10 +30,10 @@ index 450e6533..6b2df693 100644 } } -diff --git a/plugins/xsettings/xsettings-manager.c b/plugins/xsettings/xsettings-manager.c -index 947cc9ee..18fbf599 100644 ---- a/plugins/xsettings/xsettings-manager.c -+++ b/plugins/xsettings/xsettings-manager.c +Index: gnome-settings-daemon-3.32.1/plugins/xsettings/xsettings-manager.c +=================================================================== +--- gnome-settings-daemon-3.32.1.orig/plugins/xsettings/xsettings-manager.c ++++ gnome-settings-daemon-3.32.1/plugins/xsettings/xsettings-manager.c @@ -269,6 +269,7 @@ xsettings_get_typecode (GVariant *value) return XSETTINGS_TYPE_COLOR; default: diff --git a/gnome-settings-daemon-initial-keyboard.patch b/gnome-settings-daemon-initial-keyboard.patch index abe346e..9f99d0b 100644 --- a/gnome-settings-daemon-initial-keyboard.patch +++ b/gnome-settings-daemon-initial-keyboard.patch @@ -13,11 +13,11 @@ https://bugzilla.suse.com/show_bug.cgi?id=979051 plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -Index: gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c +Index: gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c =================================================================== ---- gnome-settings-daemon-3.26.0.orig/plugins/keyboard/gsd-keyboard-manager.c 2017-09-14 13:42:53.415421010 +0200 -+++ gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c 2017-09-14 13:42:58.455409895 +0200 -@@ -433,7 +433,7 @@ +--- gnome-settings-daemon-3.32.1.orig/plugins/keyboard/gsd-keyboard-manager.c ++++ gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c +@@ -479,7 +479,7 @@ update_gtk_im_module (GsdKeyboardManager } static void @@ -26,7 +26,7 @@ Index: gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c { GsdKeyboardManagerPrivate *priv = manager->priv; GVariantBuilder builder; -@@ -452,7 +452,7 @@ +@@ -498,7 +498,7 @@ get_sources_from_xkb_config (GsdKeyboard init_builder_with_sources (&builder, priv->input_sources_settings); @@ -35,7 +35,7 @@ Index: gnome-settings-daemon-3.26.0/plugins/keyboard/gsd-keyboard-manager.c g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT); goto out; } -@@ -632,15 +632,23 @@ +@@ -678,15 +678,23 @@ maybe_create_initial_settings (GsdKeyboa settings = manager->priv->input_sources_settings; diff --git a/gnome-settings-daemon-round-xft_dpi-to-integer.patch b/gnome-settings-daemon-round-xft_dpi-to-integer.patch index d2f0c0b..e756006 100644 --- a/gnome-settings-daemon-round-xft_dpi-to-integer.patch +++ b/gnome-settings-daemon-round-xft_dpi-to-integer.patch @@ -22,11 +22,11 @@ The patch at the same time has few impact to GNOME itself. plugins/xsettings/gsd-xsettings-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c -index 3b1ebc3a..c3ac7892 100644 ---- a/plugins/xsettings/gsd-xsettings-manager.c -+++ b/plugins/xsettings/gsd-xsettings-manager.c -@@ -814,8 +814,8 @@ xft_settings_set_xresources (GsdXftSettings *settings) +Index: gnome-settings-daemon-3.32.1/plugins/xsettings/gsd-xsettings-manager.c +=================================================================== +--- gnome-settings-daemon-3.32.1.orig/plugins/xsettings/gsd-xsettings-manager.c ++++ gnome-settings-daemon-3.32.1/plugins/xsettings/gsd-xsettings-manager.c +@@ -814,8 +814,8 @@ xft_settings_set_xresources (GnomeXftSet g_debug("xft_settings_set_xresources: orig res '%s'", add_string->str); @@ -37,6 +37,3 @@ index 3b1ebc3a..c3ac7892 100644 update_property (add_string, "Xft.antialias", settings->antialias ? "1" : "0"); update_property (add_string, "Xft.hinting", --- -2.21.0 - diff --git a/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch index 26d1f77..03f5938 100644 --- a/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch +++ b/gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch @@ -1,7 +1,8 @@ -diff -Nura gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c ---- gnome-settings-daemon-3.24.3/plugins/keyboard/gsd-keyboard-manager.c 2017-08-28 17:44:30.078220888 +0800 -+++ gnome-settings-daemon-3.24.3_new/plugins/keyboard/gsd-keyboard-manager.c 2017-08-28 17:49:05.435064987 +0800 -@@ -478,7 +478,11 @@ +Index: gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c +=================================================================== +--- gnome-settings-daemon-3.32.1.orig/plugins/keyboard/gsd-keyboard-manager.c ++++ gnome-settings-daemon-3.32.1/plugins/keyboard/gsd-keyboard-manager.c +@@ -524,7 +524,11 @@ get_sources_from_xkb_config (GsdKeyboard else id = g_strdup (layouts[i]); diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 1a17eb1..e96788f 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 2 20:08:18 UTC 2019 - Bjørn Lie + +- Refresh patches with quilt. + ------------------------------------------------------------------- Wed Jun 19 14:03:25 UTC 2019 - Bjørn Lie