[Pkg-telepathy-commits] [folks] 15/15: debian/patches/next-unreviewed.patch: further changes for Telepathy 1.0
Simon McVittie
smcv at debian.org
Thu Mar 27 20:11:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch telepathy1
in repository folks.
commit eed6dcb5c77876c36295435432e890543fe853e7
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 18:52:57 2014 +0000
debian/patches/next-unreviewed.patch: further changes for Telepathy 1.0
---
debian/changelog | 3 +-
.../0001-Fix-TelepathyGLib-GIR-ABI-version.patch | 39 ---
...lepathy-contains-tp-lowlevel.c-so-it-need.patch | 31 ---
debian/patches/next-unreviewed.patch | 310 +++++++++++++++++++++
debian/patches/series | 3 +-
5 files changed, 313 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 572572c..ed4d453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-folks (0.9.6-2tp1.1) UNRELEASED; urgency=medium
+folks (0.9.6-2tp1.2) UNRELEASED; urgency=medium
* git-files.patch: add some missing files from upstream git so we can
apply patches that touch them
* debian/patches/master.patch: update to git master
* debian/patches/next.patch: update from git master to Telepathy 1.0
+ * debian/patches/next-unreviewed.patch: further changes for Telepathy 1.0
-- Simon McVittie <smcv at debian.org> Wed, 26 Mar 2014 17:53:22 +0000
diff --git a/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch b/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch
deleted file mode 100644
index 89e80e7..0000000
--- a/debian/patches/0001-Fix-TelepathyGLib-GIR-ABI-version.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a94e04c60ae12bb3f9828abd9466c7335040c855 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Wed, 26 Mar 2014 18:25:00 +0000
-Subject: [PATCH] Fix TelepathyGLib GIR ABI version
-
----
- backends/telepathy/lib/Makefile.am | 2 +-
- tests/lib/telepathy/contactlist/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
-index d476506..183ae30 100644
---- a/backends/telepathy/lib/Makefile.am
-+++ b/backends/telepathy/lib/Makefile.am
-@@ -234,7 +234,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
- #------------------------------------
- # TpLowlevel
- #------------------------------------
--TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
-+TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
- TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_CFLAGS = $(TP_GLIB_CFLAGS)
- TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_LIBS = libtp-lowlevel.la
- TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_FILES = $(libtp_lowlevel_la_SOURCES) $(tp_lowlevel_headers)
-diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
-index 14459f0..566fb38 100644
---- a/tests/lib/telepathy/contactlist/Makefile.am
-+++ b/tests/lib/telepathy/contactlist/Makefile.am
-@@ -75,7 +75,7 @@ INTROSPECTION_SCANNER_ENV = \
-
- tp-test-contactlist.gir: $(libtp_test_contactlist_la_SOURCES) \
- libtp-test-contactlist.la
--tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
-+tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
- tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS) $(TP_GLIB_DBUS_CFLAGS)
- tp_test_contactlist_gir_LIBS = libtp-test-contactlist.la
- tp_test_contactlist_gir_FILES = $(libtp_test_contactlist_la_SOURCES)
---
-1.9.1
-
diff --git a/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch b/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
deleted file mode 100644
index be53c65..0000000
--- a/debian/patches/0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8696bba77f47712bbdbb5123352a9a1fedaeab65 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Wed, 26 Mar 2014 18:38:45 +0000
-Subject: [PATCH] libfolks-telepathy contains tp-lowlevel.c, so it needs -dbus
- CFLAGS/LIBS
-
----
- backends/telepathy/lib/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
-index 183ae30..c931814 100644
---- a/backends/telepathy/lib/Makefile.am
-+++ b/backends/telepathy/lib/Makefile.am
-@@ -190,11 +190,13 @@ libfolks_telepathy_la_CPPFLAGS = \
- libfolks_telepathy_la_CFLAGS = \
- $(backend_library_cflags) \
- $(TP_GLIB_CFLAGS) \
-+ $(TP_GLIB_DBUS_CFLAGS) \
- $(NULL)
-
- libfolks_telepathy_la_LIBADD = \
- $(backend_library_libadd) \
- $(TP_GLIB_LIBS) \
-+ $(TP_GLIB_DBUS_LIBS) \
- $(NULL)
-
- if ENABLE_ZEITGEIST
---
-1.9.1
-
diff --git a/debian/patches/next-unreviewed.patch b/debian/patches/next-unreviewed.patch
new file mode 100644
index 0000000..45ddc59
--- /dev/null
+++ b/debian/patches/next-unreviewed.patch
@@ -0,0 +1,310 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 26 Mar 2014 11:32:28 +0000
+Subject: Update to my unreviewed 'next' (Telepathy 1.0) branch
+
+Generated-by: ( git log origin/next..next-gdbus; git diff --stat origin-next..next-gdbus; git diff origin/next..next-gdbus )
+
+commit def6cdb52d7fb27fc0c8348ef9e073089a9342b5
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-03-25 12:38:01 +0000
+
+ Telepathy tests no longer use a libdbus connection
+
+commit a6b7077719df8ca22226b2b1f70cd1e9f9365889
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-03-25 12:33:50 +0000
+
+ Telepathy test libs: use GDBusMethodInvocation
+
+ Automated:
+ git grep -lz DBusGMethodInvocation |
+ xargs -0 perl -pi -e 's/\bDBusGMethodInvocation\b/GDBusMethodInvocation/g'
+
+commit 8ef6553a9fb1043b9b7a2f74fa2e172adca19dd6
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-03-25 12:33:06 +0000
+
+ Telepathy test libs: use g_dbus_method_invocation_return_gerror
+
+ Automated:
+ git grep -lz dbus_g_method_return_error |
+ xargs -0 perl -pi -e 's/\bdbus_g_method_return_error\b/g_dbus_method_invocation_return_gerror/g'
+
+commit 8696bba77f47712bbdbb5123352a9a1fedaeab65
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-03-26 18:38:45 +0000
+
+ libfolks-telepathy contains tp-lowlevel.c, so it needs -dbus CFLAGS/LIBS
+
+commit a94e04c60ae12bb3f9828abd9466c7335040c855
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-03-26 18:25:00 +0000
+
+ Fix TelepathyGLib GIR ABI version
+ backends/telepathy/lib/Makefile.am | 4 +++-
+ tests/lib/telepathy/contactlist/Makefile.am | 2 +-
+ tests/lib/telepathy/contactlist/contacts-conn.c | 22 +++++++++++-----------
+ tests/lib/telepathy/contactlist/echo-chan.c | 2 +-
+ tests/lib/telepathy/contactlist/room-list-chan.c | 6 +++---
+ .../telepathy/contactlist/simple-account-manager.c | 4 ++--
+ tests/lib/telepathy/contactlist/simple-account.c | 2 +-
+ tests/lib/telepathy/contactlist/simple-conn.c | 2 +-
+ tests/lib/telepathy/test-case.vala | 11 -----------
+ 9 files changed, 23 insertions(+), 32 deletions(-)
+diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
+index d476506..c931814 100644
+--- a/backends/telepathy/lib/Makefile.am
++++ b/backends/telepathy/lib/Makefile.am
+@@ -190,11 +190,13 @@ libfolks_telepathy_la_CPPFLAGS = \
+ libfolks_telepathy_la_CFLAGS = \
+ $(backend_library_cflags) \
+ $(TP_GLIB_CFLAGS) \
++ $(TP_GLIB_DBUS_CFLAGS) \
+ $(NULL)
+
+ libfolks_telepathy_la_LIBADD = \
+ $(backend_library_libadd) \
+ $(TP_GLIB_LIBS) \
++ $(TP_GLIB_DBUS_LIBS) \
+ $(NULL)
+
+ if ENABLE_ZEITGEIST
+@@ -234,7 +236,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+ #------------------------------------
+ # TpLowlevel
+ #------------------------------------
+-TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
++TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_CFLAGS = $(TP_GLIB_CFLAGS)
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_LIBS = libtp-lowlevel.la
+ TpLowlevel_ at API_VERSION_MAJOR@_ at API_VERSION_MINOR@_gir_FILES = $(libtp_lowlevel_la_SOURCES) $(tp_lowlevel_headers)
+diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
+index 14459f0..566fb38 100644
+--- a/tests/lib/telepathy/contactlist/Makefile.am
++++ b/tests/lib/telepathy/contactlist/Makefile.am
+@@ -75,7 +75,7 @@ INTROSPECTION_SCANNER_ENV = \
+
+ tp-test-contactlist.gir: $(libtp_test_contactlist_la_SOURCES) \
+ libtp-test-contactlist.la
+-tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
++tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-1
+ tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS) $(TP_GLIB_DBUS_CFLAGS)
+ tp_test_contactlist_gir_LIBS = libtp-test-contactlist.la
+ tp_test_contactlist_gir_FILES = $(libtp_test_contactlist_la_SOURCES)
+diff --git a/tests/lib/telepathy/contactlist/contacts-conn.c b/tests/lib/telepathy/contactlist/contacts-conn.c
+index f8148c9..44030df 100644
+--- a/tests/lib/telepathy/contactlist/contacts-conn.c
++++ b/tests/lib/telepathy/contactlist/contacts-conn.c
+@@ -742,7 +742,7 @@ tp_tests_contacts_connection_set_default_contact_info (
+ static void
+ my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
+ const GArray *contacts,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (aliasing);
+ TpBaseConnection *base = TP_BASE_CONNECTION (aliasing);
+@@ -757,7 +757,7 @@ my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
+
+ if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error))
+ {
+- dbus_g_method_return_error (context, error);
++ g_dbus_method_invocation_return_gerror (context, error);
+ g_error_free (error);
+ return;
+ }
+@@ -787,7 +787,7 @@ my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
+ static void
+ my_set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
+ GHashTable *table,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (aliasing);
+ TpBaseConnection *base = TP_BASE_CONNECTION (aliasing);
+@@ -818,7 +818,7 @@ my_set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
+ /* Verify all handles are valid */
+ if (!tp_handles_are_valid (contact_repo, handles, FALSE, &error))
+ {
+- dbus_g_method_return_error (context, error);
++ g_dbus_method_invocation_return_gerror (context, error);
+ g_clear_error (&error);
+ goto out;
+ }
+@@ -851,7 +851,7 @@ init_aliasing (gpointer g_iface,
+ static void
+ my_request_avatars (TpSvcConnectionInterfaceAvatars1 *avatars,
+ const GArray *contacts,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (avatars);
+ TpBaseConnection *base = TP_BASE_CONNECTION (avatars);
+@@ -864,7 +864,7 @@ my_request_avatars (TpSvcConnectionInterfaceAvatars1 *avatars,
+
+ if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error))
+ {
+- dbus_g_method_return_error (context, error);
++ g_dbus_method_invocation_return_gerror (context, error);
+ g_error_free (error);
+ return;
+ }
+@@ -942,7 +942,7 @@ lookup_contact_info (TpTestsContactsConnection *self,
+ static void
+ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+ const GArray *contacts,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (obj);
+ TpBaseConnection *base = TP_BASE_CONNECTION (obj);
+@@ -955,7 +955,7 @@ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+
+ if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &error))
+ {
+- dbus_g_method_return_error (context, error);
++ g_dbus_method_invocation_return_gerror (context, error);
+ g_error_free (error);
+ return;
+ }
+@@ -977,7 +977,7 @@ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+ static void
+ my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+ guint handle,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (obj);
+ TpBaseConnection *base = TP_BASE_CONNECTION (obj);
+@@ -990,7 +990,7 @@ my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+
+ if (!tp_handle_is_valid (contact_repo, handle, &error))
+ {
+- dbus_g_method_return_error (context, error);
++ g_dbus_method_invocation_return_gerror (context, error);
+ g_error_free (error);
+ return;
+ }
+@@ -1006,7 +1006,7 @@ my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+ static void
+ my_set_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
+ const GPtrArray *info,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (obj);
+ TpBaseConnection *base = TP_BASE_CONNECTION (obj);
+diff --git a/tests/lib/telepathy/contactlist/echo-chan.c b/tests/lib/telepathy/contactlist/echo-chan.c
+index c5a6465..fd28e50 100644
+--- a/tests/lib/telepathy/contactlist/echo-chan.c
++++ b/tests/lib/telepathy/contactlist/echo-chan.c
+@@ -202,7 +202,7 @@ text_send (GObject *object,
+
+ static void
+ destroyable_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsEchoChannel *self = TP_TESTS_ECHO_CHANNEL (iface);
+
+diff --git a/tests/lib/telepathy/contactlist/room-list-chan.c b/tests/lib/telepathy/contactlist/room-list-chan.c
+index a71b29c..da1ecc2 100644
+--- a/tests/lib/telepathy/contactlist/room-list-chan.c
++++ b/tests/lib/telepathy/contactlist/room-list-chan.c
+@@ -209,7 +209,7 @@ find_rooms (gpointer data)
+
+ static void
+ room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsRoomListChan *self = TP_TESTS_ROOM_LIST_CHAN (chan);
+
+@@ -218,7 +218,7 @@ room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan,
+ GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
+ "Already listing" };
+
+- dbus_g_method_return_error (context, &error);
++ g_dbus_method_invocation_return_gerror (context, &error);
+ return;
+ }
+
+@@ -227,7 +227,7 @@ room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan,
+ GError error = { TP_ERROR, TP_ERROR_SERVICE_CONFUSED,
+ "Computer says no" };
+
+- dbus_g_method_return_error (context, &error);
++ g_dbus_method_invocation_return_gerror (context, &error);
+ return;
+ }
+
+diff --git a/tests/lib/telepathy/contactlist/simple-account-manager.c b/tests/lib/telepathy/contactlist/simple-account-manager.c
+index e5bddbc..767bce4 100644
+--- a/tests/lib/telepathy/contactlist/simple-account-manager.c
++++ b/tests/lib/telepathy/contactlist/simple-account-manager.c
+@@ -52,7 +52,7 @@ tp_tests_simple_account_manager_create_account (TpSvcAccountManager *svc,
+ const gchar *in_Display_Name,
+ GHashTable *in_Parameters,
+ GHashTable *in_Properties,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ TpTestsSimpleAccountManager *self = (TpTestsSimpleAccountManager *) svc;
+ const gchar *out = TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/lospolloshermanos";
+@@ -61,7 +61,7 @@ tp_tests_simple_account_manager_create_account (TpSvcAccountManager *svc,
+ if (!tp_strdiff (tp_asv_get_string (in_Parameters, "fail"), "yes"))
+ {
+ GError e = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "loldongs" };
+- dbus_g_method_return_error (context, &e);
++ g_dbus_method_invocation_return_gerror (context, &e);
+ return;
+ }
+
+diff --git a/tests/lib/telepathy/contactlist/simple-account.c b/tests/lib/telepathy/contactlist/simple-account.c
+index 7f9a629..7f0d568 100644
+--- a/tests/lib/telepathy/contactlist/simple-account.c
++++ b/tests/lib/telepathy/contactlist/simple-account.c
+@@ -92,7 +92,7 @@ static void
+ tp_tests_simple_account_update_parameters (TpSvcAccount *svc,
+ GHashTable *parameters,
+ const gchar **unset_parameters,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ GPtrArray *reconnect_required = g_ptr_array_new ();
+ GHashTableIter iter;
+diff --git a/tests/lib/telepathy/contactlist/simple-conn.c b/tests/lib/telepathy/contactlist/simple-conn.c
+index 0c716bd..4769f95 100644
+--- a/tests/lib/telepathy/contactlist/simple-conn.c
++++ b/tests/lib/telepathy/contactlist/simple-conn.c
+@@ -435,7 +435,7 @@ tp_tests_simple_connection_ensure_room_list_chan (TpTestsSimpleConnection *self,
+ static void
+ get_all (TpSvcDBusProperties *iface,
+ const gchar *interface_name,
+- DBusGMethodInvocation *context)
++ GDBusMethodInvocation *context)
+ {
+ GHashTable *values = tp_dbus_properties_mixin_dup_all (G_OBJECT (iface),
+ interface_name);
+diff --git a/tests/lib/telepathy/test-case.vala b/tests/lib/telepathy/test-case.vala
+index 28ff908..d6e1122 100644
+--- a/tests/lib/telepathy/test-case.vala
++++ b/tests/lib/telepathy/test-case.vala
+@@ -108,17 +108,6 @@ public class TpfTest.TestCase : Folks.TestCase
+ }
+
+ /**
+- * This test does use libdbus, via telepathy-glib.
+- */
+- public override bool uses_dbus_1
+- {
+- get
+- {
+- return true;
+- }
+- }
+-
+- /**
+ * Virtual method to create the keyfile backend. Currently called by
+ * the constructor (once per process), but might move into set_up() later.
+ *
diff --git a/debian/patches/series b/debian/patches/series
index c501b77..6e3e959 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
git-files.patch
master.patch
next.patch
-0001-Fix-TelepathyGLib-GIR-ABI-version.patch
-0001-libfolks-telepathy-contains-tp-lowlevel.c-so-it-need.patch
+next-unreviewed.patch
0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git
More information about the Pkg-telepathy-commits
mailing list