From 7bd32b9ce6436315d6e44e186aeeb4bb8708559c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 9 Mar 2016 17:02:05 +0200 Subject: recipes-gnome: fix introspection support (From OE-Core rev: 1011ce60412b17e4a1d2293dabe76027547429f7) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/atk/at-spi2-core_2.18.3.bb | 4 ++-- meta/recipes-support/atk/atk_2.18.0.bb | 4 ++-- meta/recipes-support/vte/vte.inc | 6 +++--- meta/recipes-support/vte/vte_0.28.2.bb | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb b/meta/recipes-support/atk/at-spi2-core_2.18.3.bb index f22bb838b0..eced59750a 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.18.3.bb @@ -13,11 +13,11 @@ SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b72883164940 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" -inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even +inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-introspection --disable-xevie --with-dbus-daemondir=${bindir}" +EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}" FILES_${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service" diff --git a/meta/recipes-support/atk/atk_2.18.0.bb b/meta/recipes-support/atk/atk_2.18.0.bb index 97e2d22473..3c0e82df60 100644 --- a/meta/recipes-support/atk/atk_2.18.0.bb +++ b/meta/recipes-support/atk/atk_2.18.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = "glib-2.0" -inherit gnomebase gtk-doc upstream-version-is-even +inherit gnomebase gtk-doc upstream-version-is-even gobject-introspection SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054" SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b" @@ -18,4 +18,4 @@ SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a702 BBCLASSEXTEND = "native" EXTRA_OECONF = "--disable-glibtest \ - --disable-introspection" + " diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc index 68499d655e..8565cc2ad6 100644 --- a/meta/recipes-support/vte/vte.inc +++ b/meta/recipes-support/vte/vte.inc @@ -1,13 +1,13 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPLv2.0" -DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub" +DEPENDS = " glib-2.0 gtk+ intltool-native ncurses" RDEPENDS_libvte = "vte-termcap" -inherit gnome gtk-doc distro_features_check upstream-version-is-even +inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--disable-python --disable-introspection" +EXTRA_OECONF = "--disable-python" PACKAGES =+ "libvte vte-termcap" FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb index 8b4e7f71de..74087ca831 100644 --- a/meta/recipes-support/vte/vte_0.28.2.bb +++ b/meta/recipes-support/vte/vte_0.28.2.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" PR = "r6" SRC_URI += "file://obsolete_automake_macros.patch \ - file://cve-2012-2738.patch" + file://cve-2012-2738.patch \ + " CFLAGS += "-D_GNU_SOURCE" -- cgit v1.2.3-54-g00ecf