diff options
17 files changed, 182 insertions, 36 deletions
diff --git a/meta/recipes-gnome/gcr/gcr_3.18.0.bb b/meta/recipes-gnome/gcr/gcr_3.18.0.bb index ed6e8c453f..32523a64aa 100644 --- a/meta/recipes-gnome/gcr/gcr_3.18.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.18.0.bb | |||
| @@ -5,9 +5,9 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
| 5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" |
| 7 | 7 | ||
| 8 | DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala" | 8 | DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" |
| 9 | 9 | ||
| 10 | inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even | 10 | inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection |
| 11 | # depends on gtk+3, but also x11 through gtk+-x11 | 11 | # depends on gtk+3, but also x11 through gtk+-x11 |
| 12 | REQUIRED_DISTRO_FEATURES = "x11" | 12 | REQUIRED_DISTRO_FEATURES = "x11" |
| 13 | 13 | ||
| @@ -21,3 +21,21 @@ FILES_${PN} += " \ | |||
| 21 | 21 | ||
| 22 | # http://errors.yoctoproject.org/Errors/Details/20229/ | 22 | # http://errors.yoctoproject.org/Errors/Details/20229/ |
| 23 | ARM_INSTRUCTION_SET = "arm" | 23 | ARM_INSTRUCTION_SET = "arm" |
| 24 | |||
| 25 | # on x86-64 the introspection binary goes into | ||
| 26 | # an infinite loop under qemu during compilation, | ||
| 27 | # printing the following: | ||
| 28 | # | ||
| 29 | # gcrypt-Message: select() error: Bad address | ||
| 30 | # | ||
| 31 | # gcrypt-Message: select() error: Bad address | ||
| 32 | # | ||
| 33 | # gcrypt-Message: select() error: Bad address | ||
| 34 | # | ||
| 35 | # This will be investigated later. | ||
| 36 | EXTRA_OECONF_append_x86-64 = " --disable-introspection" | ||
| 37 | |||
| 38 | # Gcr-3.broken: poky/build-mips64/tmp/work/mips64-poky-linux/libgpg-error/1.19-r0/libgpg-error-1.19/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. | ||
| 39 | # qemu: uncaught target signal 6 (Aborted) - core dumped | ||
| 40 | EXTRA_OECONF_append_mips64 = " --disable-introspection" | ||
| 41 | |||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb index ed9c2326e5..ba94eecbd9 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb | |||
| @@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
| 22 | SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e" | 22 | SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e" |
| 23 | SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031" | 23 | SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031" |
| 24 | 24 | ||
| 25 | inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even | 25 | inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection |
| 26 | 26 | ||
| 27 | LIBV = "2.10.0" | 27 | LIBV = "2.10.0" |
| 28 | 28 | ||
| @@ -41,15 +41,12 @@ PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" | |||
| 41 | PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" | 41 | PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" |
| 42 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" | 42 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" |
| 43 | 43 | ||
| 44 | EXTRA_OECONF = "--disable-introspection" | ||
| 45 | |||
| 46 | PACKAGES =+ "${PN}-xlib" | 44 | PACKAGES =+ "${PN}-xlib" |
| 47 | 45 | ||
| 48 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" | 46 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" |
| 49 | ALLOW_EMPTY_${PN}-xlib = "1" | 47 | ALLOW_EMPTY_${PN}-xlib = "1" |
| 50 | 48 | ||
| 51 | FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | 49 | FILES_${PN} += "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" |
| 52 | ${libdir}/lib*.so.*" | ||
| 53 | 50 | ||
| 54 | FILES_${PN}-dev += " \ | 51 | FILES_${PN}-dev += " \ |
| 55 | ${bindir}/gdk-pixbuf-csource \ | 52 | ${bindir}/gdk-pixbuf-csource \ |
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb index 09850d6aa8..ee460d9889 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
| 6 | 6 | ||
| 7 | BPN = "gnome-desktop" | 7 | BPN = "gnome-desktop" |
| 8 | 8 | ||
| 9 | inherit gnome pkgconfig upstream-version-is-even | 9 | inherit gnome pkgconfig upstream-version-is-even gobject-introspection |
| 10 | SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d" | 10 | SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d" |
| 11 | SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56" | 11 | SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56" |
| 12 | 12 | ||
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb index e50d077f08..feaf080191 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb | |||
| @@ -3,9 +3,9 @@ SECTION = "x11/gnome" | |||
| 3 | LICENSE = "LGPLv2+" | 3 | LICENSE = "LGPLv2+" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" |
| 5 | 5 | ||
| 6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub" | 6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native" |
| 7 | 7 | ||
| 8 | inherit gnomebase gtk-doc gettext | 8 | inherit gnomebase gtk-doc gettext gobject-introspection |
| 9 | 9 | ||
| 10 | SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ | 10 | SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ |
| 11 | file://remove_plus_from_invalid_characters_list.patch \ | 11 | file://remove_plus_from_invalid_characters_list.patch \ |
| @@ -18,7 +18,7 @@ SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e | |||
| 18 | S = "${WORKDIR}/GConf-${PV}" | 18 | S = "${WORKDIR}/GConf-${PV}" |
| 19 | 19 | ||
| 20 | EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ | 20 | EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ |
| 21 | --disable-introspection --disable-orbit --with-openldap=no --disable-gtk" | 21 | --disable-orbit --with-openldap=no --disable-gtk" |
| 22 | 22 | ||
| 23 | # Disable PolicyKit by default | 23 | # Disable PolicyKit by default |
| 24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb index 4c1fbfcfb4..25fdabade0 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb | |||
| @@ -5,9 +5,9 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
| 5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
| 7 | 7 | ||
| 8 | DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native" | 8 | DEPENDS = "glib-2.0 intltool-native" |
| 9 | 9 | ||
| 10 | inherit gnomebase gsettings gettext | 10 | inherit gnomebase gsettings gettext gobject-introspection |
| 11 | 11 | ||
| 12 | SRC_URI[archive.md5sum] = "fdc92abcffe46821be423193b275cf8b" | 12 | SRC_URI[archive.md5sum] = "fdc92abcffe46821be423193b275cf8b" |
| 13 | SRC_URI[archive.sha256sum] = "9084989b75ca9b3fc5984c8a0d297a93d3d124f51cadd2bdaaaa75a783c80635" | 13 | SRC_URI[archive.sha256sum] = "9084989b75ca9b3fc5984c8a0d297a93d3d124f51cadd2bdaaaa75a783c80635" |
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb index 4908ac08a7..3ce38cec55 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb | |||
| @@ -13,6 +13,6 @@ DEPENDS = "glib-2.0" | |||
| 13 | SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf" | 13 | SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf" |
| 14 | SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd" | 14 | SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd" |
| 15 | 15 | ||
| 16 | inherit gnomebase gettext lib_package | 16 | inherit gnomebase gettext lib_package gobject-introspection |
| 17 | 17 | ||
| 18 | BBCLASSEXTEND = "native" | 18 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-gnome/libgudev/libgudev_230.bb b/meta/recipes-gnome/libgudev/libgudev_230.bb index c61316b228..6a105023b9 100644 --- a/meta/recipes-gnome/libgudev/libgudev_230.bb +++ b/meta/recipes-gnome/libgudev/libgudev_230.bb | |||
| @@ -10,5 +10,5 @@ RCONFLICTS_${PN} = "systemd (<= 220)" | |||
| 10 | LICENSE = "LGPLv2.1" | 10 | LICENSE = "LGPLv2.1" |
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
| 12 | 12 | ||
| 13 | inherit gnomebase | 13 | inherit gnomebase gobject-introspection |
| 14 | 14 | ||
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb index 1a24c1073e..ce8e5ae21a 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "dbus gtk+3 dbus-glib" | 6 | DEPENDS = "dbus gtk+3 dbus-glib" |
| 7 | 7 | ||
| 8 | inherit gnomebase gtk-doc distro_features_check | 8 | inherit gnomebase gtk-doc distro_features_check gobject-introspection |
| 9 | # depends on gtk+3 | 9 | # depends on gtk+3 |
| 10 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 10 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 11 | 11 | ||
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb index ed712432ff..2ac52f7797 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb | |||
| @@ -10,7 +10,7 @@ SECTION = "x11/utils" | |||
| 10 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" | 10 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" |
| 11 | BBCLASSEXTEND = "native" | 11 | BBCLASSEXTEND = "native" |
| 12 | 12 | ||
| 13 | inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even | 13 | inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection |
| 14 | 14 | ||
| 15 | SRC_URI += "file://gtk-option.patch" | 15 | SRC_URI += "file://gtk-option.patch" |
| 16 | 16 | ||
| @@ -19,8 +19,6 @@ SRC_URI[archive.sha256sum] = "4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3d | |||
| 19 | 19 | ||
| 20 | CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" | 20 | CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" |
| 21 | 21 | ||
| 22 | EXTRA_OECONF = "--disable-introspection --disable-vala" | ||
| 23 | |||
| 24 | # The older ld (2.22) on the host (Centos 6.5) doesn't have the | 22 | # The older ld (2.22) on the host (Centos 6.5) doesn't have the |
| 25 | # -Bsymbolic-functions option, we can disable it for native. | 23 | # -Bsymbolic-functions option, we can disable it for native. |
| 26 | EXTRA_OECONF_append_class-native = " --enable-Bsymbolic=auto" | 24 | EXTRA_OECONF_append_class-native = " --enable-Bsymbolic=auto" |
| @@ -37,7 +35,6 @@ do_install_append() { | |||
| 37 | } | 35 | } |
| 38 | 36 | ||
| 39 | PACKAGES =+ "librsvg-gtk rsvg" | 37 | PACKAGES =+ "librsvg-gtk rsvg" |
| 40 | FILES_${PN} = "${libdir}/*.so.*" | ||
| 41 | FILES_rsvg = "${bindir}/rsvg* \ | 38 | FILES_rsvg = "${bindir}/rsvg* \ |
| 42 | ${datadir}/pixmaps/svg-viewer.svg \ | 39 | ${datadir}/pixmaps/svg-viewer.svg \ |
| 43 | ${datadir}/themes" | 40 | ${datadir}/themes" |
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb index 534caadfe1..beaaba03e5 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.4.bb | |||
| @@ -2,9 +2,9 @@ SUMMARY = "libsecret is a library for storing and retrieving passwords and other | |||
| 2 | LICENSE = "LGPLv2.1" | 2 | LICENSE = "LGPLv2.1" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" |
| 4 | 4 | ||
| 5 | inherit gnomebase gtk-doc | 5 | inherit gnomebase gtk-doc vala gobject-introspection |
| 6 | 6 | ||
| 7 | DEPENDS = "glib-2.0 libgcrypt gettext-native intltool-native" | 7 | DEPENDS += "glib-2.0 libgcrypt gettext-native intltool-native" |
| 8 | 8 | ||
| 9 | EXTRA_OECONF += "--disable-manpages" | 9 | EXTRA_OECONF += "--disable-manpages" |
| 10 | 10 | ||
| @@ -13,3 +13,13 @@ SRC_URI[archive.sha256sum] = "0f29b51698198e6999c91f4adce3119c8c457f546b133a85ba | |||
| 13 | 13 | ||
| 14 | # http://errors.yoctoproject.org/Errors/Details/20228/ | 14 | # http://errors.yoctoproject.org/Errors/Details/20228/ |
| 15 | ARM_INSTRUCTION_SET = "arm" | 15 | ARM_INSTRUCTION_SET = "arm" |
| 16 | |||
| 17 | # vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes | ||
| 18 | do_configure_prepend() { | ||
| 19 | rm -f ${S}/build/m4/vapigen.m4 | ||
| 20 | } | ||
| 21 | |||
| 22 | # Secret-1: poky/build-mips64/tmp/work/mips64-poky-linux/libgpg-error/1.19-r0/libgpg-error-1.19/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. | ||
| 23 | # qemu: uncaught target signal 6 (Aborted) - core dumped | ||
| 24 | EXTRA_OECONF_append_mips64 = " --disable-introspection" | ||
| 25 | |||
diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb b/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb index 97d6b881fd..495894b899 100644 --- a/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb +++ b/meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb | |||
| @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | |||
| 5 | BPN = "libwnck" | 5 | BPN = "libwnck" |
| 6 | 6 | ||
| 7 | SECTION = "x11/libs" | 7 | SECTION = "x11/libs" |
| 8 | DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres" | 8 | DEPENDS = "gtk+3 gdk-pixbuf-native libxres" |
| 9 | 9 | ||
| 10 | PACKAGECONFIG ??= "startup-notification" | 10 | PACKAGECONFIG ??= "startup-notification" |
| 11 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" | 11 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" |
| 12 | 12 | ||
| 13 | inherit gnomebase | 13 | inherit gnomebase gobject-introspection |
| 14 | SRC_URI[archive.md5sum] = "d96c0b74c4dc5fdae758964098603c90" | 14 | SRC_URI[archive.md5sum] = "d96c0b74c4dc5fdae758964098603c90" |
| 15 | SRC_URI[archive.sha256sum] = "bb643c9c423c8aa79c59973ce27ce91d3b180d1e9907902278fb79391f52befa" | 15 | SRC_URI[archive.sha256sum] = "bb643c9c423c8aa79c59973ce27ce91d3b180d1e9907902278fb79391f52befa" |
| 16 | 16 | ||
diff --git a/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch new file mode 100644 index 0000000000..812da21c56 --- /dev/null +++ b/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch | |||
| @@ -0,0 +1,121 @@ | |||
| 1 | From 867a512eddbeb1899d3e7096df3da1dd0ce3e7b7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 23 Oct 2015 14:06:17 +0300 | ||
| 4 | Subject: [PATCH] Drop introspection macros from acinclude.m4 | ||
| 5 | |||
| 6 | They take precendence over our customized macros, and so | ||
| 7 | introspection doesn't work correctly. | ||
| 8 | |||
| 9 | Upstream-Status: Pending [review on oe-core list] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 11 | --- | ||
| 12 | acinclude.m4 | 96 ------------------------------------------------------------ | ||
| 13 | 1 file changed, 96 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
| 16 | index 8899c7c..48fd5d8 100644 | ||
| 17 | --- a/acinclude.m4 | ||
| 18 | +++ b/acinclude.m4 | ||
| 19 | @@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], | ||
| 20 | ]) | ||
| 21 | |||
| 22 | |||
| 23 | -dnl REMOVE THIS WHEN introspection.m4 is widely available | ||
| 24 | -dnl | ||
| 25 | -dnl -*- mode: autoconf -*- | ||
| 26 | -dnl Copyright 2009 Johan Dahlin | ||
| 27 | -dnl | ||
| 28 | -dnl This file is free software; the author(s) gives unlimited | ||
| 29 | -dnl permission to copy and/or distribute it, with or without | ||
| 30 | -dnl modifications, as long as this notice is preserved. | ||
| 31 | -dnl | ||
| 32 | - | ||
| 33 | -# serial 1 | ||
| 34 | - | ||
| 35 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], | ||
| 36 | -[ | ||
| 37 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
| 38 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
| 39 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first | ||
| 40 | - | ||
| 41 | - dnl enable/disable introspection | ||
| 42 | - m4_if([$2], [require], | ||
| 43 | - [dnl | ||
| 44 | - enable_introspection=yes | ||
| 45 | - ],[dnl | ||
| 46 | - AC_ARG_ENABLE(introspection, | ||
| 47 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], | ||
| 48 | - [Enable introspection for this build]),, | ||
| 49 | - [enable_introspection=auto]) | ||
| 50 | - ])dnl | ||
| 51 | - | ||
| 52 | - AC_MSG_CHECKING([for gobject-introspection]) | ||
| 53 | - | ||
| 54 | - dnl presence/version checking | ||
| 55 | - AS_CASE([$enable_introspection], | ||
| 56 | - [no], [dnl | ||
| 57 | - found_introspection="no (disabled, use --enable-introspection to enable)" | ||
| 58 | - ],dnl | ||
| 59 | - [yes],[dnl | ||
| 60 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, | ||
| 61 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) | ||
| 62 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], | ||
| 63 | - found_introspection=yes, | ||
| 64 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) | ||
| 65 | - ],dnl | ||
| 66 | - [auto],[dnl | ||
| 67 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) | ||
| 68 | - ],dnl | ||
| 69 | - [dnl | ||
| 70 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) | ||
| 71 | - ])dnl | ||
| 72 | - | ||
| 73 | - AC_MSG_RESULT([$found_introspection]) | ||
| 74 | - | ||
| 75 | - INTROSPECTION_SCANNER= | ||
| 76 | - INTROSPECTION_COMPILER= | ||
| 77 | - INTROSPECTION_GENERATE= | ||
| 78 | - INTROSPECTION_GIRDIR= | ||
| 79 | - INTROSPECTION_TYPELIBDIR= | ||
| 80 | - if test "x$found_introspection" = "xyes"; then | ||
| 81 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
| 82 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
| 83 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
| 84 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | ||
| 85 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" | ||
| 86 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | ||
| 87 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | ||
| 88 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
| 89 | - fi | ||
| 90 | - AC_SUBST(INTROSPECTION_SCANNER) | ||
| 91 | - AC_SUBST(INTROSPECTION_COMPILER) | ||
| 92 | - AC_SUBST(INTROSPECTION_GENERATE) | ||
| 93 | - AC_SUBST(INTROSPECTION_GIRDIR) | ||
| 94 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) | ||
| 95 | - AC_SUBST(INTROSPECTION_CFLAGS) | ||
| 96 | - AC_SUBST(INTROSPECTION_LIBS) | ||
| 97 | - AC_SUBST(INTROSPECTION_MAKEFILE) | ||
| 98 | - | ||
| 99 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") | ||
| 100 | -]) | ||
| 101 | - | ||
| 102 | - | ||
| 103 | -dnl Usage: | ||
| 104 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) | ||
| 105 | - | ||
| 106 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], | ||
| 107 | -[ | ||
| 108 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) | ||
| 109 | -]) | ||
| 110 | - | ||
| 111 | -dnl Usage: | ||
| 112 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) | ||
| 113 | - | ||
| 114 | - | ||
| 115 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], | ||
| 116 | -[ | ||
| 117 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) | ||
| 118 | -]) | ||
| 119 | -- | ||
| 120 | 2.1.4 | ||
| 121 | |||
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb index a9a7500639..7fc65fd439 100644 --- a/meta/recipes-graphics/pango/pango_1.38.1.bb +++ b/meta/recipes-graphics/pango/pango_1.38.1.bb | |||
| @@ -11,7 +11,11 @@ LICENSE = "LGPLv2.0+" | |||
| 11 | 11 | ||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" |
| 13 | 13 | ||
| 14 | SRC_URI += "file://run-ptest" | 14 | inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection |
| 15 | |||
| 16 | SRC_URI += "file://run-ptest \ | ||
| 17 | file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ | ||
| 18 | " | ||
| 15 | 19 | ||
| 16 | SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" | 20 | SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" |
| 17 | SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" | 21 | SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" |
| @@ -21,11 +25,9 @@ DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo h | |||
| 21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 25 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
| 22 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" | 26 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" |
| 23 | 27 | ||
| 24 | inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even | ||
| 25 | |||
| 26 | EXTRA_AUTORECONF = "" | 28 | EXTRA_AUTORECONF = "" |
| 27 | 29 | ||
| 28 | EXTRA_OECONF = "--disable-introspection \ | 30 | EXTRA_OECONF = " \ |
| 29 | --disable-debug \ | 31 | --disable-debug \ |
| 30 | " | 32 | " |
| 31 | 33 | ||
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 | ||
