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 += " \ | |||
31 | --enable-modules \ | 31 | --enable-modules \ |
32 | --disable-cups \ | 32 | --disable-cups \ |
33 | --disable-colord \ | 33 | --disable-colord \ |
34 | " | 34 | WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ |
35 | " | ||
36 | EXTRA_OECONF[vardepsexclude] = "MACHINE" | ||
35 | 37 | ||
36 | do_compile_prepend() { | 38 | do_compile_prepend() { |
37 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" | 39 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" |
@@ -46,7 +48,7 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon | |||
46 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build | 48 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build |
47 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" | 49 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" |
48 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" | 50 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" |
49 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa wayland-native" | 51 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" |
50 | 52 | ||
51 | do_install_append() { | 53 | do_install_append() { |
52 | mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 | 54 | 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 \ | |||
76 | FILES_${PN}-dev += " \ | 78 | FILES_${PN}-dev += " \ |
77 | ${datadir}/gtk-3.0/gtkbuilder.rng \ | 79 | ${datadir}/gtk-3.0/gtkbuilder.rng \ |
78 | ${datadir}/gtk-3.0/include \ | 80 | ${datadir}/gtk-3.0/include \ |
81 | ${datadir}/gettext/its \ | ||
79 | ${libdir}/gtk-3.0/include \ | 82 | ${libdir}/gtk-3.0/include \ |
80 | ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ | 83 | ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ |
81 | ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ | 84 | ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ |
@@ -85,6 +88,7 @@ FILES_${PN}-dev += " \ | |||
85 | ${bindir}/gtk-builder-convert \ | 88 | ${bindir}/gtk-builder-convert \ |
86 | ${bindir}/gtk-encode-symbolic-svg \ | 89 | ${bindir}/gtk-encode-symbolic-svg \ |
87 | ${bindir}/gtk-builder-tool \ | 90 | ${bindir}/gtk-builder-tool \ |
91 | ${bindir}/gtk-query-settings \ | ||
88 | " | 92 | " |
89 | 93 | ||
90 | GTKBASE_RRECOMMENDS ?= "liberation-fonts \ | 94 | GTKBASE_RRECOMMENDS ?= "liberation-fonts \ |
@@ -99,6 +103,7 @@ GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" | |||
99 | 103 | ||
100 | RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" | 104 | RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" |
101 | RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" | 105 | RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" |
106 | RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" | ||
102 | 107 | ||
103 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" | 108 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" |
104 | 109 | ||
@@ -122,4 +127,3 @@ python populate_packages_prepend () { | |||
122 | if (d.getVar('DEBIAN_NAMES', True)): | 127 | if (d.getVar('DEBIAN_NAMES', True)): |
123 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') | 128 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') |
124 | } | 129 | } |
125 | |||