From 1011ce60412b17e4a1d2293dabe76027547429f7 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 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-gnome/gcr/gcr_3.18.0.bb | 22 ++++++++++++++++++++-- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb | 7 ++----- .../gnome-desktop/gnome-desktop3_3.18.2.bb | 2 +- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 6 +++--- .../gsettings-desktop-schemas_3.19.3.bb | 4 ++-- meta/recipes-gnome/json-glib/json-glib_1.0.4.bb | 2 +- meta/recipes-gnome/libgudev/libgudev_230.bb | 2 +- meta/recipes-gnome/libnotify/libnotify_0.7.6.bb | 2 +- meta/recipes-gnome/librsvg/librsvg_2.40.13.bb | 5 +---- meta/recipes-gnome/libsecret/libsecret_0.18.4.bb | 14 ++++++++++++-- meta/recipes-gnome/libwnck/libwnck3_3.14.1.bb | 4 ++-- 11 files changed, 46 insertions(+), 24 deletions(-) (limited to 'meta/recipes-gnome') 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/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala" +DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" -inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even +inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" @@ -21,3 +21,21 @@ FILES_${PN} += " \ # http://errors.yoctoproject.org/Errors/Details/20229/ ARM_INSTRUCTION_SET = "arm" + +# on x86-64 the introspection binary goes into +# an infinite loop under qemu during compilation, +# printing the following: +# +# gcrypt-Message: select() error: Bad address +# +# gcrypt-Message: select() error: Bad address +# +# gcrypt-Message: select() error: Bad address +# +# This will be investigated later. +EXTRA_OECONF_append_x86-64 = " --disable-introspection" + +# 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. +# qemu: uncaught target signal 6 (Aborted) - core dumped +EXTRA_OECONF_append_mips64 = " --disable-introspection" + 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 \ SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e" SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031" -inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even +inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection LIBV = "2.10.0" @@ -41,15 +41,12 @@ PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" -EXTRA_OECONF = "--disable-introspection" - PACKAGES =+ "${PN}-xlib" FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" ALLOW_EMPTY_${PN}-xlib = "1" -FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ - ${libdir}/lib*.so.*" +FILES_${PN} += "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" FILES_${PN}-dev += " \ ${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 \ BPN = "gnome-desktop" -inherit gnome pkgconfig upstream-version-is-even +inherit gnome pkgconfig upstream-version-is-even gobject-introspection SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d" SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56" 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" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub" +DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native" -inherit gnomebase gtk-doc gettext +inherit gnomebase gtk-doc gettext gobject-introspection SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ file://remove_plus_from_invalid_characters_list.patch \ @@ -18,7 +18,7 @@ SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e S = "${WORKDIR}/GConf-${PV}" EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ - --disable-introspection --disable-orbit --with-openldap=no --disable-gtk" + --disable-orbit --with-openldap=no --disable-gtk" # Disable PolicyKit by default 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/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native" +DEPENDS = "glib-2.0 intltool-native" -inherit gnomebase gsettings gettext +inherit gnomebase gsettings gettext gobject-introspection SRC_URI[archive.md5sum] = "fdc92abcffe46821be423193b275cf8b" 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" SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf" SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd" -inherit gnomebase gettext lib_package +inherit gnomebase gettext lib_package gobject-introspection 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)" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -inherit gnomebase +inherit gnomebase gobject-introspection 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" DEPENDS = "dbus gtk+3 dbus-glib" -inherit gnomebase gtk-doc distro_features_check +inherit gnomebase gtk-doc distro_features_check gobject-introspection # depends on gtk+3 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 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" DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" BBCLASSEXTEND = "native" -inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even +inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection SRC_URI += "file://gtk-option.patch" @@ -19,8 +19,6 @@ SRC_URI[archive.sha256sum] = "4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3d CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" -EXTRA_OECONF = "--disable-introspection --disable-vala" - # The older ld (2.22) on the host (Centos 6.5) doesn't have the # -Bsymbolic-functions option, we can disable it for native. EXTRA_OECONF_append_class-native = " --enable-Bsymbolic=auto" @@ -37,7 +35,6 @@ do_install_append() { } PACKAGES =+ "librsvg-gtk rsvg" -FILES_${PN} = "${libdir}/*.so.*" FILES_rsvg = "${bindir}/rsvg* \ ${datadir}/pixmaps/svg-viewer.svg \ ${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 LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" -inherit gnomebase gtk-doc +inherit gnomebase gtk-doc vala gobject-introspection -DEPENDS = "glib-2.0 libgcrypt gettext-native intltool-native" +DEPENDS += "glib-2.0 libgcrypt gettext-native intltool-native" EXTRA_OECONF += "--disable-manpages" @@ -13,3 +13,13 @@ SRC_URI[archive.sha256sum] = "0f29b51698198e6999c91f4adce3119c8c457f546b133a85ba # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET = "arm" + +# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes +do_configure_prepend() { + rm -f ${S}/build/m4/vapigen.m4 +} + +# 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. +# qemu: uncaught target signal 6 (Aborted) - core dumped +EXTRA_OECONF_append_mips64 = " --disable-introspection" + 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" BPN = "libwnck" SECTION = "x11/libs" -DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native libxres" +DEPENDS = "gtk+3 gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase +inherit gnomebase gobject-introspection SRC_URI[archive.md5sum] = "d96c0b74c4dc5fdae758964098603c90" SRC_URI[archive.sha256sum] = "bb643c9c423c8aa79c59973ce27ce91d3b180d1e9907902278fb79391f52befa" -- cgit 1.2.3-korg