[Merge] ~3v1n0/ubuntu/+source/glib2.0:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/glib2.0:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1764779 in nautilus (Ubuntu): "Nautilus crashed open Windows-partition"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1764779
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/glib2.0/+git/glib2.0/+merge/353003
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/glib2.0:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index d4fed8d..18f7937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+glib2.0 (2.56.1-2ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/gio-Update-mounts-after-g_volume_mount.patch,
+debian/patches/gio-tool-Hold-GVolumeMonitor-reference-during-operations.patch:
+- Ensure mounts are advertised only after mounting has been really completed
+ (LP: #1764779)
+
+ -- Marco Trevisan (Treviño) Mon, 13 Aug 2018 18:03:21 +0200
+
glib2.0 (2.56.1-2ubuntu1) bionic; urgency=medium
* Merge with debian, remaining changes:
diff --git a/debian/patches/gio-Update-mounts-after-g_volume_mount.patch b/debian/patches/gio-Update-mounts-after-g_volume_mount.patch
new file mode 100644
index 000..0d8be3e
--- /dev/null
+++ b/debian/patches/gio-Update-mounts-after-g_volume_mount.patch
@@ -0,0 +1,110 @@
+From: Ondrej Holy
+Date: Mon, 30 Jul 2018 15:26:31 +0200
+Subject: gio: Update mounts after g_volume_mount
+
+The documentation claims that g_volume_get_mount should succeed after
+g_volume_mount. Let's update mounts before releasing g_volume_mount to
+be sure that the mount is added to the corresponding volume. The same
+is done in GVfsUDisks2VolumeMonitor.
+
+(Backported from commit 9b6b282e0a9d3f37865aa36e21ea57bd2a326e20 with no
+merge conflicts.)
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/glib/issues/1458
+Bug-Ubuntu: https://launchpad.net/bugs/1764779
+Applied-Upstream: 2.56.2, commit:f9ab3558
+---
+ gio/gunixvolume.c| 9 +++--
+ gio/gunixvolumemonitor.c | 19 +++
+ gio/gunixvolumemonitor.h | 1 +
+ 3 files changed, 19 insertions(+), 10 deletions(-)
+
+diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
+index b54d1fd..a3768e1 100644
+--- a/gio/gunixvolume.c
b/gio/gunixvolume.c
+@@ -274,6 +274,7 @@ eject_mount_done (GObject *source,
+ GTask *task = user_data;
+ GError *error = NULL;
+ gchar *stderr_str;
++ GUnixVolume *unix_volume;
+
+ if (!g_subprocess_communicate_utf8_finish (subprocess, result, NULL, &stderr_str, &error))
+ {
+@@ -286,8 +287,12 @@ eject_mount_done (GObject *source,
+ /* ...but bad exit code */
+ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "%s", stderr_str);
+ else
+-/* ...and successful exit code */
+-g_task_return_boolean (task, TRUE);
++{
++ /* ...and successful exit code */
++ unix_volume = G_UNIX_VOLUME (g_task_get_source_object (task));
++ _g_unix_volume_monitor_update (G_UNIX_VOLUME_MONITOR (unix_volume->volume_monitor));
++ g_task_return_boolean (task, TRUE);
++}
+
+ g_free (stderr_str);
+ }
+diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
+index b7711ff..4b99423 100644
+--- a/gio/gunixvolumemonitor.c
b/gio/gunixvolumemonitor.c
+@@ -183,15 +183,21 @@ g_unix_volume_monitor_class_init (GUnixVolumeMonitorClass *klass)
+ native_class->get_mount_for_mount_path = get_mount_for_mount_path;
+ }
+
++void
++_g_unix_volume_monitor_update (GUnixVolumeMonitor *unix_monitor)
++{
++ /* Update both to make sure volumes are created before mounts */
++ update_volumes (unix_monitor);
++ update_mounts (unix_monitor);
++}
++
+ static void
+ mountpoints_changed (GUnixMountMonitor *mount_monitor,
+ gpointer user_data)
+ {
+ GUnixVolumeMonitor *unix_monitor = user_data;
+
+- /* Update both to make sure volumes are created before mounts */
+- update_volumes (unix_monitor);
+- update_mounts (unix_monitor);
++ _g_unix_volume_monitor_update (unix_monitor);
+ }
+
+ static void
+@@ -200,9 +206,7 @@ mounts_changed (GUnixMountMonitor *mount_monitor,
+ {
+ GUnixVolumeMonitor *unix_monitor = user_data;
+
+- /* Update both to make sure volumes are created before mounts */
+- update_volumes (unix_monitor);
+- update_mounts (unix_monitor);
++ _g_unix_volume_monitor_update (unix_monitor);
+ }
+
+ static void
+@@ -219,8 +223,7 @@ g_unix_volume_monitor_init (GUnixVolumeMonitor *unix_monitor)
+ "mountpoints-changed", G_CALLBACK (mountpoints_changed),
+ unix_monitor);
+
+- update_volumes (unix_monitor);
+- update_mounts (unix_monitor);
++ _g_unix_volume_monitor_update (unix_monitor);
+ }
+
+ GVolumeMonitor *
+diff --git a/gio/gunixvolumemonitor.
[Merge] ~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Dariusz Gadomski has proposed merging
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
[ Alberto Milone ]
* ubuntu_nvidia_prime.patch:
- Run scripts for Prime before and after Gdm sessions (LP: #1778011).
[ Dariusz Gadomski ]
* debian/patches/unblock-sigusr1.patch:
- Unblock SIGUSR1 before PAM. (LP: #1782152)
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1778011 in nvidia-prime (Ubuntu): "SRU: PRIME Power Saving mode draws
too much power"
https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1778011
Bug #1782152 in gdm3 (Ubuntu): "GDM blocks SIGUSR1 used in PAM scripts"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1782152
For more details, see:
https://code.launchpad.net/~dgadomski/ubuntu/+source/gdm3/+git/lp1782152/+merge/352976
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~dgadomski/ubuntu/+source/gdm3/+git/lp1782152:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 9908170..d8bac21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gdm3 (3.28.2-0ubuntu1.4) bionic; urgency=medium
+
+ [ Alberto Milone ]
+ * ubuntu_nvidia_prime.patch:
+- Run scripts for Prime before and after Gdm sessions (LP: #1778011).
+
+ [ Dariusz Gadomski ]
+ * debian/patches/unblock-sigusr1.patch:
+- Unblock SIGUSR1 before PAM. (LP: #1782152)
+
+ -- Dariusz Gadomski Mon, 13 Aug 2018 14:37:55 +0200
+
gdm3 (3.28.2-0ubuntu1.3) bionic; urgency=medium
* debian/patches/daemon-gdm-session-record.c-open-close-the-utmp-database.patch:
diff --git a/debian/patches/series b/debian/patches/series
index cad9b06..2044149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ revert_override_LANG_with_accountservices.patch
ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
+unblock-sigusr1.patch
diff --git a/debian/patches/ubuntu_nvidia_prime.patch b/debian/patches/ubuntu_nvidia_prime.patch
index d2588b1..bf60c76 100644
--- a/debian/patches/ubuntu_nvidia_prime.patch
+++ b/debian/patches/ubuntu_nvidia_prime.patch
@@ -1,24 +1,25 @@
From: Tim Lunn
Date: Sat, 22 Mar 2014 10:23:12 +1100
-Subject: Add hook to run prime-offload (as root) move Prime helpers into the
- gdm-x-session wrapper
-
++Subject: Add hooks to run prime scripts (as root) before and after a
++ gdm-session
+
++This allows enabling and disabling the dGPU on log out.
---
- common/gdm-common.c| 2 +-
- daemon/gdm-display.c | 1 +
- daemon/gdm-x-session.c | 10 ++
- data/Makefile.am | 24
- data/Prime | 6 ++
- data/PrimeOff | 6 ++
+ common/gdm-common.c|2 +-
+ daemon/gdm-session.c |6 ++
+ daemon/gdm-x-session.c |5 +
+ data/Makefile.am | 24
+ data/Prime |6 ++
+ data/PrimeOff |6 ++
6 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 data/Prime
create mode 100644 data/PrimeOff
-Index: gdm3-3.26.0/common/gdm-common.c
+Index: gdm3-3.28.2/common/gdm-common.c
===
gdm3-3.26.0.orig/common/gdm-common.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/common/gdm-common.c 2017-09-14 08:24:10.580748834 -0400
-@@ -677,7 +677,7 @@ gdm_run_script (const char *dir,
+--- gdm3-3.28.2.orig/common/gdm-common.c
gdm3-3.28.2/common/gdm-common.c
+@@ -706,7 +706,7 @@
goto out;
}
@@ -27,23 +28,28 @@ Index: gdm3-3.26.0/common/gdm-common.c
display_name,
display_hostname,
display_x11_authority_file);
-Index: gdm3-3.26.0/daemon/gdm-x-session.c
+Index: gdm3-3.28.2/daemon/gdm-session.c
===
gdm3-3.26.0.orig/daemon/gdm-x-session.c 2017-09-14 08:24:10.584748891 -0400
-+++ gdm3-3.26.0/daemon/gdm-x-session.c 2017-09-14 08:24:10.580748834 -0400
-@@ -172,6 +172,11 @@ on_x_server_finished (GSubprocess *subp
- if (cancelled) {
- goto out;
- }
-+gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
-+ state->display_name,
-+ NULL, /* hostname */
-+ state->auth_file);
+--- gdm3-3.28.2.orig/daemon/gdm-session.c
gdm3-3.28.2/daemon/gdm-session.c
+@@ -2865,6 +2865,12 @@
+
+ g_list_free_full (self->priv->outside_connections, g_object_unref);
+ self->priv->outside_connections = NULL;
+
++/* Run PrimeOff after the session is closed */
++gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
++NULL,
++NULL,
+
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Description changed to: This requires to pull 'pristine-tar' and 'upstream/latest' from Salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/353022 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
