diff options
Diffstat (limited to 'yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc')
-rw-r--r-- | yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc b/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc index a197b9d96..5bbfe6b8e 100644 --- a/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc +++ b/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc @@ -13,6 +13,10 @@ SECTION = "libs" inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +# This picks stable releases in the 2.x series (but not 2.90 onwards, +# which were GNOME 3 betas). +UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)" + X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ cairo gdk-pixbuf" @@ -25,13 +29,12 @@ PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb" -inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache +inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobject-introspection PACKAGES += "libgail gtk-demo" -FILES_${PN} = "${bindir}/gtk-update-icon-cache-2.0 \ +FILES_${PN} += "${bindir}/gtk-update-icon-cache-2.0 \ ${bindir}/gtk-query-immodules-2.0 \ - ${libdir}/lib*${SOLIBS} \ ${datadir}/themes ${sysconfdir} \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" @@ -45,13 +48,6 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ ${bindir}/gtk-builder-convert" -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/modules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" - FILES_gtk-demo = " \ ${datadir}/gtk-2.0/demo/* \ ${bindir}/gtk-demo \ @@ -71,6 +67,10 @@ RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" ALTERNATIVE_${PN} = "gtk-update-icon-cache" ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0" +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" +} + do_install () { autotools_do_install |