summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-02-14 01:35:44 +0200
committerMart Raudsepp <leio@gentoo.org>2019-02-14 01:36:10 +0200
commite6875071015cb8e232ce7708fc7d7ed20eba09de (patch)
tree32f171b0c8939de454185a69887088ed3dcd5f1b
parentapp-arch/gcab-1.2: use xdg.eclass for environment reset (diff)
downloadgentoo-e6875071015cb8e232ce7708fc7d7ed20eba09de.tar.gz
gentoo-e6875071015cb8e232ce7708fc7d7ed20eba09de.tar.bz2
gentoo-e6875071015cb8e232ce7708fc7d7ed20eba09de.zip
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@gentoo.org>
-rw-r--r--gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch25
-rw-r--r--gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild3
2 files changed, 27 insertions, 1 deletions
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 000000000000..dd420c86732e
--- /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 9ff7fcf6a720..7abe6cb9ccbb 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