diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-08 14:18:52 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-13 12:28:17 +0200 |
| commit | 47f7d287a09329734629cb9d194ef4e077117d79 (patch) | |
| tree | 45d04c9a5bce79b8179da7f410b9ce44b99fce98 /meta-gnome | |
| parent | 5a5ec1c0607466d0369170c7a3e25ca92d51ca1c (diff) | |
| download | meta-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>
Diffstat (limited to 'meta-gnome')
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 7d33778c66..f2128d8c39 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 \ PR = "r1" SECTION = "x11/gnome" -DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify gnome-keyring virtual/libx11 libxi intltool-native" +DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify libgnome-keyring virtual/libx11 libxi intltool-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" inherit 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 1bbfb17d9f..6fdb43472a 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 \ FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ ${libdir}/${BPN}/devel/.debug/ \ ${base_libdir}/security/.debug/" + +PNBLACKLIST[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 b0f5e3f05c..5b2235f165 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 @@ require gvfs.inc -DEPENDS = "libsoup-2.4 gnome-keyring glib-2.0 avahi gconf intltool-native" +DEPENDS = "libsoup-2.4 libgnome-keyring glib-2.0 avahi gconf intltool-native" # optional: obexftp libimobiledevice PR = "${INC_PR}.0" |