On Fri, Dec 10, 2021 at 09:38:34AM -0600, Joshua Watt wrote:
> Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
> Including libsoup2 and libsoup3 in the same process can cause strange
> runtime failures, and the latest release of each major version will
> cause the process to exit if both are detected on startup.
> 
> The default is changed from libsoup3 back to libsoup2 to follow
> webkitgtk.
> 
> Signed-off-by: Joshua Watt <[email protected]>

Looks good to me, thanks :)

Reviewed-by: Quentin Schulz <[email protected]>

Cheers,
Quentin

> ---
>  meta/recipes-gnome/epiphany/epiphany_41.0.bb | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-gnome/epiphany/epiphany_41.0.bb 
> b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> index 09210b68aa..8f3bd87340 100644
> --- a/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> +++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> @@ -30,10 +30,13 @@ SRC_URI = 
> "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
>             "
>  SRC_URI[archive.sha256sum] = 
> "b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0"
>  
> -EXTRA_OEMESON += "-Dsoup2=disabled"
> +PACKAGECONFIG_SOUP ?= "soup2"
> +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
>  
>  # Developer mode enables debugging
>  PACKAGECONFIG[developer-mode] = 
> "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
> +PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
> +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
>  
>  FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers 
> ${datadir}/metainfo"
>  RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
> -- 
> 2.33.0
> 

> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159617): 
https://lists.openembedded.org/g/openembedded-core/message/159617
Mute This Topic: https://lists.openembedded.org/mt/87638363/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to