diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3.inc')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 959fb441b2..132955797c 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -31,7 +31,9 @@ EXTRA_OECONF += " \ --enable-modules \ --disable-cups \ --disable-colord \ -" + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ + " +EXTRA_OECONF[vardepsexclude] = "MACHINE" do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" @@ -46,7 +48,7 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" -PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa wayland-native" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" do_install_append() { mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 @@ -76,6 +78,7 @@ FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ FILES_${PN}-dev += " \ ${datadir}/gtk-3.0/gtkbuilder.rng \ ${datadir}/gtk-3.0/include \ + ${datadir}/gettext/its \ ${libdir}/gtk-3.0/include \ ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ @@ -85,6 +88,7 @@ FILES_${PN}-dev += " \ ${bindir}/gtk-builder-convert \ ${bindir}/gtk-encode-symbolic-svg \ ${bindir}/gtk-builder-tool \ + ${bindir}/gtk-query-settings \ " GTKBASE_RRECOMMENDS ?= "liberation-fonts \ @@ -99,6 +103,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" +RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" @@ -122,4 +127,3 @@ python populate_packages_prepend () { if (d.getVar('DEBIAN_NAMES', True)): d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') } - |