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 either if both are detected on process
startup.
The default is changed from libsoup3 back to libsoup2 to follow
webkitgtk.
Signed-off-by: Joshua Watt <jpewhac...@gmail.com>
---
meta/recipes-gnome/epiphany/epiphany_41.0.bb | 4 +++-
1 file changed, 3 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..bc13f10b35 100644
--- a/meta/recipes-gnome/epiphany/epiphany_41.0.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
@@ -17,6 +17,7 @@ DEPENDS = " \
libhandy \
libportal \
glib-2.0-native \
+ ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4",
"libsoup", d)} \
"
GNOMEBASEBUILDCLASS = "meson"
@@ -30,10 +31,11 @@ SRC_URI =
"${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
"
SRC_URI[archive.sha256sum] =
"b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0"
-EXTRA_OEMESON += "-Dsoup2=disabled"
+PACKAGECONFIG ??= "soup2"
# Developer mode enables debugging
PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
+PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,,"
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 (#159478):
https://lists.openembedded.org/g/openembedded-core/message/159478
Mute This Topic: https://lists.openembedded.org/mt/87621255/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
