summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch107
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch25
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb (renamed from meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb)10
3 files changed, 3 insertions, 139 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch
deleted file mode 100644
index a3941f345f..0000000000
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001
2From: Jens Georg <mail@jensge.org>
3Date: Thu, 4 May 2023 19:14:29 +0200
4Subject: [PATCH] all: Drop xmlRecoverMemory
5
6use xmlReadMemory, also use NONET flat
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d]
10---
11 libgupnp/gupnp-control-point.c | 7 +++++--
12 libgupnp/gupnp-service-info.c | 7 +++++--
13 libgupnp/gupnp-service-proxy-action.c | 7 +++++--
14 libgupnp/gupnp-service-proxy.c | 7 +++++--
15 libgupnp/gupnp-service.c | 7 +++++--
16 5 files changed, 25 insertions(+), 10 deletions(-)
17
18diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c
19index dc04732..99ebda5 100644
20--- a/libgupnp/gupnp-control-point.c
21+++ b/libgupnp/gupnp-control-point.c
22@@ -608,8 +608,11 @@ got_description_url (SoupSession *session,
23 xmlDoc *xml_doc;
24
25 /* Parse response */
26- xml_doc = xmlRecoverMemory (msg->response_body->data,
27- msg->response_body->length);
28+ xml_doc = xmlReadMemory (msg->response_body->data,
29+ msg->response_body->length,
30+ NULL,
31+ NULL,
32+ XML_PARSE_NONET | XML_PARSE_RECOVER);
33 if (xml_doc) {
34 doc = gupnp_xml_doc_new (xml_doc);
35
36diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c
37index 9a9f4de..d468801 100644
38--- a/libgupnp/gupnp-service-info.c
39+++ b/libgupnp/gupnp-service-info.c
40@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session,
41 if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
42 xmlDoc *scpd;
43
44- scpd = xmlRecoverMemory (msg->response_body->data,
45- msg->response_body->length);
46+ scpd = xmlReadMemory (msg->response_body->data,
47+ msg->response_body->length,
48+ NULL,
49+ NULL,
50+ XML_PARSE_NONET | XML_PARSE_RECOVER);
51 if (scpd) {
52 introspection = gupnp_service_introspection_new (scpd);
53
54diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c
55index 4d9336c..ef8a808 100644
56--- a/libgupnp/gupnp-service-proxy-action.c
57+++ b/libgupnp/gupnp-service-proxy-action.c
58@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy,
59 }
60
61 /* Parse response */
62- response = xmlRecoverMemory (action->msg->response_body->data,
63- action->msg->response_body->length);
64+ response = xmlReadMemory (action->msg->response_body->data,
65+ action->msg->response_body->length,
66+ NULL,
67+ NULL,
68+ XML_PARSE_NONET | XML_PARSE_RECOVER);
69
70 if (!response) {
71 if (action->msg->status_code == SOUP_STATUS_OK) {
72diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
73index 25d5ef6..af2fd46 100644
74--- a/libgupnp/gupnp-service-proxy.c
75+++ b/libgupnp/gupnp-service-proxy.c
76@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server,
77 }
78
79 /* Parse the actual XML message content */
80- doc = xmlRecoverMemory (msg->request_body->data,
81- msg->request_body->length);
82+ doc = xmlReadMemory (msg->request_body->data,
83+ msg->request_body->length,
84+ NULL,
85+ NULL,
86+ XML_PARSE_NONET | XML_PARSE_RECOVER);
87 if (doc == NULL) {
88 /* Failed */
89 g_warning ("Failed to parse NOTIFY message body");
90diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
91index 67b3d43..0ebfb26 100644
92--- a/libgupnp/gupnp-service.c
93+++ b/libgupnp/gupnp-service.c
94@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server,
95 *end = '\0';
96
97 /* Parse action_node */
98- doc = xmlRecoverMemory (msg->request_body->data,
99- msg->request_body->length);
100+ doc = xmlReadMemory (msg->request_body->data,
101+ msg->request_body->length,
102+ NULL,
103+ NULL,
104+ XML_PARSE_NONET | XML_PARSE_RECOVER);
105 if (doc == NULL) {
106 soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST);
107
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch
deleted file mode 100644
index 66f07094c5..0000000000
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001
2From: Jan Beich <jbeich@FreeBSD.org>
3Date: Sun, 9 Jul 2023 03:30:47 +0000
4Subject: [PATCH] build: properly spell [provide] in *.wrap files
5
6meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
7
8Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1]
10---
11 subprojects/gssdp-1.2.wrap | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap
15index 469c75d..466b83b 100644
16--- a/subprojects/gssdp-1.2.wrap
17+++ b/subprojects/gssdp-1.2.wrap
18@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
19 revision = gssdp-1.4
20 depth = 1
21
22-[provides]
23+[provide]
24 dependency_name = gssdp-1.2
25
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
index efeb66f28f..c6738923ac 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb
@@ -3,15 +3,11 @@ DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for cr
3LICENSE = "LGPL-2.1-or-later" 3LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5 5
6DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" 6DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2"
7 7
8inherit meson pkgconfig vala gobject-introspection 8inherit gnomebase pkgconfig vala gobject-introspection
9 9
10SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ 10SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f"
11 file://0001-all-Drop-xmlRecoverMemory.patch \
12 file://0001-build-properly-spell-provide-in-.wrap-files.patch \
13"
14SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c"
15 11
16SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" 12SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
17 13
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-22 11:47:56 +0000