summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-10-27 16:48:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-02 16:18:28 +0000
commit60c3bd43949e9aa23af6f74656eb9a64b891bda6 (patch)
tree1db032749227210869a1fc72669aec3a0a118563 /meta/recipes-gnome/gnome
parenta59b113c6778afe247be79b99c84e6ef82c108cd (diff)
downloadpoky-60c3bd43949e9aa23af6f74656eb9a64b891bda6.tar.gz
recipes-gnome: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] (From OE-Core rev: d37944fff256e9f52d05a56db3edb42c7a352cce) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb6
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils.inc4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 4d77a14f81..f80c9104ed 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -7,7 +7,7 @@ POLKIT = "polkit"
7POLKIT_libc-uclibc = "" 7POLKIT_libc-uclibc = ""
8 8
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" 9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" 10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 11
12PR = "r12" 12PR = "r12"
13 13
@@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70
22S = "${WORKDIR}/GConf-${PV}" 22S = "${WORKDIR}/GConf-${PV}"
23 23
24POLKIT_OECONF = "--enable-defaults-service" 24POLKIT_OECONF = "--enable-defaults-service"
25POLKIT_OECONF_virtclass-native = "--disable-defaults-service" 25POLKIT_OECONF_class-native = "--disable-defaults-service"
26POLKIT_OECONF_libc-uclibc = "--disable-default-service" 26POLKIT_OECONF_libc-uclibc = "--disable-default-service"
27 27
28EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ 28EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
@@ -39,7 +39,7 @@ do_install_append() {
39 39
40# disable dbus-x11 when x11 isn't in DISTRO_FEATURES 40# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
41RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" 41RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
42RDEPENDS_${PN}_virtclass-native = "" 42RDEPENDS_${PN}_class-native = ""
43 43
44FILES_${PN} += "${libdir}/GConf/* \ 44FILES_${PN} += "${libdir}/GConf/* \
45 ${libdir}/gio/*/*.so \ 45 ${libdir}/gio/*/*.so \
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index b2570d6fd6..8ea0b96baf 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -1,6 +1,6 @@
1LICENSE = "GPLv2 & LGPLv2.1" 1LICENSE = "GPLv2 & LGPLv2.1"
2DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" 2DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
3DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native glib-2.0-native" 3DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
4 4
5inherit gnome gettext python-dir pythonnative 5inherit gnome gettext python-dir pythonnative
6 6
@@ -20,6 +20,6 @@ do_install_append_class-native () {
20FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*" 20FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
21 21
22RDEPENDS_${PN} = "bash" 22RDEPENDS_${PN} = "bash"
23RDEPENDS_${PN}_virtclass-native = "" 23RDEPENDS_${PN}_class-native = ""
24 24
25BBCLASSEXTEND = "native" 25BBCLASSEXTEND = "native"