mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
net-libs/gupnp: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/917555 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
https://bugs.gentoo.org/917555
|
||||
https://gitlab.gnome.org/GNOME/gupnp/-/commit/387ca6714bcef64399e1bfdd599612cf3f9e75db
|
||||
|
||||
From 387ca6714bcef64399e1bfdd599612cf3f9e75db Mon Sep 17 00:00:00 2001
|
||||
From: Jens Georg <mail@jensge.org>
|
||||
Date: Sat, 25 Nov 2023 17:56:02 +0100
|
||||
Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x
|
||||
|
||||
Cherry-picked from 00514fb62ebd341803fa44e26a6482a8c25dbd34
|
||||
--- a/libgupnp/gupnp-control-point.c
|
||||
+++ b/libgupnp/gupnp-control-point.c
|
||||
@@ -22,6 +22,8 @@
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include "gupnp-control-point.h"
|
||||
#include "gupnp-context-private.h"
|
||||
#include "gupnp-resource-factory-private.h"
|
||||
--- a/libgupnp/gupnp-service-proxy-action.c
|
||||
+++ b/libgupnp/gupnp-service-proxy-action.c
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include "gupnp-error-private.h"
|
||||
#include "gupnp-service-proxy.h"
|
||||
#include "gupnp-service-proxy-private.h"
|
||||
--- a/libgupnp/gupnp-service-proxy.c
|
||||
+++ b/libgupnp/gupnp-service-proxy.c
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <config.h>
|
||||
#include <libsoup/soup.h>
|
||||
+#include <libxml/parser.h>
|
||||
#include <gobject/gvaluecollector.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
--- a/libgupnp/gupnp-xml-doc.c
|
||||
+++ b/libgupnp/gupnp-xml-doc.c
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
+#include <libxml/parser.h>
|
||||
#include "gupnp-xml-doc.h"
|
||||
#include "gupnp-error.h"
|
||||
|
||||
--- a/libgupnp/xml-util.h
|
||||
+++ b/libgupnp/xml-util.h
|
||||
@@ -10,6 +10,7 @@
|
||||
#define GUPNP_XML_UTIL_H
|
||||
|
||||
#include <libxml/tree.h>
|
||||
+#include <libxml/parser.h>
|
||||
#include <libsoup/soup-uri.h>
|
||||
#include <stdarg.h>
|
||||
#include <glib-object.h>
|
||||
--
|
||||
GitLab
|
||||
@@ -0,0 +1,66 @@
|
||||
https://bugs.gentoo.org/917555
|
||||
https://gitlab.gnome.org/GNOME/gupnp/-/commit/00514fb62ebd341803fa44e26a6482a8c25dbd34
|
||||
|
||||
From 00514fb62ebd341803fa44e26a6482a8c25dbd34 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Georg <mail@jensge.org>
|
||||
Date: Sat, 25 Nov 2023 17:56:02 +0100
|
||||
Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x
|
||||
|
||||
--- a/libgupnp/gupnp-control-point.c
|
||||
+++ b/libgupnp/gupnp-control-point.c
|
||||
@@ -27,6 +27,8 @@
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include "gupnp-control-point.h"
|
||||
#include "gupnp-context-private.h"
|
||||
#include "gupnp-resource-factory-private.h"
|
||||
--- a/libgupnp/gupnp-service-proxy-action.c
|
||||
+++ b/libgupnp/gupnp-service-proxy-action.c
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include "gupnp-error.h"
|
||||
#include "gupnp-service-proxy.h"
|
||||
#include "gvalue-util.h"
|
||||
--- a/libgupnp/gupnp-service-proxy.c
|
||||
+++ b/libgupnp/gupnp-service-proxy.c
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <locale.h>
|
||||
#include <errno.h>
|
||||
|
||||
+#include <libxml/globals.h>
|
||||
+
|
||||
#include "gena-protocol.h"
|
||||
#include "gupnp-context-private.h"
|
||||
#include "gupnp-error-private.h"
|
||||
--- a/libgupnp/gupnp-xml-doc.c
|
||||
+++ b/libgupnp/gupnp-xml-doc.c
|
||||
@@ -15,6 +15,9 @@
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
#include <gio/gio.h>
|
||||
+
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include "gupnp-xml-doc.h"
|
||||
#include "gupnp-error.h"
|
||||
|
||||
--- a/libgupnp/xml-util.h
|
||||
+++ b/libgupnp/xml-util.h
|
||||
@@ -10,6 +10,8 @@
|
||||
#define GUPNP_XML_UTIL_H
|
||||
|
||||
#include <libxml/tree.h>
|
||||
+#include <libxml/parser.h>
|
||||
+
|
||||
#include <stdarg.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
--
|
||||
GitLab
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@@ -46,6 +46,7 @@ BDEPEND="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.4.3-meson-1.2.0-fix.patch
|
||||
"${FILESDIR}"/${PN}-1.4.3-libxml2-2.12.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -44,6 +44,10 @@ BDEPEND="
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.6-libxml2-2.12.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
use vala && vala_setup
|
||||
|
||||
Reference in New Issue
Block a user