summaryrefslogtreecommitdiffstats
path: root/meta/recipes-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
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')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb6
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb6
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils.inc4
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.8.bb4
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.32.1.bb4
5 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index a77eee1164..65a2d68fd1 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF = "\
35" 35"
36X11DEPENDS = "--without-x11" 36X11DEPENDS = "--without-x11"
37X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}" 37X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
38X11DEPENDS_virtclass-native = "--without-x11" 38X11DEPENDS_class-native = "--without-x11"
39 39
40PACKAGES =+ "${PN}-xlib" 40PACKAGES =+ "${PN}-xlib"
41 41
@@ -73,7 +73,7 @@ fi
73} 73}
74 74
75PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" 75PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
76PACKAGES_DYNAMIC_virtclass-native = "" 76PACKAGES_DYNAMIC_class-native = ""
77 77
78python populate_packages_prepend () { 78python populate_packages_prepend () {
79 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) 79 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
@@ -83,7 +83,7 @@ python populate_packages_prepend () {
83 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) 83 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
84} 84}
85 85
86do_install_append_virtclass-native() { 86do_install_append_class-native() {
87#Use wrapper script rather than binary as required libtool library is not installed now 87#Use wrapper script rather than binary as required libtool library is not installed now
88 GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 88 GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
89 sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 89 sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
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"
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 5481f82b64..bbf765b7f0 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -38,8 +38,8 @@ LIBV = "2.10.0"
38 38
39PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" 39PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
40BBCLASSEXTEND = "native" 40BBCLASSEXTEND = "native"
41RRECOMMENDS_${PN}_virtclass-native = "" 41RRECOMMENDS_${PN}_class-native = ""
42DEPENDS_virtclass-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" 42DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"
43 43
44python populate_packages_prepend () { 44python populate_packages_prepend () {
45 prologue = d.getVar("postinst_prologue", True) 45 prologue = d.getVar("postinst_prologue", True)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 100b51e8a8..4f838e0318 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 8
9SECTION = "x11/utils" 9SECTION = "x11/utils"
10DEPENDS = "gtk+ cairo libxml2" 10DEPENDS = "gtk+ cairo libxml2"
11DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" 11DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native"
12BBCLASSEXTEND = "native" 12BBCLASSEXTEND = "native"
13 13
14PR = "r10" 14PR = "r10"
@@ -19,7 +19,7 @@ EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz"
19 19
20PACKAGECONFIG ??= "croco" 20PACKAGECONFIG ??= "croco"
21# When native we can manage without croco, as it's only for GTK+ 21# When native we can manage without croco, as it's only for GTK+
22PACKAGECONFIG_virtclass-native = "" 22PACKAGECONFIG_class-native = ""
23 23
24PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" 24PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
25 25