[PATCH v2 0/3] libsoup-2.4: cleanup + disable libsoup-gnome by default

[PATCH v2 0/3] libsoup-2.4: cleanup + disable libsoup-gnome by default

[Andre McCurdy]

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(-)

-- 
1.9.1

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

[Andre McCurdy]

Also update HOMEPAGE from generic Gnome to something libsoup specific.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
index 3215ff1..865c1d7 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
@@ -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"
-- 
1.9.1

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

[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 <armccurdy@gmail.com>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
index 865c1d7..a9d8050 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
@@ -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"
-- 
1.9.1

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

[Andre McCurdy]

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

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
index a9d8050..13ff685 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb
@@ -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"
-- 
1.9.1