diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:02:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:45 +0000 |
commit | 7bd32b9ce6436315d6e44e186aeeb4bb8708559c (patch) | |
tree | ec51097cebe1e67822329da10bd8cefc5e230923 /meta/recipes-support | |
parent | efd37c5d39824591ce070872e97641054191eecb (diff) | |
download | poky-7bd32b9ce6436315d6e44e186aeeb4bb8708559c.tar.gz |
recipes-gnome: fix introspection support
(From OE-Core rev: 1011ce60412b17e4a1d2293dabe76027547429f7)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.18.3.bb | 4 | ||||
-rw-r--r-- | meta/recipes-support/atk/atk_2.18.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte.inc | 6 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.28.2.bb | 3 |
4 files changed, 9 insertions, 8 deletions
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 | |||
13 | 13 | ||
14 | DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" | 14 | DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" |
15 | 15 | ||
16 | inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even | 16 | inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection |
17 | # depends on virtual/libx11 | 17 | # depends on virtual/libx11 |
18 | REQUIRED_DISTRO_FEATURES = "x11" | 18 | REQUIRED_DISTRO_FEATURES = "x11" |
19 | 19 | ||
20 | EXTRA_OECONF = "--disable-introspection --disable-xevie --with-dbus-daemondir=${bindir}" | 20 | EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}" |
21 | 21 | ||
22 | FILES_${PN} += "${datadir}/dbus-1/services/*.service \ | 22 | FILES_${PN} += "${datadir}/dbus-1/services/*.service \ |
23 | ${datadir}/dbus-1/accessibility-services/*.service" | 23 | ${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 \ | |||
10 | 10 | ||
11 | DEPENDS = "glib-2.0" | 11 | DEPENDS = "glib-2.0" |
12 | 12 | ||
13 | inherit gnomebase gtk-doc upstream-version-is-even | 13 | inherit gnomebase gtk-doc upstream-version-is-even gobject-introspection |
14 | 14 | ||
15 | SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054" | 15 | SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054" |
16 | SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b" | 16 | SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b" |
@@ -18,4 +18,4 @@ SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a702 | |||
18 | BBCLASSEXTEND = "native" | 18 | BBCLASSEXTEND = "native" |
19 | 19 | ||
20 | EXTRA_OECONF = "--disable-glibtest \ | 20 | EXTRA_OECONF = "--disable-glibtest \ |
21 | --disable-introspection" | 21 | " |
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 @@ | |||
1 | SUMMARY = "Virtual terminal emulator GTK+ widget library" | 1 | SUMMARY = "Virtual terminal emulator GTK+ widget library" |
2 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" | 2 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" |
3 | LICENSE = "LGPLv2.0" | 3 | LICENSE = "LGPLv2.0" |
4 | DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub" | 4 | DEPENDS = " glib-2.0 gtk+ intltool-native ncurses" |
5 | RDEPENDS_libvte = "vte-termcap" | 5 | RDEPENDS_libvte = "vte-termcap" |
6 | 6 | ||
7 | inherit gnome gtk-doc distro_features_check upstream-version-is-even | 7 | inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection |
8 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | 8 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" |
9 | 9 | ||
10 | EXTRA_OECONF = "--disable-python --disable-introspection" | 10 | EXTRA_OECONF = "--disable-python" |
11 | 11 | ||
12 | PACKAGES =+ "libvte vte-termcap" | 12 | PACKAGES =+ "libvte vte-termcap" |
13 | FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" | 13 | 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" | |||
5 | PR = "r6" | 5 | PR = "r6" |
6 | 6 | ||
7 | SRC_URI += "file://obsolete_automake_macros.patch \ | 7 | SRC_URI += "file://obsolete_automake_macros.patch \ |
8 | file://cve-2012-2738.patch" | 8 | file://cve-2012-2738.patch \ |
9 | " | ||
9 | 10 | ||
10 | CFLAGS += "-D_GNU_SOURCE" | 11 | CFLAGS += "-D_GNU_SOURCE" |
11 | 12 | ||