[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.16.1-1-3-gcab8998

[Laurent Bigonville]

The following commit has been merged in the debian-experimental branch:
commit d9e861a7c26388500af1670b7a6486a873e46c95
Author: Laurent Bigonville <bigon at debian.org>
Date:   Wed Jul 6 17:12:18 2011 +0200

    debian/patches/fix-ftbfs-ia64.patch: Properly convert the GType with GSIZE_TO_POINTER, fix FTBFS on ia64 (Closes: #632326)

diff --git a/debian/changelog b/debian/changelog
index 57400b2..6ad9b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 telepathy-glib (0.15.2-4) UNRELEASED; urgency=low
 
+  [ Simon McVittie ]
   * Tag patches as applied upstream
 
- -- Simon McVittie <smcv at debian.org>  Fri, 01 Jul 2011 10:26:03 +0100
+  [ Laurent Bigonville ]
+  * debian/patches/fix-ftbfs-ia64.patch: Properly convert the GType with
+    GSIZE_TO_POINTER, fix FTBFS on ia64 (Closes: #632326)
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 06 Jul 2011 17:10:29 +0200
 
 telepathy-glib (0.15.2-3) unstable; urgency=low
 
diff --git a/debian/patches/fix-ftbfs-ia64.patch b/debian/patches/fix-ftbfs-ia64.patch
new file mode 100644
index 0000000..8514dd2
--- /dev/null
+++ b/debian/patches/fix-ftbfs-ia64.patch
@@ -0,0 +1,41 @@
+From 9bdfecb9e1ade99d1b86aedea87f6782ecfde283 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
+Date: Tue, 05 Jul 2011 17:13:23 +0000
+Subject: Properly convert the GType with GSIZE_TO_POINTER
+
+This caused the test to fail on IA64.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=38980
+---
+diff --git a/tests/dbus/connection-balance.c b/tests/dbus/connection-balance.c
+index 34d679b..4629cb1 100644
+--- a/tests/dbus/connection-balance.c
++++ b/tests/dbus/connection-balance.c
+@@ -223,7 +223,7 @@ setup (Test *test,
+ {
+   GError *error = NULL;
+   GQuark features[] = { TP_CONNECTION_FEATURE_CONNECTED, 0 };
+-  GType conn_type = GPOINTER_TO_UINT (data);
++  GType conn_type = GPOINTER_TO_SIZE (data);
+ 
+   g_type_init ();
+   tp_debug_set_flags ("all");
+@@ -415,13 +415,13 @@ main (int argc,
+   g_test_init (&argc, &argv, NULL);
+ 
+   g_test_add ("/conn/balance", Test,
+-      GUINT_TO_POINTER (TYPE_BALANCED_CONNECTION),
++      GSIZE_TO_POINTER (TYPE_BALANCED_CONNECTION),
+       setup, test_balance, teardown);
+   g_test_add ("/conn/balance-unknown", Test,
+-      GUINT_TO_POINTER (TYPE_UNBALANCED_CONNECTION),
++      GSIZE_TO_POINTER (TYPE_UNBALANCED_CONNECTION),
+       setup, test_balance_unknown, teardown);
+   g_test_add ("/conn/balance-unimplemented", Test,
+-      GUINT_TO_POINTER (TP_TESTS_TYPE_SIMPLE_CONNECTION),
++      GSIZE_TO_POINTER (TP_TESTS_TYPE_SIMPLE_CONNECTION),
+       setup, test_balance_unknown, teardown);
+ 
+   return g_test_run ();
+--
+cgit v0.9
diff --git a/debian/patches/series b/debian/patches/series
index a040dc8..1363fcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 contact-lists-test-timeout.patch
 0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
+fix-ftbfs-ia64.patch

-- 
telepathy-glib packaging