CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-keyring: blacklist gnome-bluetooth, gvfs: try to build with libgnome-keyring only

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2015-10-08 14:18:52 +02:00
parent 5a5ec1c060
commit 47f7d287a0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
View File

@ -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

2
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
View File

@ -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"

2
meta-gnome/recipes-gnome/gvfs/gvfs_1.10.1.bb
View File

@ -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"