r40508 - in /desktop/experimental/glib2.0/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Feb 16 09:45:32 UTC 2014
Author: pochu
Date: Sun Feb 16 09:45:32 2014
New Revision: 40508
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40508
Log:
* debian/patches/*:
+ Refreshed.
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch
desktop/experimental/glib2.0/debian/patches/gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch
desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sun Feb 16 09:45:32 2014
@@ -14,6 +14,8 @@
* d/p/0001-glib-tests-collate.c-run-to-completion-when-skipping.patch,
d/p/0002-g_test_run-return-0-if-all-tests-are-skipped-in-TAP-.patch:
+ Add patches from upstream to fix test suite errors.
+ * debian/patches/*:
+ + Refreshed.
-- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 16 Feb 2014 00:45:50 +0100
Modified: desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -4,8 +4,6 @@
## Bug: bug URL
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: b/glib/gkeyfile.c
-===================================================================
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -445,6 +445,7 @@
@@ -135,11 +133,9 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: b/glib/gkeyfile.h
-===================================================================
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
-@@ -307,6 +307,9 @@
+@@ -310,6 +310,9 @@
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
#define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions"
Modified: desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -4,7 +4,7 @@
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
-@@ -1208,11 +1208,13 @@
+@@ -1202,11 +1202,13 @@
return;
}
Modified: desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -33,21 +33,20 @@
<refsect2 id="setlocale">
--- a/glib/gutils.c
+++ b/glib/gutils.c
-@@ -872,6 +872,13 @@
- * should either directly check the <envar>HOME</envar> environment
- * variable yourself or unset it before calling any functions in GLib.
- * </para></note>
-+ * <note><para>
-+ * When the pre-2.36 behaviour was in effect, Debian provided the
-+ * <envar>G_HOME</envar> environment variable for testing and development
-+ * purposes. This is now unnecessary as <envar>HOME</envar> can be used
-+ * directly, but is retained for compatibility. It is deprecated and will be
-+ * removed in a future release.
-+ * </para></note>
+@@ -809,6 +809,12 @@
+ * should either directly check the <envar>HOME</envar> environment
+ * variable yourself or unset it before calling any functions in GLib.
*
++ * When the pre-2.36 behaviour was in effect, Debian provided the
++ * <envar>G_HOME</envar> environment variable for testing and development
++ * purposes. This is now unnecessary as <envar>HOME</envar> can be used
++ * directly, but is retained for compatibility. It is deprecated and will be
++ * removed in a future release.
++ *
* Returns: the current user's home directory
*/
-@@ -885,7 +892,9 @@
+ const gchar *
+@@ -821,7 +827,9 @@
gchar *tmp;
/* We first check HOME and use it if it is set */
Modified: desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -11,8 +11,6 @@
gio/tests/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
-Index: b/glib.mk
-===================================================================
--- a/glib.mk
+++ b/glib.mk
@@ -2,7 +2,7 @@
@@ -24,17 +22,15 @@
GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
NULL =
-Index: b/gio/tests/Makefile.am
-===================================================================
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -4,6 +4,9 @@
+@@ -5,6 +5,9 @@
- SUBDIRS = gdbus-object-manager-example services
+ SUBDIRS = gdbus-object-manager-example services modules
+# Some tests need a dbus session
+GTESTER_ENV = dbus-launch
+
LDADD = \
- $(top_builddir)/glib/libglib-2.0.la \
+ $(top_builddir)/gio/libgio-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
Modified: desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -2,11 +2,9 @@
Author: Martin Pitt <martin.pitt at ubuntu.com>
Forwarded: No, Debian buildd specific
-Index: b/glib/tests/thread.c
-===================================================================
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
-@@ -144,9 +144,11 @@
+@@ -141,9 +141,11 @@
getrlimit (RLIMIT_NPROC, &nl);
nl.rlim_cur = 1;
Modified: desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -2,11 +2,9 @@
Author: Martin Pitt <martin.pitt at ubuntu.com>
Forwarded: No
-Index: b/gio/tests/socket.c
-===================================================================
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
-@@ -838,7 +838,9 @@
+@@ -984,7 +984,9 @@
g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
#endif
g_test_add_func ("/socket/close_graceful", test_close_graceful);
@@ -16,11 +14,9 @@
g_test_add_func ("/socket/address", test_sockaddr);
#ifdef G_OS_UNIX
g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);
-Index: b/glib/tests/mainloop.c
-===================================================================
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
-@@ -1405,11 +1405,15 @@
+@@ -1524,11 +1524,15 @@
g_test_add_func ("/maincontext/basic", test_maincontext_basic);
g_test_add_func ("/mainloop/basic", test_mainloop_basic);
@@ -36,11 +32,9 @@
g_test_add_func ("/mainloop/swapping_child_sources", test_swapping_child_sources);
g_test_add_func ("/mainloop/blocked_child_sources", test_blocked_child_sources);
g_test_add_func ("/mainloop/source_time", test_source_time);
-Index: b/glib/tests/timeout.c
-===================================================================
--- a/glib/tests/timeout.c
+++ b/glib/tests/timeout.c
-@@ -102,7 +102,9 @@
+@@ -104,7 +104,9 @@
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/timeout/seconds", test_seconds);
@@ -50,8 +44,6 @@
return g_test_run ();
}
-Index: b/gio/tests/gdbus-threading.c
-===================================================================
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -406,7 +406,9 @@
@@ -62,5 +54,5 @@
g_assert_cmpint (elapsed_msec, <, 8000);
+#endif
- g_print (" ");
- }
+ if (!g_test_quiet ())
+ g_print (" ");
Modified: desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -1,6 +1,6 @@
--- a/glib/gutils.c
+++ b/glib/gutils.c
-@@ -2386,6 +2386,12 @@
+@@ -2315,6 +2315,12 @@
#endif
Modified: desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -5,11 +5,9 @@
to add the missing prototype is http://bugs.debian.org/703545,
we can remove this hack when that is fixed.
-Index: b/glib/gthread-posix.c
-===================================================================
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
-@@ -633,6 +633,12 @@
+@@ -630,6 +630,12 @@
/* {{{1 GCond */
Modified: desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -1,8 +1,8 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -995,6 +995,9 @@
+@@ -960,6 +960,9 @@
AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat fallocate)
- # Check for high-resolution sleep functions
+ case $host_os in aix*) ac_cv_func_splice=no ;; esac # AIX splice() is something else
AC_CHECK_FUNCS(splice)
+AC_CHECK_DECLS([prlimit], [], [], [[
+#include <sys/time.h>
@@ -10,11 +10,9 @@
AC_CHECK_FUNCS(prlimit)
# To avoid finding a compatibility unusable statfs, which typically
-Index: b/glib/tests/thread.c
-===================================================================
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
-@@ -130,7 +130,7 @@
+@@ -127,7 +127,7 @@
static void
test_thread4 (void)
{
Modified: desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -1,9 +1,9 @@
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -1037,6 +1037,8 @@
+@@ -1049,6 +1049,8 @@
+ module_dir = GIO_MODULE_DIR;
- /* Then load the compiled in path */
- g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
+ g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
+ /* Hard-coded fallback directory for pre-multiarch compatibility */
+ g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
Modified: 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=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -53,11 +53,9 @@
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)
+@@ -1036,6 +1036,13 @@
goto out;
}
Modified: desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -16,11 +16,9 @@
gio/gdbusprivate.c | 75 +++++++++++++++++++++++++++---------------------------
1 file changed, 38 insertions(+), 37 deletions(-)
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index 0e5bef2..32f8a00 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
-@@ -340,6 +340,8 @@ typedef enum {
+@@ -335,6 +335,8 @@
PENDING_CLOSE
} OutputPending;
@@ -29,7 +27,7 @@
struct GDBusWorker
{
volatile gint ref_count;
-@@ -581,7 +583,10 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
+@@ -576,7 +578,10 @@
/* If already stopped, don't even process the reply */
if (g_atomic_int_get (&worker->stopped))
@@ -41,7 +39,7 @@
error = NULL;
if (worker->socket == NULL)
-@@ -676,21 +681,16 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
+@@ -671,21 +676,16 @@
* if the GDBusConnection tells us to close (either via
* _g_dbus_worker_stop, which is called on last-unref, or directly),
* so a cancelled read must mean our connection was closed locally.
@@ -71,7 +69,7 @@
g_error_free (error);
goto out;
-@@ -819,6 +819,13 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
+@@ -814,6 +814,13 @@
out:
g_mutex_unlock (&worker->read_lock);
@@ -85,7 +83,7 @@
/* gives up the reference acquired when calling g_input_stream_read_async() */
_g_dbus_worker_unref (worker);
}
-@@ -827,8 +834,8 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
+@@ -822,8 +829,8 @@
static void
_g_dbus_worker_do_read_unlocked (GDBusWorker *worker)
{
@@ -96,7 +94,7 @@
*/
/* if bytes_wanted is zero, it means start reading a message */
-@@ -1149,8 +1156,6 @@ write_message_finish (GAsyncResult *res,
+@@ -1144,8 +1151,6 @@
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -105,7 +103,7 @@
typedef struct
{
GDBusWorker *worker;
-@@ -1449,12 +1454,15 @@ continue_writing (GDBusWorker *worker)
+@@ -1444,12 +1449,15 @@
/* if we want to close the connection, that takes precedence */
if (worker->pending_close_attempts != NULL)
{
@@ -126,7 +124,7 @@
}
else
{
-@@ -1562,7 +1570,6 @@ continue_writing_in_idle_cb (gpointer user_data)
+@@ -1557,7 +1565,6 @@
/*
* @write_data: (transfer full) (allow-none):
* @flush_data: (transfer full) (allow-none):
@@ -134,7 +132,7 @@
*
* Can be called from any thread
*
-@@ -1572,8 +1579,7 @@ continue_writing_in_idle_cb (gpointer user_data)
+@@ -1567,8 +1574,7 @@
static void
schedule_writing_unlocked (GDBusWorker *worker,
MessageToWriteData *write_data,
@@ -144,7 +142,7 @@
{
if (write_data != NULL)
g_queue_push_tail (worker->write_queue, write_data);
-@@ -1581,10 +1587,6 @@ schedule_writing_unlocked (GDBusWorker *worker,
+@@ -1576,10 +1582,6 @@
if (flush_data != NULL)
worker->write_pending_flushes = g_list_prepend (worker->write_pending_flushes, flush_data);
@@ -155,7 +153,7 @@
/* If we had output pending, the next bit of output will happen
* automatically when it finishes, so we only need to do this
* if nothing was pending.
-@@ -1632,7 +1634,7 @@ _g_dbus_worker_send_message (GDBusWorker *worker,
+@@ -1627,7 +1629,7 @@
data->blob_size = blob_len;
g_mutex_lock (&worker->write_lock);
@@ -164,7 +162,7 @@
g_mutex_unlock (&worker->write_lock);
}
-@@ -1712,13 +1714,12 @@ _g_dbus_worker_close (GDBusWorker *worker,
+@@ -1707,13 +1709,12 @@
(cancellable == NULL ? NULL : g_object_ref (cancellable));
close_data->result = (result == NULL ? NULL : g_object_ref (result));
@@ -182,7 +180,7 @@
}
/* This can be called from any thread - frees worker. Note that
-@@ -1788,7 +1789,7 @@ _g_dbus_worker_flush_sync (GDBusWorker *worker,
+@@ -1783,7 +1784,7 @@
data->number_to_wait_for = worker->write_num_messages_written + pending_writes;
g_mutex_lock (&data->mutex);
Modified: desktop/experimental/glib2.0/debian/patches/gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -13,12 +13,10 @@
gio/tests/gdbus-connection.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
-diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
-index 9cd1e10..62edaa2 100644
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.c
-@@ -1093,10 +1093,13 @@ send_bogus_message (GDBusConnection *c, guint32 *out_serial)
- g_assert_no_error (error);
+@@ -1100,10 +1100,13 @@
+ g_object_unref (m);
}
+#define SLEEP_USEC (100 * 1000)
@@ -31,7 +29,7 @@
/* No calls on this thread yet */
g_assert_cmpint (g_dbus_connection_get_last_serial(c), ==, 0);
-@@ -1105,8 +1108,15 @@ serials_thread_func (GDBusConnection *c)
+@@ -1112,8 +1115,15 @@
message_serial = 0;
send_bogus_message (c, &message_serial);
Modified: desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -13,11 +13,9 @@
gio/tests/gdbus-threading.c | 27 ++++++++++++++++++++++-----
2 files changed, 47 insertions(+), 8 deletions(-)
-diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
-index ed4142d..1adbc15 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.c
-@@ -58,11 +58,20 @@ on_timeout (gpointer user_data)
+@@ -56,11 +56,20 @@
return FALSE; /* remove source */
}
@@ -38,7 +36,7 @@
error = NULL;
proxy = g_dbus_proxy_new_sync (c,
-@@ -75,6 +84,22 @@ test_connection_loss (void)
+@@ -73,6 +82,22 @@
&error);
g_assert_no_error (error);
@@ -61,7 +59,7 @@
error = NULL;
g_dbus_proxy_call (proxy,
"Sleep",
-@@ -126,9 +151,6 @@ main (int argc,
+@@ -124,9 +149,6 @@
g_assert (g_spawn_command_line_async (path, NULL));
g_free (path);
@@ -71,11 +69,9 @@
/* Create the connection in the main thread */
error = NULL;
c = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
-index 5851114..0836365 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
-@@ -412,6 +412,13 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
+@@ -415,6 +415,13 @@
}
}
@@ -89,7 +85,7 @@
static void
test_method_calls_in_thread (void)
{
-@@ -419,6 +426,7 @@ test_method_calls_in_thread (void)
+@@ -422,6 +429,7 @@
GDBusConnection *connection;
GError *error;
gchar *name_owner;
@@ -97,7 +93,7 @@
error = NULL;
connection = g_bus_get_sync (G_BUS_TYPE_SESSION,
-@@ -436,8 +444,20 @@ test_method_calls_in_thread (void)
+@@ -439,8 +447,20 @@
&error);
g_assert_no_error (error);
@@ -120,7 +116,7 @@
g_free (name_owner);
test_method_calls_on_proxy (proxy);
-@@ -592,9 +612,6 @@ main (int argc,
+@@ -598,9 +618,6 @@
g_assert (g_spawn_command_line_async (path, NULL));
g_free (path);
Modified: desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch?rev=40508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] Sun Feb 16 09:45:32 2014
@@ -2,11 +2,9 @@
Author: Iain Lane <laney at debian.org>
Forwarded: yes (desrt)
-Index: b/gio/tests/Makefile.am
-===================================================================
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -315,7 +315,6 @@
+@@ -388,7 +388,6 @@
test_programs += \
actions \
More information about the pkg-gnome-commits
mailing list