Attachment 247180 Details for Bug 275865 – Patch for gupnp-av

[patch] Patch for gupnp-av

gupnp-av-fixes.patch (text/plain), 5.99 KB, created by Daniel Engberg on 2023-12-21 02:55:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-12-21 02:55:44 UTC

Size: 5.99 KB

patch

obsolete

>diff --git a/net/gupnp-av/files/patch-git-01-767388bc16e08d4e1e1f419555165cc1816be931 b/net/gupnp-av/files/patch-git-01-767388bc16e08d4e1e1f419555165cc1816be931
>new file mode 100644
>index 000000000000..9404ee62119a
>--- /dev/null
>+++ b/net/gupnp-av/files/patch-git-01-767388bc16e08d4e1e1f419555165cc1816be931
>@@ -0,0 +1,29 @@
>+From 767388bc16e08d4e1e1f419555165cc1816be931 Mon Sep 17 00:00:00 2001
>+From: Jens Georg <mail@jensge.org>
>+Date: Sun, 5 Jun 2022 14:33:23 +0200
>+Subject: [PATCH] build: Fix Requires: line of pkg-config file
>+
>+---
>+ meson.build | 6 ++++++
>+ 1 file changed, 6 insertions(+)
>+
>+diff --git a/meson.build b/meson.build
>+index 4c072c3..f4b629f 100644
>+--- meson.build
>++++ meson.build
>+@@ -87,6 +87,12 @@ subdir('data')
>+ pkg = import('pkgconfig')
>+ pkg.generate(
>+     gupnp_av_lib,
>++    requires : [
>++      'glib-2.0',
>++      'gobject-2.0',
>++      'gio-2.0',
>++      'libxml-2.0'
>++    ],
>+     subdirs : 'gupnp-av-1.0',
>+     description : 'GObject-based AV specific UPnP library'
>+ )
>+-- 
>+GitLab
>+
>diff --git a/net/gupnp-av/files/patch-git-02-bff65db081ee1ee5df0a42231ebf8e8fbb27cccf b/net/gupnp-av/files/patch-git-02-bff65db081ee1ee5df0a42231ebf8e8fbb27cccf
>new file mode 100644
>index 000000000000..aae173cc34c0
>--- /dev/null
>+++ b/net/gupnp-av/files/patch-git-02-bff65db081ee1ee5df0a42231ebf8e8fbb27cccf
>@@ -0,0 +1,27 @@
>+From bff65db081ee1ee5df0a42231ebf8e8fbb27cccf Mon Sep 17 00:00:00 2001
>+From: Jens Georg <mail@jensge.org>
>+Date: Mon, 31 Jul 2023 13:56:08 +0200
>+Subject: [PATCH] build: Temporarily disable -Werror=deprecated
>+
>+There is an issue replacing the SAX document validation with DOM
>+validation
>+---
>+ meson.build | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/meson.build b/meson.build
>+index f4b629f..5d08a42 100644
>+--- meson.build
>++++ meson.build
>+@@ -71,7 +71,7 @@ endif
>+ 
>+ common_cflags = cc.get_supported_arguments(test_cflags)
>+ 
>+-add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c')
>++#add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c')
>+ conf = configuration_data()
>+ conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir'), 'gupnp-av'))
>+ conf.set_quoted('VERSION', meson.project_version())
>+-- 
>+GitLab
>+
>diff --git a/net/gupnp-av/files/patch-git-03-9557768121d54fdcedabe7544863515d6a813354 b/net/gupnp-av/files/patch-git-03-9557768121d54fdcedabe7544863515d6a813354
>new file mode 100644
>index 000000000000..2e74834f8e18
>--- /dev/null
>+++ b/net/gupnp-av/files/patch-git-03-9557768121d54fdcedabe7544863515d6a813354
>@@ -0,0 +1,63 @@
>+From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001
>+From: Jens Georg <mail@jensge.org>
>+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
>+--- libgupnp-av/gupnp-didl-lite-parser.c
>++++ 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
>+--- libgupnp-av/gupnp-feature-list-parser.c
>++++ 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;
>+         }
>+-- 
>+GitLab
>+
>diff --git a/net/gupnp-av/files/patch-git-04-1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 b/net/gupnp-av/files/patch-git-04-1e10a41fcef6ae0d3e89958db89bc22398f3b4f1
>new file mode 100644
>index 000000000000..d0546c0a04bc
>--- /dev/null
>+++ b/net/gupnp-av/files/patch-git-04-1e10a41fcef6ae0d3e89958db89bc22398f3b4f1
>@@ -0,0 +1,24 @@
>+From 1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 Mon Sep 17 00:00:00 2001
>+From: Jens Georg <mail@jensge.org>
>+Date: Sat, 25 Nov 2023 17:58:49 +0100
>+Subject: [PATCH] xml: Fix compatibility with libxml2 2.12.x
>+
>+---
>+ libgupnp-av/xml-util.h | 1 +
>+ 1 file changed, 1 insertion(+)
>+
>+diff --git a/libgupnp-av/xml-util.h b/libgupnp-av/xml-util.h
>+index e0e49f7..0bbe0f8 100644
>+--- libgupnp-av/xml-util.h
>++++ libgupnp-av/xml-util.h
>+@@ -16,6 +16,7 @@
>+ 
>+ #include <glib.h>
>+ #include <libxml/tree.h>
>++#include <libxml/parser.h>
>+ #include <stdarg.h>
>+ #include <glib-object.h>
>+ 
>+-- 
>+GitLab
>+

Actions: View | Diff

Attachments on bug 275865: 247180