Skip to contentSkip to conversation

libsoup-2.4: cleanup + disable libsoup-gnome by default

PATCH New Andre McCurdy 1 participant 4 messages Feb 19, 2016

lore
Share & tools
lore

Andre McCurdy

author
#0 lore raw

v2 cover libsoup-2.4: cleanup + disable libsoup-gnome by default

v2: Prevent PACKAGECONFIG dependant package renaming

Andre McCurdy (3):
libsoup-2.4: minor formatting improvements libsoup-2.4: prevent PACKAGECONFIG dependant package renaming libsoup-2.4: disable libsoup-gnome by default

 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v2 1/3 libsoup-2.4: minor formatting improvements

Also update HOMEPAGE from generic Gnome to something libsoup specific.

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb +10 -11
index 3215ff1..865c1d7 100644
@@ -1,22 +1,14 @@
 SUMMARY = "An HTTP library implementation in C"
-HOMEPAGE = "http://www.gnome.org/"
+HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup"
 BUGTRACKER = "https://bugzilla.gnome.org/"
-
+SECTION = "x11/gnome/libs"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-SECTION = "x11/gnome/libs"
-
 DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native"
 
-EXTRA_OECONF = "--disable-vala"
+SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
 
-# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards.  Enable
-# by default but let it be easily disabled.
-PACKAGECONFIG ??= "gnome"
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
-
-SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
 SRC_URI[md5sum] = "e4757d09012ed93822b1ee41435fec24"

@@ -26,5 +18,12 @@ S = "${WORKDIR}/libsoup-${PV}"
 
 inherit autotools gettext pkgconfig upstream-version-is-even
 
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards.  Enable
+# by default but let it be easily disabled.
+PACKAGECONFIG ??= "gnome"
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+
+EXTRA_OECONF = "--disable-vala"
+
 # glib-networking is needed for SSL, proxies, etc.
 RRECOMMENDS_${PN} = "glib-networking"
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v2 2/3 libsoup-2.4: prevent PACKAGECONFIG dependant package renaming

In reply to Andre McCurdy

When built without gnome support, libsoup-2.4 will contain only one shared lib and will therefore become subject to renaming by debian.bbclass.

Prevent renaming in order to keep the package name consistent regardless of whether gnome support is enabled or disabled.

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb +6 -0
index 865c1d7..a9d8050 100644
@@ -25,5 +25,11 @@ PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 
 EXTRA_OECONF = "--disable-vala"
 
+# When built without gnome support, libsoup-2.4 will contain only one shared lib
+# and will therefore become subject to renaming by debian.bbclass. Prevent
+# renaming in order to keep the package name consistent regardless of whether
+# gnome support is enabled or disabled.
+DEBIAN_NOAUTONAME_${PN} = "1"
+
 # glib-networking is needed for SSL, proxies, etc.
 RRECOMMENDS_${PN} = "glib-networking"
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH v2 3/3 libsoup-2.4: disable libsoup-gnome by default

In reply to Andre McCurdy

libsoup-gnome is entirely deprecated and has just been stubs since 2.42.

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb +2 -3
index a9d8050..13ff685 100644
@@ -18,9 +18,8 @@ S = "${WORKDIR}/libsoup-${PV}"
 
 inherit autotools gettext pkgconfig upstream-version-is-even
 
-# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards.  Enable
-# by default but let it be easily disabled.
-PACKAGECONFIG ??= "gnome"
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 
 EXTRA_OECONF = "--disable-vala"
Signature · 1 line
1.9.1