[oe] [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5

[Martin Jansa]

On Tue, May 05, 2015 at 12:09:11PM -0700, Khem Raj wrote:
> bluez4 is removed from oe-core
> this needs runtime testing

Please send v2 with PNBLACKLISTs removal once the runtime testing is
done.

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  meta-gnome/recipes-connectivity/obex/obexd_0.48.bb                 | 4 ++--
>  meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 2 +-
>  meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb        | 3 +--
>  meta-oe/recipes-connectivity/obex/openobex_1.5.bb                  | 2 +-
>  4 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> index f28f77b..02b364e 100644
> --- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> +++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> @@ -1,7 +1,7 @@
>  SUMMARY = "OBEX Server and Client"
>  # obexd was integrated into bluez5
> -DEPENDS = "glib-2.0 dbus bluez4 libical"
> -RCONFLICTS_${PN} = "bluez5"
> +DEPENDS = "glib-2.0 dbus bluez5 libical"
> +#RCONFLICTS_${PN} = "bluez5"
>  
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
> 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 8711b8a..ddc78e6 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 bluez4 gnome-keyring virtual/libx11 libxi intltool-native"
> +DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez5 gnome-keyring virtual/libx11 libxi intltool-native"
>  
>  inherit gnomebase gtk-icon-cache
>  
> diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> index afe6106..8bb5374 100644
> --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> @@ -2,8 +2,7 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  
> -DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
> -RCONFLICTS_${PN} = "bluez5"
> +DEPENDS = "gtk+ bluez5 dbus-glib imagemagick openobex"
>  
>  SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
>  SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
> diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> index b07779d..f4744c0 100644
> --- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> +++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
>  Object Exchange (OBEX) protocol."
>  HOMEPAGE = "http://openobex.triq.net"
>  SECTION = "libs"
> -DEPENDS = "virtual/libusb0 bluez4"
> +DEPENDS = "virtual/libusb0 bluez5"
>  LICENSE = "GPLv2 & LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
>                      file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com