diff -Nru folks-0.11.4/debian/changelog folks-0.11.4/debian/changelog --- folks-0.11.4/debian/changelog 2019-02-07 11:27:21.000000000 +0000 +++ folks-0.11.4/debian/changelog 2019-02-21 11:27:18.000000000 +0000 @@ -1,3 +1,11 @@ +folks (0.11.4-1ubuntv3) disco; urgency=medium + + * Cherry-pick build fixes from upstream for vala 0.43.x + * Actually rebuild all vala sources + * Update libfolks25.symbols + + -- Rico Tzschichholz Thu, 21 Feb 2019 12:27:18 +0100 + folks (0.11.4-1ubuntv2) disco; urgency=medium * No-change rebuild against latest evolution-data-server diff -Nru folks-0.11.4/debian/libfolks25.symbols folks-0.11.4/debian/libfolks25.symbols --- folks-0.11.4/debian/libfolks25.symbols 2017-07-03 16:59:12.000000000 +0000 +++ folks-0.11.4/debian/libfolks25.symbols 2019-02-21 11:27:18.000000000 +0000 @@ -213,7 +213,6 @@ folks_interaction_details_get_type@Base 0.7.2.2 folks_internal_equal_sets@Base 0.6.4.1 folks_internal_profiling_end@Base 0.7.2.2 - folks_internal_profiling_markv@Base 0.9.6 folks_internal_profiling_point@Base 0.7.2.2 folks_internal_profiling_start@Base 0.7.2.2 folks_local_id_details_change_local_ids@Base 0.6.2 diff -Nru folks-0.11.4/debian/patches/0001-inspect-Adapt-to-binding-change-of-Signal.add_emissi.patch folks-0.11.4/debian/patches/0001-inspect-Adapt-to-binding-change-of-Signal.add_emissi.patch --- folks-0.11.4/debian/patches/0001-inspect-Adapt-to-binding-change-of-Signal.add_emissi.patch 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.11.4/debian/patches/0001-inspect-Adapt-to-binding-change-of-Signal.add_emissi.patch 2019-02-21 11:27:18.000000000 +0000 @@ -0,0 +1,32 @@ +From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Fri, 23 Mar 2018 17:55:11 +0100 +Subject: [PATCH] inspect: Adapt to binding change of + Signal.add_emission_hook() in vala 0.41 + +https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35 + +Reviewed-by: Philip Withnall +--- + tools/inspect/signal-manager.vala | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala +index 4d1b6480..7c5b17a0 100644 +--- a/tools/inspect/signal-manager.vala ++++ b/tools/inspect/signal-manager.vala +@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object + return false; + + ulong hook_id = Signal.add_emission_hook (signal_id, ++#if VALA_0_42 ++ detail_quark, this.emission_hook_cb); ++#else + detail_quark, this.emission_hook_cb, null); ++#endif + + /* Store the hook ID so we can list or remove it later */ + HashMap hook_ids = +-- +2.20.1 + diff -Nru folks-0.11.4/debian/patches/0002-tests-Use-FileAttribute.-enumeration.patch folks-0.11.4/debian/patches/0002-tests-Use-FileAttribute.-enumeration.patch --- folks-0.11.4/debian/patches/0002-tests-Use-FileAttribute.-enumeration.patch 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.11.4/debian/patches/0002-tests-Use-FileAttribute.-enumeration.patch 2019-02-21 11:12:35.000000000 +0000 @@ -0,0 +1,39 @@ +From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 30 May 2018 14:20:27 +0200 +Subject: [PATCH] tests: Use FileAttribute.* enumeration + +--- + tests/folks/avatar-cache.vala | 2 +- + tests/folks/object-cache.vala | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala +index d25245c0..ee32e9e4 100644 +--- a/tests/folks/avatar-cache.vala ++++ b/tests/folks/avatar-cache.vala +@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase + { + // Delete the files in the directory + var enumerator = +- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, ++ dir.enumerate_children (FileAttribute.STANDARD_NAME, + FileQueryInfoFlags.NONE); + + FileInfo? file_info = enumerator.next_file (); +diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala +index 62d208e6..f2a5188d 100644 +--- a/tests/folks/object-cache.vala ++++ b/tests/folks/object-cache.vala +@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase + { + // Delete the files in the directory + var enumerator = +- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, ++ dir.enumerate_children (FileAttribute.STANDARD_NAME, + FileQueryInfoFlags.NONE); + + FileInfo? file_info = enumerator.next_file (); +-- +2.20.1 + diff -Nru folks-0.11.4/debian/patches/0003-Fix-type-argument-mismatches-related-to-GLib.Generic.patch folks-0.11.4/debian/patches/0003-Fix-type-argument-mismatches-related-to-GLib.Generic.patch --- folks-0.11.4/debian/patches/0003-Fix-type-argument-mismatches-related-to-GLib.Generic.patch 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.11.4/debian/patches/0003-Fix-type-argument-mismatches-related-to-GLib.Generic.patch 2019-02-21 11:12:41.000000000 +0000 @@ -0,0 +1,59 @@ +From 5ca9ad02a48f45a9367b24fb4a248845bf8482f6 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Mon, 5 Nov 2018 15:17:07 +0100 +Subject: [PATCH] Fix type-argument mismatches related to + GLib.GenericArray/List + +--- + backends/bluez/bluez-persona.vala | 4 ++-- + backends/telepathy/lib/tpf-persona-store.vala | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/backends/bluez/bluez-persona.vala b/backends/bluez/bluez-persona.vala +index 12fd8773..7d0fdc4d 100644 +--- a/backends/bluez/bluez-persona.vala ++++ b/backends/bluez/bluez-persona.vala +@@ -265,7 +265,7 @@ public class Folks.Backends.BlueZ.Persona : Folks.Persona, + /* Parse the attributes by iterating over the vCard’s attribute list once + * only. Convenience functions like E.VCard.get_attribute() cause multiple + * iterations over the list. */ +- unowned GLib.List attrs = ++ unowned GLib.List attrs = + card.get_attributes (); + + foreach (var attr in attrs) +@@ -314,7 +314,7 @@ public class Folks.Backends.BlueZ.Persona : Folks.Persona, + new_nickname = attr.get_value (); + else if (attr_name == "N") + { +- unowned GLib.List values = attr.get_values (); ++ unowned GLib.List values = attr.get_values (); + unowned string? family_name = null, given_name = null, + additional_names = null, prefixes = null, suffixes = null; + +diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala +index ef2e9ca1..510c0bac 100644 +--- a/backends/telepathy/lib/tpf-persona-store.vala ++++ b/backends/telepathy/lib/tpf-persona-store.vala +@@ -1173,15 +1173,15 @@ public class Tpf.PersonaStore : Folks.PersonaStore + + this._conn.contact_list_changed.connect (this._contact_list_changed_cb); + this._contact_list_changed_cb (this._conn.dup_contact_list (), +- new GLib.GenericArray ()); ++ new GLib.GenericArray ()); + + this._got_initial_members = true; + this._populate_counters.begin (); + this._notify_if_is_quiescent (); + } + +- private void _contact_list_changed_cb (GLib.GenericArray added, +- GLib.GenericArray removed) ++ private void _contact_list_changed_cb (GLib.GenericArray added, ++ GLib.GenericArray removed) + { + var personas_added = new HashSet (); + var personas_removed = new HashSet (); +-- +2.20.1 + diff -Nru folks-0.11.4/debian/patches/series folks-0.11.4/debian/patches/series --- folks-0.11.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.11.4/debian/patches/series 2019-02-21 11:27:18.000000000 +0000 @@ -0,0 +1,3 @@ +0001-inspect-Adapt-to-binding-change-of-Signal.add_emissi.patch +0002-tests-Use-FileAttribute.-enumeration.patch +0003-Fix-type-argument-mismatches-related-to-GLib.Generic.patch diff -Nru folks-0.11.4/debian/rules folks-0.11.4/debian/rules --- folks-0.11.4/debian/rules 2017-07-03 16:59:12.000000000 +0000 +++ folks-0.11.4/debian/rules 2019-02-21 11:27:18.000000000 +0000 @@ -20,6 +20,10 @@ --disable-ofono-backend --disable-bluez-backend \ --disable-fatal-warnings +override_dh_auto_build: + find . -name *_vala.stamp -print -delete + dh_auto_build + override_dh_strip: dh_strip -plibfolks25 --dbgsym-migration='libfolks-dbg (<< 0.11.2)' dh_strip -plibfolks-telepathy25 --dbgsym-migration='libfolks-telepathy-dbg (<< 0.11.2)'