[gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnome-keyring/, gnome-base/libgnome-keyring/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnome-keyring/, gnome-base/libgnome-keyring/files/

[Mart Raudsepp]

commit:     e6875071015cb8e232ce7708fc7d7ed20eba09de
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 23:35:44 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 23:36:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6875071

gnome-base/libgnome-keyring: fix compatibility with vala:0.42

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

 .../files/3.12.0-vala-0.42-compat.patch            | 25 ++++++++++++++++++++++
 .../libgnome-keyring-3.12.0-r1.ebuild              |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..dd420c86732
--- /dev/null
+++ b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch
@@ -0,0 +1,25 @@
+From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 8 Jan 2019 12:19:36 +0100
+Subject: [PATCH] Fix vapi build with vala 0.42
+
+---
+ library/GnomeKeyring-1.0.metadata | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata
+index 04662fb..d8451b9 100644
+--- a/library/GnomeKeyring-1.0.metadata
++++ b/library/GnomeKeyring-1.0.metadata
+@@ -54,7 +54,7 @@ set_info skip=false
+ set_network_password skip=false
+ store_password skip=false
+ store_password_sync skip=false
+-unlock skip=false
++@unlock skip=false
+ 
+ find_items*.callback type_arguments="GnomeKeyring.Found"
+ find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData"
+-- 
+2.18.1
+

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
index 9ff7fcf6a72..7abe6cb9ccb 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch
 	use vala && vala_src_prepare
 	gnome2_src_prepare