diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:01:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:44 +0000 |
commit | 0ec412b09dc8b1bd3a003e11c7077e1d59194882 (patch) | |
tree | 0d1ed97f04844b8fb37083bd9bebee0c0697344a /meta | |
parent | d6f8028a2f29558565ac8689c91905e3a945d72d (diff) | |
download | poky-0ec412b09dc8b1bd3a003e11c7077e1d59194882.tar.gz |
gtk+3: enable gobject-introspection
(From OE-Core rev: ee5a0066a9ff48b123aa1d8204847b78e5a1538e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 50a336cca2..bd29300d50 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ | |||
10 | 10 | ||
11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" | 11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" |
12 | 12 | ||
13 | inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even | 13 | inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection |
14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
15 | 15 | ||
16 | # This should be in autotools.bbclass, but until something elses uses it putting | 16 | # This should be in autotools.bbclass, but until something elses uses it putting |
@@ -28,10 +28,13 @@ EXTRA_OECONF += " \ | |||
28 | --disable-xinerama \ | 28 | --disable-xinerama \ |
29 | --enable-modules \ | 29 | --enable-modules \ |
30 | --disable-cups \ | 30 | --disable-cups \ |
31 | --disable-introspection \ | ||
32 | --disable-colord \ | 31 | --disable-colord \ |
33 | " | 32 | " |
34 | 33 | ||
34 | do_compile_prepend() { | ||
35 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" | ||
36 | } | ||
37 | |||
35 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 38 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
36 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | 39 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ |
37 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | 40 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" |
@@ -62,10 +65,9 @@ FILES_${PN}-demo = "${bindir}/gtk3-demo \ | |||
62 | # dependencies are present. | 65 | # dependencies are present. |
63 | RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info" | 66 | RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png shared-mime-info" |
64 | 67 | ||
65 | FILES_${PN} = "${bindir}/gtk-update-icon-cache-3.0 \ | 68 | FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ |
66 | ${bindir}/gtk-query-immodules-3.0 \ | 69 | ${bindir}/gtk-query-immodules-3.0 \ |
67 | ${bindir}/gtk-launch \ | 70 | ${bindir}/gtk-launch \ |
68 | ${libdir}/lib*${SOLIBS} \ | ||
69 | ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ | 71 | ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ |
70 | ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ | 72 | ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ |
71 | ${libdir}/gtk-3.0/modules/*.so" | 73 | ${libdir}/gtk-3.0/modules/*.so" |