dev-libs/folks: fix compatibility with vala-0.42+

Closes: https://bugs.gentoo.org/678384
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
new file mode 100644 (file)
index 0000000..21b0e44
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
@@ -0,0 +1,32 @@
+From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+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 <withnall@endlessm.com>
+---
+ 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<uint, ulong> hook_ids =
+-- 
+2.18.1
+

diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 9e8680df2222e9af2fa03584a66f46ee243491f9..9b5eebac778a96361a62344f8a56fded70354402 100644 (file)
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.40"
 
 inherit gnome2 vala virtualx
 
@@ -57,6 +56,10 @@ DEPEND="${COMMON_DEPEND}
                        >=dev-libs/glib-2.40:2 ) )
 "
 
+PATCHES=(
+       "${FILESDIR}"/${PV}-vala-0.42-compat.patch
+)
+
 src_prepare() {
        # Force re-generation of introspection files, otherwise it does not match installed libs
        find -name "*.vala" -exec touch {} \; || die