| 1 |
commit: 74532d57375250a9f3e1b71bbe825cc273f741c6 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 24 09:28:06 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 24 09:28:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74532d57 |
| 7 |
|
| 8 |
dev-libs/folks: fix compatibility with vala-0.42+ |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/678384 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/folks/files/0.11.4-vala-0.42-compat.patch | 32 ++++++++++++++++++++++ |
| 15 |
dev-libs/folks/folks-0.11.4-r1.ebuild | 5 +++- |
| 16 |
2 files changed, 36 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..21b0e44ab96 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch |
| 23 |
@@ -0,0 +1,32 @@ |
| 24 |
+From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Rico Tzschichholz <ricotz@××××××.com> |
| 26 |
+Date: Fri, 23 Mar 2018 17:55:11 +0100 |
| 27 |
+Subject: [PATCH] inspect: Adapt to binding change of |
| 28 |
+ Signal.add_emission_hook() in vala 0.41 |
| 29 |
+ |
| 30 |
+https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35 |
| 31 |
+ |
| 32 |
+Reviewed-by: Philip Withnall <withnall@××××××××.com> |
| 33 |
+--- |
| 34 |
+ tools/inspect/signal-manager.vala | 4 ++++ |
| 35 |
+ 1 file changed, 4 insertions(+) |
| 36 |
+ |
| 37 |
+diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala |
| 38 |
+index 4d1b6480..7c5b17a0 100644 |
| 39 |
+--- a/tools/inspect/signal-manager.vala |
| 40 |
++++ b/tools/inspect/signal-manager.vala |
| 41 |
+@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object |
| 42 |
+ return false; |
| 43 |
+ |
| 44 |
+ ulong hook_id = Signal.add_emission_hook (signal_id, |
| 45 |
++#if VALA_0_42 |
| 46 |
++ detail_quark, this.emission_hook_cb); |
| 47 |
++#else |
| 48 |
+ detail_quark, this.emission_hook_cb, null); |
| 49 |
++#endif |
| 50 |
+ |
| 51 |
+ /* Store the hook ID so we can list or remove it later */ |
| 52 |
+ HashMap<uint, ulong> hook_ids = |
| 53 |
+-- |
| 54 |
+2.18.1 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild |
| 58 |
index 9e8680df222..9b5eebac778 100644 |
| 59 |
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild |
| 60 |
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild |
| 61 |
@@ -4,7 +4,6 @@ |
| 62 |
EAPI=6 |
| 63 |
GNOME2_LA_PUNT="yes" |
| 64 |
VALA_USE_DEPEND="vapigen" |
| 65 |
-VALA_MAX_API_VERSION="0.40" |
| 66 |
|
| 67 |
inherit gnome2 vala virtualx |
| 68 |
|
| 69 |
@@ -57,6 +56,10 @@ DEPEND="${COMMON_DEPEND} |
| 70 |
>=dev-libs/glib-2.40:2 ) ) |
| 71 |
" |
| 72 |
|
| 73 |
+PATCHES=( |
| 74 |
+ "${FILESDIR}"/${PV}-vala-0.42-compat.patch |
| 75 |
+) |
| 76 |
+ |
| 77 |
src_prepare() { |
| 78 |
# Force re-generation of introspection files, otherwise it does not match installed libs |
| 79 |
find -name "*.vala" -exec touch {} \; || die |
Archives