[meta-oe][meta-gnome][danny][PATCH 1/3] cheese: rename eds-dbus to evolution-data-server in DEPENDS

[meta-oe][meta-gnome][danny][PATCH 1/3] cheese: rename eds-dbus to evolution-data-server in DEPENDS

[Koen Kooi]

From: Martin Jansa <Martin.Jansa@gmail.com>

* was renamed in oe-core
  commit 6189a8a05620974c098d548c26502453f371fe26
  Author: Saul Wold <sgw@linux.intel.com>
  Date:   Thu Apr 19 17:26:01 2012 -0700

    evolation-data-server: Rename from eds-dbus

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index d6d61fd..4ac667b 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Take photos and videos with your webcam, with fun graphical effec
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
-DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop eds-dbus"
+DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server"
+
+PR = "r1"
 
 inherit gnome
 
-- 
1.8.1

[meta-oe][meta-gnome][danny][PATCH 2/3] cheese: disable scrollkeeper

[Koen Kooi]

From: Martin Jansa <Martin.Jansa@gmail.com>

* we don't provide scrollkeeper-native

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index 4ac667b..f447817 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
 DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
@@ -14,3 +14,4 @@ SRC_URI[archive.sha256sum] = "48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030
 FILES_${PN} += "${datadir}/dbus-1"
 RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta"
 
+EXTRA_OECONF += "--disable-scrollkeeper"
-- 
1.8.1

[meta-oe][meta-gnome][danny][PATCH 3/3] cheese: disable help build

[Koen Kooi]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index f447817..1e8a98b 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -15,3 +15,7 @@ FILES_${PN} += "${datadir}/dbus-1"
 RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta"
 
 EXTRA_OECONF += "--disable-scrollkeeper"
+
+do_configure_prepend() {
+	sed -i -e "s: help : :g" ${S}/Makefile.am
+}
-- 
1.8.1

Re: [meta-oe][meta-gnome][danny][PATCH 1/3] cheese: rename eds-dbus to evolution-data-server in DEPENDS

[Eric Bénard]

Le Wed, 16 Jan 2013 09:32:45 +0100,
Koen Kooi <koen@dominion.thruhere.net> a écrit :

> From: Martin Jansa <Martin.Jansa@gmail.com>
> 
> * was renamed in oe-core
>   commit 6189a8a05620974c098d548c26502453f371fe26
>   Author: Saul Wold <sgw@linux.intel.com>
>   Date:   Thu Apr 19 17:26:01 2012 -0700
> 
>     evolation-data-server: Rename from eds-dbus
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---

the 3 patches were pushed to danny-next.

Thanks,
Eric