r44293 - in /desktop/experimental/glib2.0/debian: changelog patches/gdbus-serialization-use-check_serialization-instead-.patch patches/series
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Mon May 4 12:15:22 UTC 2015
Author: smcv
Date: Mon May 4 12:15:22 2015
New Revision: 44293
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44293
Log:
d/p/gdbus-serialization-use-check_serialization-instead-.patch:
add patch to fix FTBFS in non-minimal environments (libdbus-1-dev
installed); the patch is not identical to the one from 2.44
due to upstream changes
Added:
desktop/experimental/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.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=44293&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon May 4 12:15:22 2015
@@ -7,6 +7,10 @@
* d/p/regex-test-do-not-assert-that-system-PCRE-still-has-.patch:
update to my latest version submitted upstream, which asserts that
a newer-than-8.32 system PCRE does not have the bug in question.
+ * d/p/gdbus-serialization-use-check_serialization-instead-.patch:
+ add patch to fix FTBFS in non-minimal environments (libdbus-1-dev
+ installed); the patch is not identical to the one from 2.44
+ due to upstream changes
-- Simon McVittie <smcv at debian.org> Mon, 04 May 2015 12:15:17 +0100
Added: desktop/experimental/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch?rev=44293&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-serialization-use-check_serialization-instead-.patch [utf-8] Mon May 4 12:15:22 2015
@@ -0,0 +1,78 @@
+From 9bfb82f7c11edff8d9601e0f6d7d54c043e93e2f Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Tue, 21 Apr 2015 20:46:47 +0100
+Subject: [PATCH] gdbus-serialization: use check_serialization() instead of
+ dbus-daemon
+
+This test originally did not connect to the bus, which meant it was
+omitted from commits like 415a8d81 that made sure none of GLib tests
+rely on the presence of an existing session bus. (In particular,
+Debian autobuilders don't have a session bus.)
+
+When test_double_array() was added, environments like the Debian
+autobuilders didn't catch the fact that this test relied on having a
+session bus, because it is often skipped in minimal environments
+due to its libdbus-1 dependency.
+
+We don't actually need to connect to a dbus-daemon here: it's enough
+to convert the message from GVariant to D-Bus serialization, and
+back into an in-memory representation through libdbus. That's what
+check_serialization() does, and I've verified that when I re-introduce
+bug #732754 by reverting commits 627b49b and 2268628 locally, this
+test still fails.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=744895
+Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+---
+ gio/tests/gdbus-serialization.c | 26 ++++++++------------------
+ 1 file changed, 8 insertions(+), 18 deletions(-)
+
+diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c
+index d01ab1f..a405189 100644
+--- a/gio/tests/gdbus-serialization.c
++++ b/gio/tests/gdbus-serialization.c
+@@ -1060,33 +1060,23 @@ message_parse_empty_arrays_of_arrays (void)
+ static void
+ test_double_array (void)
+ {
+- GDBusConnection *conn;
+- GError *error = NULL;
+ GVariantBuilder builder;
++ GVariant *body;
+
+ g_test_bug ("732754");
+
+- conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+- g_assert_no_error (error);
+-
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("ad"));
+ g_variant_builder_add (&builder, "d", (gdouble)0.0);
+ g_variant_builder_add (&builder, "d", (gdouble)8.0);
+ g_variant_builder_add (&builder, "d", (gdouble)22.0);
+ g_variant_builder_add (&builder, "d", (gdouble)0.0);
+-
+- /*
+- * Some versions of glib encoded arrays of doubles wrong. Here we send such
+- * a message and check that we didn't get bumped from the connection.
+- */
+- g_dbus_connection_call_sync (conn, "org.freedesktop.DBus", "/path",
+- "org.freedesktop.DBus", "InvalidNonExistantMethod",
+- g_variant_new ("(@ad)", g_variant_builder_end (&builder)),
+- NULL, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, &error);
+- g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD);
+- g_error_free (error);
+-
+- g_object_unref (conn);
++ body = g_variant_new ("(@ad)", g_variant_builder_end (&builder));
++ check_serialization (body,
++ "value 0: array:\n"
++ " double: 0.000000\n"
++ " double: 8.000000\n"
++ " double: 22.000000\n"
++ " double: 0.000000\n");
+ }
+
+ /* ---------------------------------------------------------------------------------------------------- */
+--
+2.1.4
+
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=44293&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon May 4 12:15:22 2015
@@ -18,3 +18,4 @@
skip-broken-timer-test.patch
regex-if-PCRE-is-8.34-or-later-disable-auto-possessi.patch
regex-test-do-not-assert-that-system-PCRE-still-has-.patch
+gdbus-serialization-use-check_serialization-instead-.patch
More information about the pkg-gnome-commits
mailing list