mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
gupnp: Upgrade 0.10.2 -> 0.12.1
Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
Khem Raj
parent
795536641f
commit
41f613ebc6
|
|
@ -1,107 +0,0 @@
|
|||
From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Georg <mail@jensge.org>
|
||||
Date: Thu, 4 May 2023 19:14:29 +0200
|
||||
Subject: [PATCH] all: Drop xmlRecoverMemory
|
||||
|
||||
use xmlReadMemory, also use NONET flat
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d]
|
||||
---
|
||||
libgupnp/gupnp-control-point.c | 7 +++++--
|
||||
libgupnp/gupnp-service-info.c | 7 +++++--
|
||||
libgupnp/gupnp-service-proxy-action.c | 7 +++++--
|
||||
libgupnp/gupnp-service-proxy.c | 7 +++++--
|
||||
libgupnp/gupnp-service.c | 7 +++++--
|
||||
5 files changed, 25 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c
|
||||
index dc04732..99ebda5 100644
|
||||
--- a/libgupnp/gupnp-control-point.c
|
||||
+++ b/libgupnp/gupnp-control-point.c
|
||||
@@ -608,8 +608,11 @@ got_description_url (SoupSession *session,
|
||||
xmlDoc *xml_doc;
|
||||
|
||||
/* Parse response */
|
||||
- xml_doc = xmlRecoverMemory (msg->response_body->data,
|
||||
- msg->response_body->length);
|
||||
+ xml_doc = xmlReadMemory (msg->response_body->data,
|
||||
+ msg->response_body->length,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ XML_PARSE_NONET | XML_PARSE_RECOVER);
|
||||
if (xml_doc) {
|
||||
doc = gupnp_xml_doc_new (xml_doc);
|
||||
|
||||
diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c
|
||||
index 9a9f4de..d468801 100644
|
||||
--- a/libgupnp/gupnp-service-info.c
|
||||
+++ b/libgupnp/gupnp-service-info.c
|
||||
@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session,
|
||||
if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
|
||||
xmlDoc *scpd;
|
||||
|
||||
- scpd = xmlRecoverMemory (msg->response_body->data,
|
||||
- msg->response_body->length);
|
||||
+ scpd = xmlReadMemory (msg->response_body->data,
|
||||
+ msg->response_body->length,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ XML_PARSE_NONET | XML_PARSE_RECOVER);
|
||||
if (scpd) {
|
||||
introspection = gupnp_service_introspection_new (scpd);
|
||||
|
||||
diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c
|
||||
index 4d9336c..ef8a808 100644
|
||||
--- a/libgupnp/gupnp-service-proxy-action.c
|
||||
+++ b/libgupnp/gupnp-service-proxy-action.c
|
||||
@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy,
|
||||
}
|
||||
|
||||
/* Parse response */
|
||||
- response = xmlRecoverMemory (action->msg->response_body->data,
|
||||
- action->msg->response_body->length);
|
||||
+ response = xmlReadMemory (action->msg->response_body->data,
|
||||
+ action->msg->response_body->length,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ XML_PARSE_NONET | XML_PARSE_RECOVER);
|
||||
|
||||
if (!response) {
|
||||
if (action->msg->status_code == SOUP_STATUS_OK) {
|
||||
diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
|
||||
index 25d5ef6..af2fd46 100644
|
||||
--- a/libgupnp/gupnp-service-proxy.c
|
||||
+++ b/libgupnp/gupnp-service-proxy.c
|
||||
@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server,
|
||||
}
|
||||
|
||||
/* Parse the actual XML message content */
|
||||
- doc = xmlRecoverMemory (msg->request_body->data,
|
||||
- msg->request_body->length);
|
||||
+ doc = xmlReadMemory (msg->request_body->data,
|
||||
+ msg->request_body->length,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ XML_PARSE_NONET | XML_PARSE_RECOVER);
|
||||
if (doc == NULL) {
|
||||
/* Failed */
|
||||
g_warning ("Failed to parse NOTIFY message body");
|
||||
diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
|
||||
index 67b3d43..0ebfb26 100644
|
||||
--- a/libgupnp/gupnp-service.c
|
||||
+++ b/libgupnp/gupnp-service.c
|
||||
@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server,
|
||||
*end = '\0';
|
||||
|
||||
/* Parse action_node */
|
||||
- doc = xmlRecoverMemory (msg->request_body->data,
|
||||
- msg->request_body->length);
|
||||
+ doc = xmlReadMemory (msg->request_body->data,
|
||||
+ msg->request_body->length,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ XML_PARSE_NONET | XML_PARSE_RECOVER);
|
||||
if (doc == NULL) {
|
||||
soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST);
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001
|
||||
From: Jan Beich <jbeich@FreeBSD.org>
|
||||
Date: Sun, 9 Jul 2023 03:30:47 +0000
|
||||
Subject: [PATCH] build: properly spell [provide] in *.wrap files
|
||||
|
||||
meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
|
||||
|
||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1]
|
||||
---
|
||||
subprojects/gssdp-1.2.wrap | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap
|
||||
index 469c75d..466b83b 100644
|
||||
--- a/subprojects/gssdp-1.2.wrap
|
||||
+++ b/subprojects/gssdp-1.2.wrap
|
||||
@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
|
||||
revision = gssdp-1.4
|
||||
depth = 1
|
||||
|
||||
-[provides]
|
||||
+[provide]
|
||||
dependency_name = gssdp-1.2
|
||||
|
||||
|
|
@ -3,15 +3,11 @@ DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for cr
|
|||
LICENSE = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
|
||||
DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2"
|
||||
|
||||
inherit meson pkgconfig vala gobject-introspection
|
||||
inherit gnomebase pkgconfig vala gobject-introspection
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \
|
||||
file://0001-all-Drop-xmlRecoverMemory.patch \
|
||||
file://0001-build-properly-spell-provide-in-.wrap-files.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c"
|
||||
SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f"
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user