summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-04-27 16:22:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 08:56:18 (GMT)
commit630a645ed6fa1716e33c5f4e3d9499dcaf7b3707 (patch)
treecf4e62dde7cba948331676ec80338d7a86436d52
parente2f1638d9f1447064e56dcee84ad8f241ca2efa7 (diff)
downloadpoky-630a645ed6fa1716e33c5f4e3d9499dcaf7b3707.tar.gz
recipes: Replace gconf-dbus with gconf
Some distributions e.g. angstrom do not support gconf-dbus anymore since its now provided by gconf and in oe-core we have PREFERRED_PROVIDER_gconf tunable, here we replace all dependencies on gconf-dbus with gconf, which should work in both cases where poky defines PREFERRED_PROVIDER-gconf = "gconf-dbus" and for angstrom it is simply gconf Without this meta-toolchain-sdk ends up with conflicts in runqueue and does not build (From OE-Core rev: 3c04049516fe09969bbb9af501aae260f8ce4c91) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb2
-rw-r--r--meta/recipes-gnome/gnome/gnome-desktop.inc2
-rw-r--r--meta/recipes-gnome/gthumb/gthumb_2.12.2.bb2
-rw-r--r--meta/recipes-gnome/tasks/task-sdk-gmae.inc2
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.6.bb2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
index f2e4ec5..68e4eee 100644
--- a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
+++ b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "GNOME keyboard library" 1DESCRIPTION = "GNOME keyboard library"
2LICENSE = "LGPL" 2LICENSE = "LGPL"
3 3
4DEPENDS = "gconf-dbus dbus libxklavier gtk+" 4DEPENDS = "gconf dbus libxklavier gtk+"
5 5
6inherit gnome 6inherit gnome
7 7
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index 123f82d..336b87f 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "GNOME library for reading .desktop files" 1DESCRIPTION = "GNOME library for reading .desktop files"
2SECTION = "x11/gnome" 2SECTION = "x11/gnome"
3LICENSE = "GPLv2 & LGPLv2" 3LICENSE = "GPLv2 & LGPLv2"
4DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" 4DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
5 5
6EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" 6EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
7 7
diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb
index 0b3bd1a..258f2d5 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop"
2SECTION = "x11/gnome" 2SECTION = "x11/gnome"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff gst-plugins-base" 5DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
6PR = "r0" 6PR = "r0"
7 7
8EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" 8EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
index 586d76f..b24fc9e 100644
--- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc
+++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
@@ -4,7 +4,7 @@ SDK-GMAE = " \
4 gtk+-dev \ 4 gtk+-dev \
5 gstreamer-dev \ 5 gstreamer-dev \
6 bluez4-dev \ 6 bluez4-dev \
7 gconf-dbus-dev \ 7 gconf-dev \
8 avahi-dev \ 8 avahi-dev \
9 telepathy-glib-dev \ 9 telepathy-glib-dev \
10 eds-dbus-dev \ 10 eds-dbus-dev \
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
index 255cd5b..2e18065 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" 7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
8 8
9 9
10DEPENDS = "virtual/libx11 xmu gconf-dbus" 10DEPENDS = "virtual/libx11 xmu gconf"
11 11
12SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" 12SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
13 13