diff --git a/Remove-deprecates-xmlRecoverMemory.patch b/Remove-deprecates-xmlRecoverMemory.patch new file mode 100644 index 0000000000000000000000000000000000000000..f765de885a3d40d43eb45fbaa222b255386523fc --- /dev/null +++ b/Remove-deprecates-xmlRecoverMemory.patch @@ -0,0 +1,60 @@ +From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 3 Aug 2023 23:52:43 +0200 +Subject: [PATCH] Remove deprecates xmlRecoverMemory + +Cannot currently remove xmlSchemaValidateStream as validateDoc fails to +accept the XSD +--- + libgupnp-av/gupnp-didl-lite-parser.c | 9 +++++++-- + libgupnp-av/gupnp-feature-list-parser.c | 9 +++++++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c +index 3a5727f..948f934 100644 +--- a/libgupnp-av/gupnp-didl-lite-parser.c ++++ b/libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser, + GUPnPAVXMLDoc *xml_doc = NULL; + gboolean result; + +- doc = xmlRecoverMemory (didl, strlen (didl)); ++ doc = xmlReadMemory (didl, ++ strlen (didl), ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, +- "Could not parse DIDL-Lite XML:\n%s", didl); ++ "Could not parse DIDL-Lite XML:\n%s", ++ didl); + + return FALSE; + } +diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c +index 16208b5..2e7c15d 100644 +--- a/libgupnp-av/gupnp-feature-list-parser.c ++++ b/libgupnp-av/gupnp-feature-list-parser.c +@@ -114,12 +114,17 @@ gupnp_feature_list_parser_parse_text + xmlNode *element; + GList *feature_list = NULL; + +- doc = xmlRecoverMemory (text, strlen (text)); ++ doc = xmlReadMemory (text, ++ strlen (text), ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, + G_MARKUP_ERROR_PARSE, +- "Could not parse FeatureList XML:\n%s", text); ++ "Could not parse FeatureList XML:\n%s", ++ text); + + return NULL; + } diff --git a/gupnp-av.spec b/gupnp-av.spec index 34affe0d4e26aeabfe820528e60d32c257a6ee1e..e2eef205b308df42d35bc3fef52af5647320b35d 100644 --- a/gupnp-av.spec +++ b/gupnp-av.spec @@ -1,10 +1,11 @@ Name: gupnp-av Version: 0.14.1 -Release: 1 +Release: 2 Summary: A small utility library that aims to ease the handing and implimation of UPnP AV. License: LGPLv2+ URL: http://www.gupnp.org/ Source0: http://download.gnome.org/sources/gupnp-av/0.14/%{name}-%{version}.tar.xz +Patch0: Remove-deprecates-xmlRecoverMemory.patch BuildRequires: glib2-devel gtk-doc gobject-introspection-devel libxml2-devel BuildRequires: libsoup-devel vala meson @@ -66,6 +67,9 @@ This package contains developer documentation for %{name}. %{_datadir}/gtk-doc/html/gupnp-av/ %changelog +* Thu Aug 10 2023 yaoxin - 0.14.1-2 +- Fix build failure caused by gupnp upgrade to 1.6.4 + * Mon Jan 2 2023 lin zhang - 0.14.1-1 - Update to 0.14.1