1 |
commit: e6875071015cb8e232ce7708fc7d7ed20eba09de |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 13 23:35:44 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 13 23:36:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6875071 |
7 |
|
8 |
gnome-base/libgnome-keyring: fix compatibility with vala:0.42 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/677834 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
.../files/3.12.0-vala-0.42-compat.patch | 25 ++++++++++++++++++++++ |
15 |
.../libgnome-keyring-3.12.0-r1.ebuild | 3 ++- |
16 |
2 files changed, 27 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..dd420c86732 |
21 |
--- /dev/null |
22 |
+++ b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001 |
25 |
+From: Rico Tzschichholz <ricotz@××××××.com> |
26 |
+Date: Tue, 8 Jan 2019 12:19:36 +0100 |
27 |
+Subject: [PATCH] Fix vapi build with vala 0.42 |
28 |
+ |
29 |
+--- |
30 |
+ library/GnomeKeyring-1.0.metadata | 2 +- |
31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata |
34 |
+index 04662fb..d8451b9 100644 |
35 |
+--- a/library/GnomeKeyring-1.0.metadata |
36 |
++++ b/library/GnomeKeyring-1.0.metadata |
37 |
+@@ -54,7 +54,7 @@ set_info skip=false |
38 |
+ set_network_password skip=false |
39 |
+ store_password skip=false |
40 |
+ store_password_sync skip=false |
41 |
+-unlock skip=false |
42 |
++@unlock skip=false |
43 |
+ |
44 |
+ find_items*.callback type_arguments="GnomeKeyring.Found" |
45 |
+ find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData" |
46 |
+-- |
47 |
+2.18.1 |
48 |
+ |
49 |
|
50 |
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
51 |
index 9ff7fcf6a72..7abe6cb9ccb 100644 |
52 |
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
53 |
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild |
54 |
@@ -1,4 +1,4 @@ |
55 |
-# Copyright 1999-2017 Gentoo Foundation |
56 |
+# Copyright 1999-2019 Gentoo Authors |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
|
59 |
EAPI="5" |
60 |
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND} |
61 |
" |
62 |
|
63 |
src_prepare() { |
64 |
+ epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch |
65 |
use vala && vala_src_prepare |
66 |
gnome2_src_prepare |