Re: [Merge] ~alfonsosanchezbeato/network-manager:ignore-artefacts into network-manager:snap-1.10
Using this small change to test auto-merge in CI. -- https://code.launchpad.net/~alfonsosanchezbeato/network-manager/+git/network-manager/+merge/368906 Your team Network-manager is requested to review the proposed merge of ~alfonsosanchezbeato/network-manager:ignore-artefacts into network-manager:snap-1.10. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:zoom-options into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/disco
Proposed change built in this PPA: https://launchpad.net/~gunnarhj/+archive/ubuntu/gnome-control-center -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/368417 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:zoom-options into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/disco. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session3 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session3 into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1786344 in gnome-settings-daemon (Ubuntu): "Default IBus input method
ignored in live session"
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1786344
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368678
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session3 into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 6a493d0..51971cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/ubuntu_ibus_configs.patch:
+- Always call add_ibus_sources_from_locale() during the first run
+ of g-s-d. This ensures that an IBus method is included in "live
+ sessions" when applicable (LP: #1786344).
+
+ -- Gunnar Hjalmarsson Tue, 11 Jun 2019 22:00:00 +0200
+
gnome-settings-daemon (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with Debian. Remaining changes:
diff --git a/debian/patches/ubuntu_ibus_configs.patch b/debian/patches/ubuntu_ibus_configs.patch
index f69330f..74b5c89 100644
--- a/debian/patches/ubuntu_ibus_configs.patch
+++ b/debian/patches/ubuntu_ibus_configs.patch
@@ -6,11 +6,11 @@ the locale, upstream removed it because they use an intial setup but we don't
Bug: https://bugs.launchpad.net/bugs/1719938
Forwarded: not-needed
---
- plugins/keyboard/gsd-keyboard-manager.c | 56 -
- 1 file changed, 55 insertions(+), 1 deletion(-)
+ plugins/keyboard/gsd-keyboard-manager.c | 64 +++-
+ 1 file changed, 62 insertions(+), 2 deletions(-)
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
-index fadde34..3b35c69 100644
+index fadde34..6a2b2ba 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -168,6 +168,58 @@ check_xkb_extension (GsdKeyboardManager *manager)
@@ -72,15 +72,57 @@ index fadde34..3b35c69 100644
static void
xkb_init (GsdKeyboardManager *manager)
{
-@@ -762,8 +814,10 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
+@@ -707,7 +759,7 @@ convert_libgnomekbd_layouts (GSettings *settings)
+ g_object_unref (libgnomekbd_settings);
+ }
+
+-static void
++static gboolean
+ maybe_convert_old_settings (GSettings *settings)
+ {
+ GVariant *sources;
+@@ -715,6 +767,7 @@ maybe_convert_old_settings (GSettings *settings)
+ gchar *stamp_dir_path = NULL;
+ gchar *stamp_file_path = NULL;
+ GError *error = NULL;
++gboolean is_first_run = FALSE;
+
+ stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL);
+ if (g_mkdir_with_parents (stamp_dir_path, 0755)) {
+@@ -726,6 +779,8 @@ maybe_convert_old_settings (GSettings *settings)
+ if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
+ goto out;
+
++is_first_run = TRUE;
++
+ sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+ if (g_variant_n_children (sources) < 1) {
+ convert_libgnomekbd_layouts (settings);
+@@ -744,6 +799,8 @@ maybe_convert_old_settings (GSettings *settings)
+ out:
+ g_free (stamp_file_path);
+ g_free (stamp_dir_path);
++
++return is_first_run;
+ }
+
+ static void
+@@ -758,7 +815,7 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
+ if (g_getenv ("RUNNING_UNDER_GDM"))
+ return;
+
+-maybe_convert_old_settings (settings);
++gboolean is_first_run = maybe_convert_old_settings (settings);
/* if we still don't have anything do some educated guesses */
sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
--if (g_variant_n_children (sources) < 1)
-+if (g_variant_n_children (sources) < 1) {
+@@ -766,6 +823,9 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
get_sources_from_xkb_config (manager);
-+add_ibus_sources_from_locale (settings);
-+}
g_variant_unref (sources);
++if (is_first_run)
++add_ibus_sources_from_locale (settings);
++
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+ if (g_strv_length (options) < 1)
+ get_options_from_xkb_config (manager);
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Hi Laney,
I have tested (by faking Japanese first logins) the idea to call
add_ibus_sources_from_locale() from maybe_convert_old_settings(). This is where
I put it:
if (g_variant_n_children (sources) < 1) {
convert_libgnomekbd_layouts (settings);
add_ibus_sources_from_locale (settings);
}
convert_libgnomekbd_layouts() seems to not have changed anything, but Mozc was
added. However, it resulted in a session with only Mozc available in sources.
The reason is that the get_sources_from_xkb_config() call in
maybe_create_initial_settings() did not happen since sources wasn't empty at
that spot in the flow.
I don't know if it would be acceptable to not have a XKB layout available, but
I have my doubts. In any case I feel that such a change would be too intrusive
considering that I want to SRU to bionic whatever solution we choose.
Furthermore, to address the bug happening when you "Try Ubuntu" from the
Ubiquity welcome screen, I suspect that the call would need to be moved beyond
the condition, like this:
if (g_variant_n_children (sources) < 1) {
convert_libgnomekbd_layouts (settings);
}
add_ibus_sources_from_locale (settings);
But that would also result in real installs with only an IBus input method in
sources.
My conclusion is that any call of add_ibus_sources_from_locale() from
maybe_convert_old_settings() would be premature.
So I'm back to my proposal in this MP. It lets g-s-d do its things with respect
to XKB layouts first, and then it adds an IBus method if applicable. Even if
there are a few lines, the regression risk ought to be minimal.
--
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
An attempt to summarize: 1. get_sources_from_xkb_config() needs to be called if no XKB layouts were added previously. 2. add_ibus_sources_from_locale() needs to be run once regardless. To meet both those conditions, you cannot call add_ibus_sources_from_locale() from maybe_convert_old_settings(). -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session2 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session2 into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
Requested reviews:
Iain Lane (laney)
Related bugs:
Bug #1786344 in gnome-settings-daemon (Ubuntu): "Default IBus input method
ignored in live session"
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1786344
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368657
An attempt with calling add_ibus_sources_from_locale() unconditionally during
the first run of the maybe_convert_old_settings() function.
While this results in a slightly more complex patch, I suppose it's better
conceptually, since we don't introduce a dependency of a stamp file belonging
to some other package.
There is also an extra bonus (at least I think it is a bonus): When doing e.g.
a Chinese or Japanese install, and unlike before, the IBus IM is active
instantly at first login. That is, instead of:
[('xkb', 'cn'), ('ibus', 'libpinyin')]
in sources, libpinyin is now the first source:
[('ibus', 'libpinyin'), ('xkb', 'cn')]
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 6a493d0..7da503e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnome-settings-daemon (3.32.0-1ubuntu2) eoan; urgency=medium
+
+ * debian/patches/ubuntu_ibus_configs.patch:
+- Call add_ibus_sources_from_locale() unconditionally during the
+ first run of the maybe_convert_old_settings() function. This will
+ hopefully make an IBus method be included when applicable also in
+ "live sessions" (LP: #1786344).
+
+ -- Gunnar Hjalmarsson Tue, 11 Jun 2019 15:55:00 +0200
+
gnome-settings-daemon (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with Debian. Remaining changes:
diff --git a/debian/patches/ubuntu_ibus_configs.patch b/debian/patches/ubuntu_ibus_configs.patch
index f69330f..3d6a19d 100644
--- a/debian/patches/ubuntu_ibus_configs.patch
+++ b/debian/patches/ubuntu_ibus_configs.patch
@@ -6,11 +6,11 @@ the locale, upstream removed it because they use an intial setup but we don't
Bug: https://bugs.launchpad.net/bugs/1719938
Forwarded: not-needed
---
- plugins/keyboard/gsd-keyboard-manager.c | 56 -
- 1 file changed, 55 insertions(+), 1 deletion(-)
+ plugins/keyboard/gsd-keyboard-manager.c | 78 +---
+ 1 file changed, 69 insertions(+), 9 deletions(-)
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
-index fadde34..3b35c69 100644
+index fadde34..eb76921 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -168,6 +168,58 @@ check_xkb_extension (GsdKeyboardManager *manager)
@@ -72,15 +72,76 @@ index fadde34..3b35c69 100644
static void
xkb_init (GsdKeyboardManager *manager)
{
-@@ -762,8 +814,10 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
+@@ -707,7 +759,7 @@ convert_libgnomekbd_layouts (GSettings *settings)
+ g_object_unref (libgnomekbd_settings);
+ }
+
+-static void
++static gint
+ maybe_convert_old_settings (GSettings *settings)
+ {
+ GVariant *sources;
+@@ -715,6 +767,11 @@ maybe_convert_old_settings (GSettings *settings)
+ gchar *stamp_dir_path = NULL;
+ gchar *stamp_file_path = NULL;
+ GError *error = NULL;
++gint count_sources;
++
++sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++count_sources = g_variant_n_children (sources);
++g_variant_unref (sources);
+
+ stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL);
+ if (g_mkdir_with_parents (stamp_dir_path, 0755)) {
+@@ -726,12 +783,15 @@ maybe_convert_old_settings (GSettings *settings)
+ if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
+ goto out;
+
+-sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+-if (g_variant_n_children (sources) < 1) {
++if (count_sources < 1)
+ convert_libgnomekbd_layouts (settings);
+-}
++
++sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++count_sources = g_variant_n_children (sources);
+ g_variant_unref (sources);
+
++add_ibus_sources_from_locale (settings);
++
+ options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+ if (g_strv_length (options) < 1)
+ convert_libgnomekbd_options (settings);
+@@ -744,13 +804,15 @@ maybe_convert_old_settings (GSettings *settings)
+ out:
+ g_free (stamp_file_path);
+ g_free (stamp_dir_path);
++
++return count_sources;
+ }
+
+ static void
+ maybe_create_initial_settings (GsdKeyboardManager *
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session2 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session2 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368657 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session3 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
I put a build of the branch in a PPA: https://launchpad.net/~gunnarhj/+archive/ubuntu/gnome-settings-daemon Also, the test case in the bug description suggests a convenient way to confirm the effect. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368678 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session3 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session2 into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Well, I couldn't let this go, and submitted yet another MP: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368678 Letting maybe_convert_old_settings() return a boolean, which tells us whether it's the first run, seems to be a more straightforward way, and results in a simpler patch. So I put this one on hold too. Please review the latest MP instead at first hand. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368657 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Ok, you are of course right. I picked the second of those ideas and made an attempt in a new MP. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Yeah, I agree; basically that's what I mentioned at the end of my previous comment. But moving it out from the if() wouldn't make a difference wrt the problem with installs without any XKB layout. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Talked with Laney on #ubuntu-desktop. Will try a different approach and get back. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~alfonsosanchezbeato/network-manager:ignore-artefacts into network-manager:snap-1.10
Alfonso Sanchez-Beato has proposed merging ~alfonsosanchezbeato/network-manager:ignore-artefacts into network-manager:snap-1.10. Commit message: gitignore: ignore snaps and folder created by run-tests.sh Requested reviews: Network-manager (network-manager) For more details, see: https://code.launchpad.net/~alfonsosanchezbeato/network-manager/+git/network-manager/+merge/368906 gitignore: ignore snaps and folder created by run-tests.sh -- Your team Network-manager is requested to review the proposed merge of ~alfonsosanchezbeato/network-manager:ignore-artefacts into network-manager:snap-1.10. diff --git a/.gitignore b/.gitignore index 2c95f33..8ef8c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ /parts/ /prime/ /snap/.snapcraft +/tests-extras/ + +network-manager_*_*.snap -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~vanvugt/ubuntu/+source/mutter:fix-1809407-eoan into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Daniel van Vugt has proposed merging
~vanvugt/ubuntu/+source/mutter:fix-1809407-eoan into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
Commit message:
Fix wallpaper corruption on resume from suspend on Nvidia
https://bugs.launchpad.net/bugs/1809407
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1809407 in mutter (Ubuntu): "[nvidia] Corrupted wallpaper after resuming
from suspend"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1809407
For more details, see:
https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/368536
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~vanvugt/ubuntu/+source/mutter:fix-1809407-eoan into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index dd565d9..2c7c657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutter (3.32.2-1ubuntu2) eoan; urgency=medium
+
+ * Add fix-lp1809407-3.32.patch to fix background wallpaper corruption on
+Nvidia when resuming from suspend (LP: #1809407)
+
+ -- Daniel van Vugt Fri, 07 Jun 2019 18:01:23 +0800
+
mutter (3.32.2-1ubuntu1) eoan; urgency=medium
* Merge with debian. Remaining changes:
diff --git a/debian/patches/fix-lp1809407-3.32.patch b/debian/patches/fix-lp1809407-3.32.patch
new file mode 100644
index 000..ef3177b
--- /dev/null
+++ b/debian/patches/fix-lp1809407-3.32.patch
@@ -0,0 +1,234 @@
+Description: Refresh desktop wallpaper upon resume from suspend
+ The Nvidia driver loses/corrupts its texture memory upon resuming from
+ suspend. This is a *feature* that is officially documented in OpenGL
+ extension "NV_robustness_video_memory_purge". To accomodate this we need
+ to refresh textures kept long-term in GPU memory, most noticeably the
+ desktop wallpaper and clutter canvases like the rounded panel corners
+ (if enabled).
+Author: Daniel van Vugt
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/600
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1084
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1809407
+Forwarded: yes
+Last-Update: 2019-06-07
+
+diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
+index b0f1f080c..e7b8de87e 100644
+--- a/clutter/clutter/clutter-canvas.c
b/clutter/clutter/clutter-canvas.c
+@@ -76,6 +76,8 @@ struct _ClutterCanvasPrivate
+ gboolean dirty;
+
+ CoglBitmap *buffer;
++
++ ClutterStage *stage;
+ };
+
+ enum
+@@ -129,6 +131,14 @@ clutter_cairo_context_draw_marshaller (GClosure *closure,
+ cairo_restore (cr);
+ }
+
++static void
++clutter_canvas_dispose (GObject *gobject)
++{
++ ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv;
++
++ g_clear_object (&priv->stage);
++}
++
+ static void
+ clutter_canvas_finalize (GObject *gobject)
+ {
+@@ -312,6 +322,7 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
+
+ gobject_class->set_property = clutter_canvas_set_property;
+ gobject_class->get_property = clutter_canvas_get_property;
++ gobject_class->dispose = clutter_canvas_dispose;
+ gobject_class->finalize = clutter_canvas_finalize;
+
+ g_object_class_install_properties (gobject_class, LAST_PROP, obj_props);
+@@ -327,6 +338,12 @@ clutter_canvas_init (ClutterCanvas *self)
+ self->priv->scale_factor = 1.0f;
+ }
+
++static void
++clutter_canvas_video_memory_purged (ClutterCanvas *self)
++{
++ clutter_content_invalidate (CLUTTER_CONTENT (self));
++}
++
+ static void
+ clutter_canvas_paint_content (ClutterContent *content,
+ ClutterActor *actor,
+@@ -335,6 +352,7 @@ clutter_canvas_paint_content (ClutterContent *content,
+ ClutterCanvas *self = CLUTTER_CANVAS (content);
+ ClutterCanvasPrivate *priv = self->priv;
+ ClutterPaintNode *node;
++ ClutterActor *stage;
+
+ if (priv->buffer == NULL)
+ return;
+@@ -356,6 +374,17 @@ clutter_canvas_paint_content (ClutterContent *content,
+ clutter_paint_node_unref (node);
+
+ priv->dirty = FALSE;
++
++ stage = clutter_actor_get_stage (actor);
++ if (stage != (ClutterActor *) priv->stage)
++{
++ g_set_object (&priv->stage, CLUTTER_STAGE (stage));
++
++ g_signal_connect_object (stage, "gl-video-memory-purged",
++ G_CALLBACK (clutter_canvas_video_memory_purged),
++ self,
++ G_CONNECT_SWAPPED);
++}
+ }
+
+ static void
+diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
+index 1eea5b305..a83d27b65 100644
+--- a/clutter/clutter/clutter-stage.c
b/clutter/clutter/clutter-stage.c
+@@ -192,6 +192,7 @@ enum
+ DELETE_EVENT,
+ AFTER_PAINT,
+ PRESENTED,
++ GL_VIDEO_MEMORY_PURGED,
+
+ LAST_SIGNAL
+ };
+@@ -2268,6 +2269,22 @@ clutter_stage_class_init (ClutterStageClass *klass)
+ G_TYPE_NONE, 2,
+ G_TYPE_INT, G_TYPE_POINTER);
+
++ /**
++ * ClutterStage::gl-video-m
[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1786344 in gnome-settings-daemon (Ubuntu): "Default IBus input method
ignored in live session"
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1786344
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409
This MP is based on the assumption (untested) that the bug happens because
there already is at least one input source in dconf when g-s-d is run. If the
assumption is wrong, this MP is basically a no-op.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 6a493d0..697ea23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/ubuntu_ibus_configs.patch:
+- Run add_ibus_sources_from_locale() even if dconf already contains
+ one or more sources. This will hopefully make an IBus method be
+ included when applicable also in "live sessions" (LP: #1786344).
+
+ -- Gunnar Hjalmarsson Wed, 05 Jun 2019 21:41:00 +0200
+
gnome-settings-daemon (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with Debian. Remaining changes:
diff --git a/debian/patches/ubuntu_ibus_configs.patch b/debian/patches/ubuntu_ibus_configs.patch
index f69330f..afdf270 100644
--- a/debian/patches/ubuntu_ibus_configs.patch
+++ b/debian/patches/ubuntu_ibus_configs.patch
@@ -6,14 +6,14 @@ the locale, upstream removed it because they use an intial setup but we don't
Bug: https://bugs.launchpad.net/bugs/1719938
Forwarded: not-needed
---
- plugins/keyboard/gsd-keyboard-manager.c | 56 -
- 1 file changed, 55 insertions(+), 1 deletion(-)
+ plugins/keyboard/gsd-keyboard-manager.c | 70
+ 1 file changed, 70 insertions(+)
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
-index fadde34..3b35c69 100644
+index fadde34..930d788 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
-@@ -168,6 +168,58 @@ check_xkb_extension (GsdKeyboardManager *manager)
+@@ -168,6 +168,73 @@ check_xkb_extension (GsdKeyboardManager *manager)
return have_xkb;
}
@@ -69,18 +69,31 @@ index fadde34..3b35c69 100644
+g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
+}
+
++static gboolean
++is_initial_done (void) {
++g_autofree gchar *initial_file = NULL;
++g_autofree gchar *contents = NULL;
++
++initial_file = g_build_filename (g_get_user_config_dir (), "gnome-initial-setup-done", NULL);
++
++if (g_file_test (initial_file, G_FILE_TEST_EXISTS) &&
++g_file_get_contents (initial_file, &contents, NULL, NULL))
++if (g_strcmp0 (g_strchomp (contents), "yes") == 0)
++return TRUE;
++
++return FALSE;
++}
++
static void
xkb_init (GsdKeyboardManager *manager)
{
-@@ -762,8 +814,10 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
-
- /* if we still don't have anything do some educated guesses */
- sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
--if (g_variant_n_children (sources) < 1)
-+if (g_variant_n_children (sources) < 1) {
+@@ -766,6 +833,9 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
get_sources_from_xkb_config (manager);
-+add_ibus_sources_from_locale (settings);
-+}
g_variant_unref (sources);
++if (! is_initial_done ())
++add_ibus_sources_from_locale (settings);
++
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+ if (g_strv_length (options) < 1)
+ get_options_from_xkb_config (manager);
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Bug 1754671] Re: Full-tunnel VPN DNS leakage regression
I have checked again on Bionic, making sure that the installed systemd actually comes from the bionic-proposed repository, that the behavior according to the test case shown in the initial description of this bug is correct, DNS queries of destinations in the VPN done through the VPN's DNS and DNS queries to public destinations being done through the public DNS. This works correctly and so the systemd update together with the network-manager update fixes the bug described here. So I am marking this bug as verified in Bionic. ** Tags removed: verification-needed verification-needed-bionic verification-needed-cosmic ** Tags added: verification-done verification-done-bionic -- You received this bug notification because you are a member of Network- manager, which is subscribed to NetworkManager. https://bugs.launchpad.net/bugs/1754671 Title: Full-tunnel VPN DNS leakage regression To manage notifications about this bug go to: https://bugs.launchpad.net/network-manager/+bug/1754671/+subscriptions -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Bug 1754671] Re: Full-tunnel VPN DNS leakage regression
This was fixed in systemd 237-3ubuntu10.22 for bionic, and 239-7ubuntu10.14 for cosmic. I missed a "#" in the changelog (sorry) so the tooling didn't automatically mark this bug as fix released. ** Changed in: systemd (Ubuntu Bionic) Status: Fix Committed => Fix Released ** Changed in: systemd (Ubuntu Cosmic) Status: Fix Committed => Fix Released ** Tags removed: ddstreet-next -- You received this bug notification because you are a member of Network- manager, which is subscribed to NetworkManager. https://bugs.launchpad.net/bugs/1754671 Title: Full-tunnel VPN DNS leakage regression To manage notifications about this bug go to: https://bugs.launchpad.net/network-manager/+bug/1754671/+subscriptions -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Thanks for trying that.
I think you should probably not put it in any if() in that function. In English
that says something along the lines of "the first time we try to convert the
settings, also add the IBus sources". I'd put the call right above "if
(!g_file_set_contents (stamp_file_path, "", 0, &error)) {" I think.
--
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-settings-daemon/fix-airplane-switch into lp:unity-settings-daemon
Review: Approve Indeed, from the build log 'warning: undefined reference to `gnome_settings_get_chassis_type' ... it's annoying that such problems don't fail the build :/ Thanks for the fix, it makes sense -- https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/fix-airplane-switch/+merge/368880 Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master
Come on, you can think of ways around this! A couple of ideas, but there are probably more: - Make maybe_convert_old_settings() return a boolean to indicate if it ran or exited due to the stamp file. If it ran, then call add_ibus_sources_from_locale() later on. - Make it return the number of items in KEY_INPUT_SOURCES *before* it calls add_ibus_sources_from_locale(), and then use that later on instead of reading it fresh. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-settings-daemon/fix-airplane-switch into lp:unity-settings-daemon
The proposal to merge lp:~khurshid-alam/unity-settings-daemon/fix-airplane-switch into lp:unity-settings-daemon has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/fix-airplane-switch/+merge/368880 -- Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-settings-daemon/fix-airplane-switch into lp:unity-settings-daemon
Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-settings-daemon/fix-airplane-switch into
lp:unity-settings-daemon.
Commit message:
Fix airplane mode switch not appearing on network panel.
Requested reviews:
Sebastien Bacher (seb128)
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/fix-airplane-switch/+merge/368880
--
Your team Unity Settings Daemon Development Team is subscribed to branch
lp:unity-settings-daemon.
=== modified file 'gnome-settings-daemon/gnome-settings-bus.c'
--- gnome-settings-daemon/gnome-settings-bus.c 2016-05-20 17:01:02 +
+++ gnome-settings-daemon/gnome-settings-bus.c 2019-06-16 12:37:03 +
@@ -87,3 +87,49 @@
return screen_saver_proxy;
}
+
+char *
+gnome_settings_get_chassis_type (void)
+{
+char *ret = NULL;
+GError *error = NULL;
+GVariant *inner;
+GVariant *variant = NULL;
+GDBusConnection *connection;
+
+connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM,
+ NULL,
+ &error);
+if (connection == NULL) {
+g_warning ("system bus not available: %s", error->message);
+g_error_free (error);
+goto out;
+}
+
+variant = g_dbus_connection_call_sync (connection,
+ "org.freedesktop.hostname1",
+ "/org/freedesktop/hostname1",
+ "org.freedesktop.DBus.Properties",
+ "Get",
+ g_variant_new ("(ss)",
+ "org.freedesktop.hostname1",
+ "Chassis"),
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &error);
+if (variant == NULL) {
+g_debug ("Failed to get property '%s': %s", "Chassis", error->message);
+g_error_free (error);
+goto out;
+}
+
+g_variant_get (variant, "(v)", &inner);
+ret = g_variant_dup_string (inner, NULL);
+g_variant_unref (inner);
+out:
+g_clear_object (&connection);
+g_clear_pointer (&variant, g_variant_unref);
+return ret;
+}
=== modified file 'gnome-settings-daemon/gnome-settings-bus.h'
--- gnome-settings-daemon/gnome-settings-bus.h 2016-05-20 17:01:02 +
+++ gnome-settings-daemon/gnome-settings-bus.h 2019-06-16 12:37:03 +
@@ -30,6 +30,7 @@
GsdSessionManager*gnome_settings_bus_get_session_proxy (void);
GsdScreenSaver *gnome_settings_bus_get_screen_saver_proxy (void);
+char *gnome_settings_get_chassis_type(void);
G_END_DECLS
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
