gentoo auto-resync : 16:01:2024 - 05:29:50

5 files changed, 141 insertions, 5 deletions

diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 7b15cf851c28..02d2e6947d68 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,8 +1,10 @@
+AUX gupnp-1.4.3-libxml2-2.12.patch 1633 BLAKE2B 25ba13c651219dcd19ea293ac1c7fb4eabbb9a00e4e968dd9f008051d6083cdca39e58f5b5e5302729e379acce4f8a4be017519509a175bbc6ed3d0a2e4dbd2a SHA512 706f780ae85a1010f90f32f856393f035b00f70bfc71d4de64630b09ea0959b4d842e30fc9f2c997138ed10de6b13473183efa6ab8a1a52ec731eca37a6b13d6
 AUX gupnp-1.4.3-meson-1.2.0-fix.patch 280 BLAKE2B f1f9a4125ebb98949438beec3746c1b0752a4b6911f965b2bc5d4ed5057d891506b0b0b9a52cd7f1868f67c6ddcaa145676154653cde7af26035d609bb0dc9ef SHA512 27570f138d5256ca9e0801d1f43d6e8f3e6f965c95b9aad429babaf078f4bdc1311f51da8c7485fc7f7b6adb0da924eb177b6bfbfbc81e46e6821ccc3f923ab4
+AUX gupnp-1.6.6-libxml2-2.12.patch 1560 BLAKE2B 3260eae7d363b58d8e1a2a244e6d55942ae78dfd9a2937b2115d96aa92e2eb8be2ded71e6e5185e9734d9694908cf787db6b82de0018e33ab51813c4fe7f1913 SHA512 7bfcc60c69cc56aa8ce1c01613d8281d6b3fbb179da2f89fccc2205270b29b1220ece4a9be6f9fc06dde047fce7fbdf156010edf5880ff47e882008351166ffb
 DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
 DIST gupnp-1.6.5.tar.xz 163380 BLAKE2B 92c29db56a0fe9596bb0c523fc31be0783d6cf95b1926868a6e8a5e95ed9e28aa04ddf0f6740681995244c5020cfddb9b8ab8aeaf2baeb622185aa3a76a2986e SHA512 c34def9accb0984e17298156b7d325eebd89cc0f0f9568740b15f20a05ce523c8f97b5cc98cee1245c0bdea0a5b4fe97878b810c3325239d87d7d577cd0742a5
 DIST gupnp-1.6.6.tar.xz 245860 BLAKE2B 9cf9bb4a61e224f74aff18fb4d4491f7e9cb36cf812709b74a8c08581954d82c3c6e59d2b46cac517685a0d191846fbdb6690ac79cebc77a26b6a7d1347f3ae0 SHA512 6721f7dfda273074255e1b418d244eba72a24976e1407fdbaf24fd15a8c15a7a6d389690131563aa1f3b15fdeefb2e100da494c04c6c8e29201d402f072fcbe6
-EBUILD gupnp-1.4.3.ebuild 2281 BLAKE2B 3a31d438462a574fc1032eb9545609ff9284a22878fb7290ac929ab565ce7815e233c27e6389cabad9c0cc515afb18d2f2502aeb1f4cf78f490d6aa658d119fd SHA512 05c192f82dc24cc45e6e58b7c673cc1dd1326fb985fcf3a902b422ecc72848937ec2fa6b6501c7ef0856622f8c84178d39947baf3d37357f9d85bb044ca0c6ff
+EBUILD gupnp-1.4.3.ebuild 2328 BLAKE2B 551160f7d1ce7ed984fc20273f83ee3bfa952bd3045dbac39be2a8e70c5eb20c724e5bbf05f81dde0c8b1a0da77ff153e1f369e34509a4eb0629e109d32c2d9e SHA512 9657d0fcfecb5cb110970db70bf701426e2d71420b3c1a93a6a2a8de197c6cbb9b5c11403d9b556354eedf8d5074ea5f30823167e7a2c2cdd6a5540819624031
 EBUILD gupnp-1.6.5.ebuild 2295 BLAKE2B 5cd3b1b0b034043c19d967f0ab1440e5642ed30a6ddbed0e12d27f415e5f7f580bb8edf3bc43307410458ba0d67efcaf268e5df2e4580fc427a1b0d2615046fd SHA512 31d4f5f15886acf5d1c98df9959983ccdb7bfa8a83acc19446fc123cd398b4c3d111eaab42f3f4a4dea455977320d0f6c62031e8d64c1ae0e0657ee88383a477
-EBUILD gupnp-1.6.6.ebuild 2299 BLAKE2B adb3fdea8a176e69bb0290499d4163f14894ef176ff667f3b2e94ebc74c3165fc6064c6b4b72a5e758abae0c050b590eef9be4882fd0e7746f9a35a401162f36 SHA512 397a21666fbd618901d97f95fc41b905acb2d196e452c7f99041fe2c153d6e8330bc6ef54fb59a356ee3fdb8aab49d10e6bd950d091e913c4b7400a67ffcd892
+EBUILD gupnp-1.6.6.ebuild 2358 BLAKE2B 1b1efd48bf162f28c38e5acd32607af31a5c5f7d52002ebc25c2cd289d1bebc1e510c356417397865ff81f7fdd422ec3a38a04bb02a1a5ed86a08bbed20c3505 SHA512 88ead166d68ae85078fd19ff9e4808608aa744e99534793c91f4162a9fdc749e8579b09828c62f8921c1c35f51ec08c8328a7c65c5c5e2778fb8db342b586523
 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c
diff --git a/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch b/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch
new file mode 100644
index 000000000000..1572c97bf2cd
--- /dev/null
+++ b/net-libs/gupnp/files/gupnp-1.4.3-libxml2-2.12.patch
@@ -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
diff --git a/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch b/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch
new file mode 100644
index 000000000000..75099d26d1eb
--- /dev/null
+++ b/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch
@@ -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
diff --git a/net-libs/gupnp/gupnp-1.4.3.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild
index 6f21d4ba078e..c6094ee62d46 100644
--- a/net-libs/gupnp/gupnp-1.4.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org meson-multilib python-single-r1 vala xdg
@@ -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() {
diff --git a/net-libs/gupnp/gupnp-1.6.6.ebuild b/net-libs/gupnp/gupnp-1.6.6.ebuild
index 65a1aa08e3f7..440e5eb9ee90 100644
--- a/net-libs/gupnp/gupnp-1.6.6.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.6.ebuild
@@ -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=8
@@ -44,6 +44,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.6-libxml2-2.12.patch
+)
+
 src_prepare() {
 	default
 	use vala && vala_setup