Skip to contentSkip to conversation

webkitgtk: Add packageconfig for libsoup2

PATCH In review Joshua Watt 4 participants 7 messages Dec 9, 2021 – Dec 10, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 webkitgtk: 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 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.

---
 meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +4 -2
index 413e0cdf92..279e260441 100644
@@ -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"
 
Signature · 1 line
2.33.0
#1 lore raw
Quoted 7 lines · Joshua Watt

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.

Quoted 7 lines

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.

Quoted 60 lines
---
 meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +4 -3
index 413e0cdf92..279e260441 100644
@@ -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 (#159477): https://lists.openembedded.org/g/openembedded-core/message/159477
Mute This Topic: https://lists.openembedded.org/mt/87621243/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
In reply to Joshua Watt
Quoted 4 lines · Joshua Watt

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

I'm guessing the "if either" is a leftover from editing?

Quoted 49 lines

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.

---
 meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +3 -1
index 413e0cdf92..279e260441 100644
@@ -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"

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " · line 129

Quoted 5 lines
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +1 -1
@@ -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"

Is this required for the libsoup2 changes?

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "

Quoted 3 lines
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
 RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"
 
 

Cheers,

Scott

#3 lore raw
In reply to Joshua Watt

Hi Joshua,

Quoted 45 lines · Joshua Watt

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.

---
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +2 -1
index 413e0cdf92..279e260441 100644
@@ -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"

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
Quoted 5 lines

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,,"

What about leveraging package conflicts in PACKAGECONFIG?

e.g.:
PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup" PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
?
No need for the check on PACKAGECONFIG in depends then.

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " · line 129

Quoted 9 lines
# webkitgtk is full of /usr/bin/env python, particular for generating docs
do_configure[postfuncs] += "setup_python_link"
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "

SECURITY_CFLAGS:remove:aarch64 = "-fpie"
SECURITY_CFLAGS:append:aarch64 = " -fPIE"

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +1 -1
-FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"

Was this change suppose to make it in this commit?

Cheers,
Quentin

Quoted 2 lines

RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"

#4 lore raw
Quoted 57 lines · Quentin Schulz

Hi Joshua,

Quoted 45 lines · Joshua Watt

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.

---
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +2 -1
index 413e0cdf92..279e260441 100644
@@ -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"

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
Quoted 5 lines

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,,"

What about leveraging package conflicts in PACKAGECONFIG?

Quoted 5 lines

e.g.:
PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup" PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
?
No need for the check on PACKAGECONFIG in depends then.

Ya, the weird part there is that if you want libsoup3, you *must* put "soup" in PACKAGECONFIG *and* remove soup2, otherwise libsoup won't be added to DEPENDS and the build fails.

Quoted 7 lines
Quoted 7 lines
# webkitgtk is full of /usr/bin/env python, particular for generating docs
do_configure[postfuncs] += "setup_python_link"
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "

SECURITY_CFLAGS:remove:aarch64 = "-fpie"
SECURITY_CFLAGS:append:aarch64 = " -fPIE"

Quoted 5 lines

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " · line 129

Quoted 3 lines
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +1 -1
-FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"

Was this change suppose to make it in this commit?

Yes. The minor version of the library changes based on libsoup3 (4.1) vs. libsoup2 (4.0)

Quoted 6 lines

Cheers,
Quentin

Quoted 2 lines

RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"

#5 lore raw
Quoted 64 lines · Joshua Watt
Quoted 57 lines · Quentin Schulz

Hi Joshua,

Quoted 45 lines · Joshua Watt

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.

---
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +2 -1
index 413e0cdf92..279e260441 100644
@@ -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"

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -70,6 +71,7 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
Quoted 5 lines

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,,"

What about leveraging package conflicts in PACKAGECONFIG?

Quoted 5 lines

e.g.:
PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup" PACKAGECONFIG[soup] = ",,libsoup,,,soup2"
?
No need for the check on PACKAGECONFIG in depends then.

Quoted 4 lines

Ya, the weird part there is that if you want libsoup3, you *must* put "soup" in PACKAGECONFIG *and* remove soup2, otherwise libsoup won't be added to DEPENDS and the build fails.

I can suggest a solution à la qt package from meta-qt5:
PACKAGECONFIG_LIBSOUP ?= "soup2"
PACKAGECONFIG ??= "[...] ${PACKAGECONFIG_LIBSOUP}"

If you want to make really sure one or the other is selected, you can add a check in an anonymous Python function?

This should tackle the "must" part and also allow easy swap in bbappends in addition of making sure libsoup and libsoup-2.4 can't be selected at the same time?

What do you think?

On a side note, I feel like this patch could be split in two. One for the libsoup switch mechanism and one for switching the default to libsoup-2.4? I don't think Richard care usually though, so no biggie :)

Cheers,
Quentin

Quoted 22 lines
Quoted 7 lines
Quoted 7 lines
# webkitgtk is full of /usr/bin/env python, particular for generating docs
do_configure[postfuncs] += "setup_python_link"
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +0 -0
@@ -124,7 +126,7 @@ EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF "

SECURITY_CFLAGS:remove:aarch64 = "-fpie"
SECURITY_CFLAGS:append:aarch64 = " -fPIE"

Quoted 5 lines

meta/recipes-sato/webkit/webkitgtk_2.34.2.bb EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " · line 129

Quoted 3 lines
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +1 -1
-FILES:${PN} += "${libdir}/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so"
+FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so"

Was this change suppose to make it in this commit?

Yes. The minor version of the library changes based on libsoup3 (4.1) vs. libsoup2 (4.0)

Quoted 6 lines

Cheers,
Quentin

Quoted 2 lines

RRECOMMENDS:${PN} += "ca-certificates shared-mime-info"

#6 lore raw

PATCH v2 1/1 webkitgtk: Add packageconfig for libsoup2

In reply to Joshua Watt

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. 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.

---
 meta/recipes-sato/webkit/webkitgtk_2.34.2.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.2.bb +5 -2
index 413e0cdf92..a9b151e3c3 100644
@@ -38,7 +38,6 @@ DEPENDS = " \
           atk \
           libwebp \
           gtk+3 \
-          libsoup \
           libxslt \
           libtasn1 \
           libnotify \
@@ -46,12 +45,14 @@ DEPENDS = " \
           gstreamer1.0-plugins-base \
           "
 
+PACKAGECONFIG_SOUP ?= "soup2"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \
                    enchant \
                    libsecret \
+                   ${PACKAGECONFIG_SOUP} \
                   "
 
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
@@ -70,6 +71,8 @@ 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,libsoup-2.4,,,soup3"
+PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
 
 # webkitgtk is full of /usr/bin/env python, particular for generating docs
 do_configure[postfuncs] += "setup_python_link"
@@ -124,7 +127,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"
 
Signature · 1 line
2.33.0