[Buildroot] [PATCH 1/2] package/gupnp: fix build with newer versions of libxml

[Buildroot] [PATCH 1/2] package/gupnp: fix build with newer versions of libxml

[Bernd Kuhls]

Fixes:
http://autobuild.buildroot.net/results/b26/b267c4137edebc504757b6275824c748cce3d894/

../libgupnp/gupnp-service.c:1005:9: error: 'xmlRecoverMemory' is deprecated [-Werror=deprecated-declarations]

libxml2 deprecated the function xmlRecoverMemory with commit
https://github.com/GNOME/libxml2/commit/51035c539edf67de93ced3cf037bb1f2b298e526
first included in versions 2.11.0. Buildroot bumped libxml2 to the 2.11
branch with commit dfe1ca7872a45bcdc825ff0900d7fd929097a635.

Instead of backporting an upstream fix [1] from the master branch to the
gupnp-1.4 branch we follow the Gentoo way [2][3] to disable
-Werror=deprecated-declarations in meson.build to prevent future build
errors.

[1] https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d
[2] https://bugs.gentoo.org/907384
[3] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8214a9700716349d8d7a3c8543889ced116c3d

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/gupnp/gupnp.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk
index f41f26d2dd..da04eae682 100644
--- a/package/gupnp/gupnp.mk
+++ b/package/gupnp/gupnp.mk
@@ -15,6 +15,12 @@ GUPNP_INSTALL_STAGING = YES
 GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
 GUPNP_CONF_OPTS = -Dexamples=false
 
+# prevents build errors with newer versions of libxml
+define GUPNP_REMOVE_DEPRECATED_DECLARATIONS
+	$(SED) '/-Werror=deprecated-declarations/d' $(@D)/meson.build
+endef
+GUPNP_POST_PATCH_HOOKS += GUPNP_REMOVE_DEPRECATED_DECLARATIONS
+
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
 GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true
 GUPNP_DEPENDENCIES += host-vala gobject-introspection
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/gupnp: bump version to 1.4.4

[Bernd Kuhls]

Release notes:
https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.news

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/gupnp/gupnp.hash | 4 ++--
 package/gupnp/gupnp.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash
index 823dbd7927..aa32745b14 100644
--- a/package/gupnp/gupnp.hash
+++ b/package/gupnp/gupnp.hash
@@ -1,5 +1,5 @@
-# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum:
-sha256  14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba  gupnp-1.4.3.tar.xz
+# From https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.sha256sum
+sha256  3761b15cb063621f847f3effb7d7637f0317500fca6bda1e1904f73921750a1f  gupnp-1.4.4.tar.xz
 
 # Hash for license file:
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk
index da04eae682..0e3d647710 100644
--- a/package/gupnp/gupnp.mk
+++ b/package/gupnp/gupnp.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GUPNP_VERSION_MAJOR = 1.4
-GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3
+GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4
 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
 GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR)
 GUPNP_LICENSE = LGPL-2.1+
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/gupnp: fix build with newer versions of libxml

[Arnout Vandecappelle via buildroot]

On 21/06/2023 18:00, Bernd Kuhls wrote:
> Fixes:
> http://autobuild.buildroot.net/results/b26/b267c4137edebc504757b6275824c748cce3d894/
> 
> ../libgupnp/gupnp-service.c:1005:9: error: 'xmlRecoverMemory' is deprecated [-Werror=deprecated-declarations]
> 
> libxml2 deprecated the function xmlRecoverMemory with commit
> https://github.com/GNOME/libxml2/commit/51035c539edf67de93ced3cf037bb1f2b298e526
> first included in versions 2.11.0. Buildroot bumped libxml2 to the 2.11
> branch with commit dfe1ca7872a45bcdc825ff0900d7fd929097a635.
> 
> Instead of backporting an upstream fix [1] from the master branch to the

  Why? It's not as if the patch is big.

  The advantage of backporting the patch is that it gets cleaned up 
"automatically" when the version is bumped. With the -Werror modification, we 
have to remember to remove that again when the version is bumped.

> gupnp-1.4 branch we follow the Gentoo way [2][3] to disable
> -Werror=deprecated-declarations in meson.build to prevent future build
> errors.

  If this is the answer to the "why", I'm not convinced. It's just pushing the 
issue forward...

  Regards,
  Arnout

> 
> [1] https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d
> [2] https://bugs.gentoo.org/907384
> [3] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8214a9700716349d8d7a3c8543889ced116c3d
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>   package/gupnp/gupnp.mk | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk
> index f41f26d2dd..da04eae682 100644
> --- a/package/gupnp/gupnp.mk
> +++ b/package/gupnp/gupnp.mk
> @@ -15,6 +15,12 @@ GUPNP_INSTALL_STAGING = YES
>   GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
>   GUPNP_CONF_OPTS = -Dexamples=false
>   
> +# prevents build errors with newer versions of libxml
> +define GUPNP_REMOVE_DEPRECATED_DECLARATIONS
> +	$(SED) '/-Werror=deprecated-declarations/d' $(@D)/meson.build
> +endef
> +GUPNP_POST_PATCH_HOOKS += GUPNP_REMOVE_DEPRECATED_DECLARATIONS
> +
>   ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
>   GUPNP_CONF_OPTS += -Dintrospection=true -Dvapi=true
>   GUPNP_DEPENDENCIES += host-vala gobject-introspection
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/gupnp: bump version to 1.4.4

[Arnout Vandecappelle via buildroot]

On 21/06/2023 18:00, Bernd Kuhls wrote:
> Release notes:
> https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.news

  Why not 1.6.3? Are they not compatible or something?

  Regards,
  Arnout

> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>   package/gupnp/gupnp.hash | 4 ++--
>   package/gupnp/gupnp.mk   | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash
> index 823dbd7927..aa32745b14 100644
> --- a/package/gupnp/gupnp.hash
> +++ b/package/gupnp/gupnp.hash
> @@ -1,5 +1,5 @@
> -# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum:
> -sha256  14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba  gupnp-1.4.3.tar.xz
> +# From https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.sha256sum
> +sha256  3761b15cb063621f847f3effb7d7637f0317500fca6bda1e1904f73921750a1f  gupnp-1.4.4.tar.xz
>   
>   # Hash for license file:
>   sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
> diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk
> index da04eae682..0e3d647710 100644
> --- a/package/gupnp/gupnp.mk
> +++ b/package/gupnp/gupnp.mk
> @@ -5,7 +5,7 @@
>   ################################################################################
>   
>   GUPNP_VERSION_MAJOR = 1.4
> -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3
> +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4
>   GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
>   GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR)
>   GUPNP_LICENSE = LGPL-2.1+
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/gupnp: fix build with newer versions of libxml

[Bernd Kuhls]

Hi Arnout,

Am Sun, 25 Jun 2023 21:10:08 +0200 schrieb Arnout Vandecappelle via
buildroot:

>> Instead of backporting an upstream fix [1] from the master branch to
>> the
> 
>   Why? It's not as if the patch is big.

done: https://patchwork.ozlabs.org/project/buildroot/patch/
20230701180655.4192877-1-bernd@kuhls.net/

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/gupnp: bump version to 1.4.4

[Bernd Kuhls]

Am Sun, 25 Jun 2023 21:10:44 +0200 schrieb Arnout Vandecappelle via
buildroot:

> On 21/06/2023 18:00, Bernd Kuhls wrote:
>> Release notes:
>> https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.news
> 
>   Why not 1.6.3? Are they not compatible or something?

Hi Arnout,

since 1.5.0 gupnp depends on libsoup3:
https://download.gnome.org/sources/gupnp/1.5/gupnp-1.5.0.news

After reading the discussion bumping libsoup [1] I stopped my efforts to 
update gupnp to 1.6.x and backported the xml fix to the 1.4 branch:
https://patchwork.ozlabs.org/project/buildroot/patch/
20230701180655.4192877-1-bernd@kuhls.net/

I am not using any of these packages, just trying to fix the fallout of 
the libxml2 bump ;)

Regards, Bernd

[1] https://patchwork.ozlabs.org/project/buildroot/patch/
20220128105917.30421-2-thomas.devoogdt@barco.com/

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/gupnp: bump version to 1.4.4

[Peter Korsgaard]

On 21/06/2023 18.00, Bernd Kuhls wrote:
> Release notes:
> https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.4.news
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.02.x and 2023.05.x, thanks

-- 
Bye, Peter Korsgaard

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot