On Thu, Dec 9, 2021 at 12:44 PM Joshua Watt <[email protected]> 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 either if both are detected on process > startup. > > The default is changed from libsoup3 back to libsoup2. Most GNOME > packages are still using libsoup2, and a large number of these pull in > webkitgtk either directly or indirectly. If webkitgtk uses libsoup3, > this causes all of these packages to fail at startup. It appears that > most GNOME packages will have to switch to libsoup3 when they transition > to GTK4. >
LGTM thanks for doing this, I was struggling through this as well, I think having the option to stay with soup2 for now is the best approach instead of boiling the ocean. > Signed-off-by: Joshua Watt <[email protected]> > --- > meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb > b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb > index 413e0cdf92..279e260441 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.2.bb > @@ -38,12 +38,12 @@ DEPENDS = " \ > atk \ > libwebp \ > gtk+3 \ > - libsoup \ > libxslt \ > libtasn1 \ > libnotify \ > gstreamer1.0 \ > gstreamer1.0-plugins-base \ > + ${@bb.utils.contains("PACKAGECONFIG", "soup2", "libsoup-2.4", > "libsoup", d)} \ > " > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland > x11', d)} \ > @@ -52,6 +52,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', > 'systemd wayland x11', > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'opengl-or-es', '', d)} \ > enchant \ > libsecret \ > + soup2 \ > " > > PACKAGECONFIG[wayland] = > "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe > wpebackend-fdo wayland-native" > @@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] = > "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" > PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" > PACKAGECONFIG[reduce-size] = > "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," > PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" > +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,," > > # webkitgtk is full of /usr/bin/env python, particular for generating docs > do_configure[postfuncs] += "setup_python_link" > @@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " > SECURITY_CFLAGS:remove:aarch64 = "-fpie" > SECURITY_CFLAGS:append:aarch64 = " -fPIE" > > -FILES:${PN} += > "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so" > +FILES:${PN} += > "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" > > RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" > > -- > 2.33.0 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159480): https://lists.openembedded.org/g/openembedded-core/message/159480 Mute This Topic: https://lists.openembedded.org/mt/87621243/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
