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

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

[Andre McCurdy]

Andre McCurdy (2):
  libsoup-2.4: minor formatting improvements
  libsoup-2.4: disable libsoup-gnome by default

 meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

-- 
1.9.1

[PATCH 1/2] 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 2/2] 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 865c1d7..a12f869 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

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1605 bytes --]

IIRC this will rename the resulting package (because there will be only one
shared library now).

that will probably break on device upgrade-path

I'm not sure if someone still cares about upgrade-paths.. there are too
many issues going in unnoticed.

On Thu, Feb 18, 2016 at 8:21 PM, Andre McCurdy <armccurdy@gmail.com> wrote:

> 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 865c1d7..a12f869 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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2712 bytes --]

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Andre McCurdy]

On Thu, Feb 18, 2016 at 11:39 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> IIRC this will rename the resulting package (because there will be only one
> shared library now).

Yes, you're right. Previously "libsoup-2.4" and becomes
"libsoup-2.4-1" when the "gnome" PACKAGECONFIG is removed.

> that will probably break on device upgrade-path
>
> I'm not sure if someone still cares about upgrade-paths.. there are too many
> issues going in unnoticed.
>
> On Thu, Feb 18, 2016 at 8:21 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> 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 865c1d7..a12f869 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
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Paul Eggleton]

Hi Martin,

On Thu, 18 Feb 2016 20:39:08 Martin Jansa wrote:
> IIRC this will rename the resulting package (because there will be only one
> shared library now).
> 
> that will probably break on device upgrade-path
> 
> I'm not sure if someone still cares about upgrade-paths.. there are too
> many issues going in unnoticed.

The only way we're going to fix that is if we have some automated mechanism for 
picking up on such problems. We have some of the building blocks but so far 
nobody has stepped up to write something more complete that can warn us when 
such a change has occurred.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Andre McCurdy]

On Thu, Feb 18, 2016 at 12:24 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> Hi Martin,
>
> On Thu, 18 Feb 2016 20:39:08 Martin Jansa wrote:
>> IIRC this will rename the resulting package (because there will be only one
>> shared library now).
>>
>> that will probably break on device upgrade-path
>>
>> I'm not sure if someone still cares about upgrade-paths.. there are too
>> many issues going in unnoticed.
>
> The only way we're going to fix that is if we have some automated mechanism for
> picking up on such problems. We have some of the building blocks but so far
> nobody has stepped up to write something more complete that can warn us when
> such a change has occurred.

Aside from automated detection of such problems, what's the best fix
in this particular case?

  1) Use LEAD_SONAME to force renaming, even in the case when the
libsoup-2.4 package contains both shared libs.

  2) Split libsoup-gnome-2.4 into it's own package, so that both
libsoup-2.4 and libsoup-gnome-2.4 get renamed.

  3) Use DEBIAN_NOAUTONAME to prevent renaming, even when the
libsoup-2.4 package only contains one shared lib.

  4) Drop the gnome PACKAGECONFIG option so that people can't mess
with it (in combination with one of the above).

?

> Cheers,
> Paul
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Richard Purdie]

On Thu, 2016-02-18 at 13:33 -0800, Andre McCurdy wrote:
> Aside from automated detection of such problems, what's the best fix
> in this particular case?
> 
>   1) Use LEAD_SONAME to force renaming, even in the case when the
> libsoup-2.4 package contains both shared libs.
> 
>   2) Split libsoup-gnome-2.4 into it's own package, so that both
> libsoup-2.4 and libsoup-gnome-2.4 get renamed.
> 
>   3) Use DEBIAN_NOAUTONAME to prevent renaming, even when the
> libsoup-2.4 package only contains one shared lib.

Probably 3) IMO, its what several other packages do.

>   4) Drop the gnome PACKAGECONFIG option so that people can't mess
> with it (in combination with one of the above).

Cheers,

Richard

Re: [PATCH 2/2] libsoup-2.4: disable libsoup-gnome by default

[Phil Blundell]

On Thu, 2016-02-18 at 13:33 -0800, Andre McCurdy wrote:
> Aside from automated detection of such problems, what's the best fix
> in this particular case?
> 
>   1) Use LEAD_SONAME to force renaming, even in the case when the
> libsoup-2.4 package contains both shared libs.
> 
>   2) Split libsoup-gnome-2.4 into it's own package, so that both
> libsoup-2.4 and libsoup-gnome-2.4 get renamed.
> 
>   3) Use DEBIAN_NOAUTONAME to prevent renaming, even when the
> libsoup-2.4 package only contains one shared lib.
> 
>   4) Drop the gnome PACKAGECONFIG option so that people can't mess
> with it (in combination with one of the above).

I recommend (2) with (4) as an optional extra.

p.

Re: [PATCH 0/2] libsoup-2.4: cleanup + disable libsoup-gnome by default

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

On Thu, Feb 18, 2016 at 11:21:23AM -0800, Andre McCurdy wrote:
> Andre McCurdy (2):
>   libsoup-2.4: minor formatting improvements
>   libsoup-2.4: disable libsoup-gnome by default
> 
>  meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 20 +++++++++-----------
>  1 file changed, 9 insertions(+), 11 deletions(-)

It looks like this was merged without suggested fix for upgrade-path.

Will you please send follow-up patch?

It also most likely breaks libgdata in meta-oe (for complete log see bitbake world
reports or errors.yoctoproject.org)

  | configure: error: Package requirements (libsoup-gnome-2.4) were not met:
  | 
  | No package 'libsoup-gnome-2.4' found

Maybe it will be resolved by libgdata upgrade sent in
gobject-introspective set, so this is just FYI.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 0/2] libsoup-2.4: cleanup + disable libsoup-gnome by default

[Andre McCurdy]

On Wed, Feb 24, 2016 at 4:51 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Feb 18, 2016 at 11:21:23AM -0800, Andre McCurdy wrote:
>> Andre McCurdy (2):
>>   libsoup-2.4: minor formatting improvements
>>   libsoup-2.4: disable libsoup-gnome by default
>>
>>  meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb | 20 +++++++++-----------
>>  1 file changed, 9 insertions(+), 11 deletions(-)
>
> It looks like this was merged without suggested fix for upgrade-path.
>
> Will you please send follow-up patch?

I think the v2 series was merged OK. Here's the commit which tries to
prevent renaming when the gnome PACKAGECONFIG is disabled:

  http://git.openembedded.org/openembedded-core/commit/?id=f5f95f501c8aacb3d624e683b4b5b8403115ba5d

> It also most likely breaks libgdata in meta-oe (for complete log see bitbake world
> reports or errors.yoctoproject.org)
>
>   | configure: error: Package requirements (libsoup-gnome-2.4) were not met:
>   |
>   | No package 'libsoup-gnome-2.4' found
>
> Maybe it will be resolved by libgdata upgrade sent in
> gobject-introspective set, so this is just FYI.

OK. I'll look into this one.

> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com