From 271f35fb209ec29700c2cdf13c0b82d9f853f24d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Apr 2016 13:11:24 +0100 Subject: meta: add missing intltool-native dependency Recipes that use intltool need to depend on intltool-native. Signed-off-by: Ross Burton --- meta/recipes-gnome/gcr/gcr_3.18.0.bb | 3 +-- meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb | 3 +-- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 3 +-- meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb | 3 +-- meta/recipes-graphics/mx/mx.inc | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_3.18.0.bb b/meta/recipes-gnome/gcr/gcr_3.18.0.bb index 32523a64aa..35dadbe30e 100644 --- a/meta/recipes-gnome/gcr/gcr_3.18.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.18.0.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" +DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt" inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection # depends on gtk+3, but also x11 through gtk+-x11 @@ -38,4 +38,3 @@ EXTRA_OECONF_append_x86-64 = " --disable-introspection" # Gcr-3.broken: poky/build-mips64/tmp/work/mips64-poky-linux/libgpg-error/1.19-r0/libgpg-error-1.19/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. # qemu: uncaught target signal 6 (Aborted) - core dumped EXTRA_OECONF_append_mips64 = " --disable-introspection" - diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb index ee460d9889..374101f9a6 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb @@ -10,7 +10,7 @@ inherit gnome pkgconfig upstream-version-is-even gobject-introspection SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d" SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56" -DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification xkeyboard-config iso-codes" +DEPENDS += "intltool-native gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification xkeyboard-config iso-codes" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" @@ -21,4 +21,3 @@ PACKAGES =+ "libgnome-desktop3" FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" - diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc index 8adfac7d74..0d212c738e 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -5,8 +5,7 @@ include and create documentation in their releases. They include the \ xml2po tool which makes it easier to translate and keep up to date \ translations of documentation." LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" -DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native" +DEPENDS = "intltool-native libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" inherit gnomebase gettext python-dir pythonnative autotools-brokensep diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb b/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb index 495894b899..6f09533d2b 100644 --- a/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb +++ b/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" BPN = "libwnck" SECTION = "x11/libs" -DEPENDS = "gtk+3 gdk-pixbuf-native libxres" +DEPENDS = "intltool-native gtk+3 gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" @@ -17,4 +17,3 @@ SRC_URI[archive.sha256sum] = "bb643c9c423c8aa79c59973ce27ce91d3b180d1e9907902278 inherit distro_features_check # libxres means x11 only REQUIRED_DISTRO_FEATURES = "x11" - diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc index 4f1095793d..b6f5b7ca61 100644 --- a/meta/recipes-graphics/mx/mx.inc +++ b/meta/recipes-graphics/mx/mx.inc @@ -5,7 +5,7 @@ inherit clutter autotools-brokensep distro_features_check gobject-introspection # depends on clutter-1.0 which depends on cogl-1.0 REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" +DEPENDS = "intltool-native clutter-1.0 dbus-glib gdk-pixbuf" SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" -- cgit 1.2.3-korg