r40456 - in /desktop/experimental/glib2.0/debian: changelog patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch patches/Don-t-use-a-parallel-build-for-the-documentation.patch patches/series
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Thu Feb 6 09:23:39 UTC 2014
Author: smcv
Date: Thu Feb 6 09:23:39 2014
New Revision: 40456
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40456
Log:
Add patches which hopefully work around #737501, #737380
* d/p/Don-t-use-a-parallel-build-for-the-documentation.patch:
Disable parallel build for the documentation, hopefully fixing an
intermittent FTBFS in which gtk-doc tries to scan Windows-specific
objects (Closes: #737501)
* d/p/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch:
Refuse to perform D-Bus "autolaunch" if $DISPLAY is unset, in which
case it isn't going to work anyway. This works around a process-launching
issue in the GApplication test on mipsel (Closes: #737380)
Added:
desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/patches/series
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40456&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Feb 6 09:23:39 2014
@@ -1,3 +1,16 @@
+glib2.0 (2.38.2-3) UNRELEASED; urgency=medium
+
+ * d/p/Don-t-use-a-parallel-build-for-the-documentation.patch:
+ Disable parallel build for the documentation, hopefully fixing an
+ intermittent FTBFS in which gtk-doc tries to scan Windows-specific
+ objects (Closes: #737501)
+ * d/p/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch:
+ Refuse to perform D-Bus "autolaunch" if $DISPLAY is unset, in which
+ case it isn't going to work anyway. This works around a process-launching
+ issue in the GApplication test on mipsel (Closes: #737380)
+
+ -- Simon McVittie <smcv at debian.org> Thu, 06 Feb 2014 08:11:29 +0000
+
glib2.0 (2.38.2-2) experimental; urgency=medium
* Team upload.
Added: desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch?rev=40456&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch [utf-8] Thu Feb 6 09:23:39 2014
@@ -0,0 +1,73 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Mon, 3 Feb 2014 01:14:45 +0000
+Subject: [PATCH] Do not attempt to autolaunch a session dbus-daemon with no
+ DISPLAY
+
+The two known use-cases for autolaunching are:
+
+* X-forwarding: "ssh -Y myhost myapp" resulting in a
+ session bus on myhost but an X server on the original host
+
+* Legacy desktop environments on OSs without D-Bus integration:
+ e.g. running a single GNOME or KDE app under fvwm or something,
+ without a session dbus-daemon being started by either systemd,
+ gnome-session, or OS integration scripts analogous to Debian's
+ /etc/X11/Xsession.d/75dbus_dbus-launch
+
+In either case, an X11 DISPLAY is also needed.
+
+"dbus-launch --autolaunch" doesn't do anything useful when unable
+to connect to an X11 display; this has been the case since the feature
+was added in 2006, and is useful to avoid "split brain" situations in
+which two processes that ought to be part of the same session end up
+on separate session buses. Since dbus commit 407c111 in 2011,
+libdbus hasn't even attempted to run "dbus-launch --autolaunch"
+unless getenv("DISPLAY") returns non-null in the parent: this avoids
+doing a relatively complicated fork-and-exec that is clearly not
+going to lead to success. This commit gives GDBus the same policy.
+
+In Debian, I've encountered GLib test failures in
+gio/tests/gapplication.c which appear to be related to the
+fork-and-exec for dbus-launch (Debian bug #737380). Specifically,
+one test-case ends by calling g_test_dbus_unset(), and the next
+test-case tries to access the session bus with DBUS_SESSION_BUS_ADDRESS
+unset, resulting in an attempt to autolaunch. Checking for DISPLAY
+avoids this attempt to autolaunch, since g_test_dbus_unset() also
+unsets DISPLAY. It seems likely that there is some orthogonal bug here,
+perhaps involving g_spawn_sync() in the GDBus thread racing with
+g_spawn_async_with_pipes() in the main thread, but GApplication is
+probably not the ideal place to debug that.
+
+In my opinion as D-Bus maintainer, "dbus-launch --autolaunch" should
+be considered to be an X11 feature, and any future D-Bus enhancements
+(e.g. kdbus) or successors for X11 (e.g. Wayland, Mir) should obtain
+a session bus address by other means - either a session manager
+such as "systemd --user", gnome-session or Upstart, or a wrapper
+for the user session like dbus-run-session(1).
+
+Related to dbus bug <https://bugs.freedesktop.org/show_bug.cgi?id=19997>.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=723506
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737380
+---
+ gio/gdbusaddress.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
+index ef807f6..bd37890 100644
+--- a/gio/gdbusaddress.c
++++ b/gio/gdbusaddress.c
+@@ -1038,6 +1038,13 @@ get_session_address_dbus_launch (GError **error)
+ goto out;
+ }
+
++ if (g_getenv ("DISPLAY") == NULL)
++ {
++ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
++ _("Cannot autolaunch D-Bus without X11 $DISPLAY"));
++ goto out;
++ }
++
+ /* We're using private libdbus facilities here. When everything
+ * (X11, Mac OS X, Windows) is spec'ed out correctly (not even the
+ * X11 property is correctly documented right now) we should
Added: desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch?rev=40456&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch [utf-8] Thu Feb 6 09:23:39 2014
@@ -0,0 +1,60 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 6 Feb 2014 08:09:56 +0000
+Subject: [PATCH] Don't use a parallel build for the documentation
+
+We seem to get a sporadic FTBFS in which it tries to scan
+Windows-specific symbols. Possibly caused by
+<https://bugzilla.gnome.org/show_bug.cgi?id=697940>.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737501
+---
+ docs/reference/gio/Makefile.am | 3 +++
+ docs/reference/gio/gdbus-object-manager-example/Makefile.am | 3 +++
+ docs/reference/glib/Makefile.am | 3 +++
+ docs/reference/gobject/Makefile.am | 3 +++
+ 4 files changed, 12 insertions(+)
+
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 112626b..ace4f29 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -1,3 +1,6 @@
++# Debian #737501
++.NOTPARALLEL:
++
+ NULL =
+
+ SUBDIRS = gdbus-object-manager-example
+diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+index 50b0f19..4053128 100644
+--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
++++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+@@ -1,3 +1,6 @@
++# Debian #737501
++.NOTPARALLEL:
++
+ NULL =
+
+ # The name of the module.
+diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
+index 2879607..002fb41 100644
+--- a/docs/reference/glib/Makefile.am
++++ b/docs/reference/glib/Makefile.am
+@@ -1,3 +1,6 @@
++# Debian #737501
++.NOTPARALLEL:
++
+ ## Process this file with automake to produce Makefile.in
+
+ AUTOMAKE_OPTIONS = 1.6
+diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
+index b3423f3..ce89a22 100644
+--- a/docs/reference/gobject/Makefile.am
++++ b/docs/reference/gobject/Makefile.am
+@@ -1,3 +1,6 @@
++# Debian #737501
++.NOTPARALLEL:
++
+ ## Process this file with automake to produce Makefile.in
+
+ AUTOMAKE_OPTIONS = 1.6
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=40456&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Feb 6 09:23:39 2014
@@ -13,3 +13,5 @@
skip-brokwn-dbus-appinfo-test.patch
valgrind_h_add_r0_to_the_clobber_list_on_PPC.patch
tests-move-param-implement-to-m-slow.patch
+Don-t-use-a-parallel-build-for-the-documentation.patch
+Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
More information about the pkg-gnome-commits
mailing list