[OE-core] [PATCH][master-next] webkitgtk: add PACKAGECONFIG gobject-introspection

[Alexander Kanavin]

You need to at the same time drop the introspection enablement logic from
EXTRA_OECMAKE I think?
This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk-doc.

Alex

${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \

${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \


On Thu, 20 Feb 2020 at 01:29, Andreas Müller <schnitzeltony at gmail.com>
wrote:

> Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what
> gobject-introspection.bbclass does automatically for projects build with
> autotools and meson.
>
> It was checked: there are webkitgtk and libdnf inheriting
> gobject-introspection
> and cmake. Since libdnf cannot configure gir, webkitgtk seems the only
> project
> requiring gir-auto-enabling. So handle at recipe / no common magic at
> gobject-introspection.bbclass required.
>
> Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> ---
>
> This patch applies on top of master-next/Alex's patches sent
>
>  meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> index 585723772e..d5085620d2 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
> @@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt
> libxt libidn libgcrypt \
>            "
>
>  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11',
> d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES',
> 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \
>                     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
> 'webgl opengl', '' ,d)} \
>                     enchant \
>                     libsecret \
> @@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
> 'wayland x11', d)} \
>
>  PACKAGECONFIG[wayland] =
> "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
> wpebackend-fdo wayland-native"
>  PACKAGECONFIG[x11] =
> "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
> +PACKAGECONFIG[gobject-introspection] =
> "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
>  PACKAGECONFIG[geoclue] =
> "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
>  PACKAGECONFIG[enchant] =
> "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
>  PACKAGECONFIG[gtk2] =
> "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200220/dbca99de/attachment.html>