summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-10-08 14:18:52 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-13 12:28:17 +0200
commit47f7d287a09329734629cb9d194ef4e077117d79 (patch)
tree45d04c9a5bce79b8179da7f410b9ce44b99fce98
parent5a5ec1c0607466d0369170c7a3e25ca92d51ca1c (diff)
downloadmeta-openembedded-47f7d287a09329734629cb9d194ef4e077117d79.tar.gz
gnome-keyring: blacklist gnome-bluetooth, gvfs: try to build with libgnome-keyring only
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
index 7d33778c6..f2128d8c3 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
7PR = "r1" 7PR = "r1"
8 8
9SECTION = "x11/gnome" 9SECTION = "x11/gnome"
10DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify gnome-keyring virtual/libx11 libxi intltool-native" 10DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify libgnome-keyring virtual/libx11 libxi intltool-native"
11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" 11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
12 12
13inherit gnomebase gtk-icon-cache 13inherit gnomebase gtk-icon-cache
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
index 1bbfb17d9..6fdb43472 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
@@ -39,3 +39,5 @@ FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \
39FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ 39FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \
40 ${libdir}/${BPN}/devel/.debug/ \ 40 ${libdir}/${BPN}/devel/.debug/ \
41 ${base_libdir}/security/.debug/" 41 ${base_libdir}/security/.debug/"
42
43PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from oe-core"
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
index b0f5e3f05..5b2235f16 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
@@ -1,6 +1,6 @@
1require gvfs.inc 1require gvfs.inc
2 2
3DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf intltool-native" 3DEPENDS = "libsoup-2.4 libgnome-keyring glib-2.0 avahi gconf intltool-native"
4# optional: obexftp libimobiledevice 4# optional: obexftp libimobiledevice
5 5
6PR = "${INC_PR}.0" 6PR = "${INC_PR}.0"