From a644ea1e2d8c48e84cf9bb770abe71765949c1da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Dec 2025 22:57:15 +0100 Subject: [PATCH] package/gupnp-tools: bump version to 0.12.2 Removed two patches which are included in this release and added one patch to fix build with libxml 2.15.1. For release notes, see: https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.12.2/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...emove-Werror-deprecated-declarations.patch | 27 +++++++++++++++ ...mon-Drop-deprecated-xmlRecoverMemory.patch | 33 ------------------- ...-Fix-compatibility-with-libxml2-2-12.patch | 28 ---------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 5 files changed, 30 insertions(+), 64 deletions(-) create mode 100644 package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch delete mode 100644 package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch delete mode 100644 package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch diff --git a/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch b/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch new file mode 100644 index 0000000000..ef76f01f66 --- /dev/null +++ b/package/gupnp-tools/0001-Remove-Werror-deprecated-declarations.patch @@ -0,0 +1,27 @@ +From cb4ddac12977fd1abd88a1feacbab090d9ad5ecb Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 3 Dec 2025 20:06:22 +0100 +Subject: [PATCH] Remove -Werror=deprecated-declarations + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/issues/29 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c92a833..64a0513 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,7 +44,6 @@ conf.set('HAVE_GTK_SOURCEVIEW', gtksourceview.found()) + conf.set('GETTEXT_PACKAGE', '"@0@"'.format(meson.project_name())) + conf.set('LOCALEDIR', '"@0@"'.format(localedir)) + cc = meson.get_compiler('c') +-add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') + conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_@0@'.format(glib_version.underscorify())) + conf.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_@0@'.format(glib_version.underscorify())) + +-- +2.47.3 + diff --git a/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch b/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch deleted file mode 100644 index c81d1b01fe..0000000000 --- a/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Thu, 3 Aug 2023 23:44:15 +0200 -Subject: [PATCH] common: Drop deprecated xmlRecoverMemory - -Fixes #27 - -Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 -Signed-off-by: Fabrice Fontaine ---- - src/common/pretty-print.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c -index c692664..c8ebc9a 100644 ---- a/src/common/pretty-print.c -+++ b/src/common/pretty-print.c -@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml) - char *text; - int length; - -- doc = xmlRecoverMemory (xml, strlen (xml)); -+ doc = xmlReadMemory (xml, -+ strlen (xml), -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - - if (!doc) - return NULL; --- -GitLab - diff --git a/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch b/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch deleted file mode 100644 index c76d440b5d..0000000000 --- a/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4e06104df81fba2cda06d4747b33e75f4cade458 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Fri, 24 Nov 2023 18:12:50 +0100 -Subject: [PATCH] common: Fix compatibility with libxml2 2.12 - -Fixes #28 - -Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/4e06104df81fba2cda06d4747b33e75f4cade458 -Signed-off-by: Fabrice Fontaine ---- - src/common/pretty-print.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c -index c8ebc9a..1519cb0 100644 ---- a/src/common/pretty-print.c -+++ b/src/common/pretty-print.c -@@ -22,6 +22,7 @@ - - #include "pretty-print.h" - -+#include - #include - - #include --- -GitLab - diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 28e2661360..6dc8bd74f2 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp-tools/0.12/gupnp-tools-0.12.1.sha256sum: -sha256 53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba gupnp-tools-0.12.1.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-tools/0.12/gupnp-tools-0.12.2.sha256sum +sha256 4c92f2d1a3d454ec1f5fb05ef08ca34df9c743af64c8b5965c35884d46cb005c gupnp-tools-0.12.2.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 99fdf54f13..910a157816 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.12 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).1 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ https://download.gnome.org/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR)