summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-12-10 09:38:34 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-12 11:27:20 +0000
commit430ae4f95a2eb36311338c5c8bdba7331958556a (patch)
tree0d26714bd9e2d2535141ddfe0ce60fd1255e60a0
parentdeedca6bee5c90e35a7814b04bc5de03de9f9b1d (diff)
downloadopenembedded-core-contrib-430ae4f95a2eb36311338c5c8bdba7331958556a.tar.gz
epiphany: Add packageconfig for libsoup2
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 <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_41.0.bb5
1 files changed, 4 insertions, 1 deletions
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"