diff options
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 6 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 4 |
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 | " |
36 | X11DEPENDS = "--without-x11" | 36 | X11DEPENDS = "--without-x11" |
37 | X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}" | 37 | X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}" |
38 | X11DEPENDS_virtclass-native = "--without-x11" | 38 | X11DEPENDS_class-native = "--without-x11" |
39 | 39 | ||
40 | PACKAGES =+ "${PN}-xlib" | 40 | PACKAGES =+ "${PN}-xlib" |
41 | 41 | ||
@@ -73,7 +73,7 @@ fi | |||
73 | } | 73 | } |
74 | 74 | ||
75 | PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" | 75 | PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" |
76 | PACKAGES_DYNAMIC_virtclass-native = "" | 76 | PACKAGES_DYNAMIC_class-native = "" |
77 | 77 | ||
78 | python populate_packages_prepend () { | 78 | python 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 | ||
86 | do_install_append_virtclass-native() { | 86 | do_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" | |||
7 | POLKIT_libc-uclibc = "" | 7 | POLKIT_libc-uclibc = "" |
8 | 8 | ||
9 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" | 9 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" |
10 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" | 10 | DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" |
11 | 11 | ||
12 | PR = "r12" | 12 | PR = "r12" |
13 | 13 | ||
@@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70 | |||
22 | S = "${WORKDIR}/GConf-${PV}" | 22 | S = "${WORKDIR}/GConf-${PV}" |
23 | 23 | ||
24 | POLKIT_OECONF = "--enable-defaults-service" | 24 | POLKIT_OECONF = "--enable-defaults-service" |
25 | POLKIT_OECONF_virtclass-native = "--disable-defaults-service" | 25 | POLKIT_OECONF_class-native = "--disable-defaults-service" |
26 | POLKIT_OECONF_libc-uclibc = "--disable-default-service" | 26 | POLKIT_OECONF_libc-uclibc = "--disable-default-service" |
27 | 27 | ||
28 | EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ | 28 | EXTRA_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 |
41 | RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" | 41 | RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" |
42 | RDEPENDS_${PN}_virtclass-native = "" | 42 | RDEPENDS_${PN}_class-native = "" |
43 | 43 | ||
44 | FILES_${PN} += "${libdir}/GConf/* \ | 44 | FILES_${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 @@ | |||
1 | LICENSE = "GPLv2 & LGPLv2.1" | 1 | LICENSE = "GPLv2 & LGPLv2.1" |
2 | DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" | 2 | DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" |
3 | DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native glib-2.0-native" | 3 | DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native" |
4 | 4 | ||
5 | inherit gnome gettext python-dir pythonnative | 5 | inherit gnome gettext python-dir pythonnative |
6 | 6 | ||
@@ -20,6 +20,6 @@ do_install_append_class-native () { | |||
20 | FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*" | 20 | FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*" |
21 | 21 | ||
22 | RDEPENDS_${PN} = "bash" | 22 | RDEPENDS_${PN} = "bash" |
23 | RDEPENDS_${PN}_virtclass-native = "" | 23 | RDEPENDS_${PN}_class-native = "" |
24 | 24 | ||
25 | BBCLASSEXTEND = "native" | 25 | BBCLASSEXTEND = "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 | ||
39 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" | 39 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" |
40 | BBCLASSEXTEND = "native" | 40 | BBCLASSEXTEND = "native" |
41 | RRECOMMENDS_${PN}_virtclass-native = "" | 41 | RRECOMMENDS_${PN}_class-native = "" |
42 | DEPENDS_virtclass-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" | 42 | DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native" |
43 | 43 | ||
44 | python populate_packages_prepend () { | 44 | python 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 | ||
9 | SECTION = "x11/utils" | 9 | SECTION = "x11/utils" |
10 | DEPENDS = "gtk+ cairo libxml2" | 10 | DEPENDS = "gtk+ cairo libxml2" |
11 | DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" | 11 | DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native" |
12 | BBCLASSEXTEND = "native" | 12 | BBCLASSEXTEND = "native" |
13 | 13 | ||
14 | PR = "r10" | 14 | PR = "r10" |
@@ -19,7 +19,7 @@ EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" | |||
19 | 19 | ||
20 | PACKAGECONFIG ??= "croco" | 20 | PACKAGECONFIG ??= "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+ |
22 | PACKAGECONFIG_virtclass-native = "" | 22 | PACKAGECONFIG_class-native = "" |
23 | 23 | ||
24 | PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" | 24 | PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" |
25 | 25 | ||