Skip to contentSkip to conversation

epiphany: Add packageconfig for libsoup2

PATCH Superseded Joshua Watt 2 participants 3 messages Dec 9, 2021 – Dec 13, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 either if both are detected on process startup.

The default is changed from libsoup3 back to libsoup2 to follow webkitgtk.

---
 meta/recipes-gnome/epiphany/epiphany_41.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-gnome/epiphany/epiphany_41.0.bb +3 -1
index 09210b68aa..bc13f10b35 100644
@@ -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"
Signature · 1 line
2.33.0
#1 lore raw

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

---
 meta/recipes-gnome/epiphany/epiphany_41.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-gnome/epiphany/epiphany_41.0.bb +4 -1
index 09210b68aa..8f3bd87340 100644
@@ -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"
Signature · 1 line
2.33.0
Reviewed-by on v2 1/1
#2 lore raw
Quoted 9 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 both are detected on startup.

The default is changed from libsoup3 back to libsoup2 to follow webkitgtk.

Looks good to me, thanks :)

Cheers,
Quentin

Quoted 36 lines
---
 meta/recipes-gnome/epiphany/epiphany_41.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-gnome/epiphany/epiphany_41.0.bb +4 -1
index 09210b68aa..8f3bd87340 100644
@@ -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"
Signature · 11 lines
2.33.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159547): https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_159547&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=2hMmPB8qgNu5GuMqIURwRmq1Rs7if87P_AhoEw4L8UQrQyEUArsW3nEjybBImI2w&s=ygC_4G0ot9waRXH8wbCG08hwNlPEdHhPoFUNyEi_2sM&e= 
Mute This Topic: https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_87638363_6293953&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=2hMmPB8qgNu5GuMqIURwRmq1Rs7if87P_AhoEw4L8UQrQyEUArsW3nEjybBImI2w&s=grTmpjGInBBSVnkP99IqQv1nyVnO3Jf_4fTmSnjNfnU&e= 
Group Owner: [email protected]
Unsubscribe: https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=2hMmPB8qgNu5GuMqIURwRmq1Rs7if87P_AhoEw4L8UQrQyEUArsW3nEjybBImI2w&s=SzzhWmULE-4adbXYZsnVn-rXVhLcqNYMQm9jgWmfT5A&e=  [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-