commit: 47e561d183e2d8b6acd0ee6cc1bf4e70a02875c2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Thu Jul 31 17:17:38 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Thu Jul 31 17:21:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e561d1
net-libs/gupnp: drop 1.6.6-r1, 1.6.7-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> net-libs/gupnp/Manifest | 2 - .../gupnp/files/gupnp-1.6.6-libxml2-2.12.patch | 66 ------------------ net-libs/gupnp/gupnp-1.6.6-r1.ebuild | 81 ---------------------- net-libs/gupnp/gupnp-1.6.7-r1.ebuild | 77 -------------------- 4 files changed, 226 deletions(-) diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest index d8f1bc985bdb..95d36f2c237e 100644 --- a/net-libs/gupnp/Manifest +++ b/net-libs/gupnp/Manifest @@ -1,5 +1,3 @@ DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb -DIST gupnp-1.6.6.tar.xz 245860 BLAKE2B 9cf9bb4a61e224f74aff18fb4d4491f7e9cb36cf812709b74a8c08581954d82c3c6e59d2b46cac517685a0d191846fbdb6690ac79cebc77a26b6a7d1347f3ae0 SHA512 6721f7dfda273074255e1b418d244eba72a24976e1407fdbaf24fd15a8c15a7a6d389690131563aa1f3b15fdeefb2e100da494c04c6c8e29201d402f072fcbe6 -DIST gupnp-1.6.7.tar.xz 205372 BLAKE2B 9d9ec09b10da97308338cb3cd5e4248d30197ed5ba2d530db17a96e432c64d2d86b63aaf9ce7df61efb7006b2168dd16a9aa64c0f64f2befdd48cbc584ebbede SHA512 27083948a92686e4ba654afdd0fb8793601750108d70f08f0b3a6f565d0360c60f23d69a6bc225d1b00feb6db38cf9307d495c6deccba3ed716053af48966125 DIST gupnp-1.6.8.tar.xz 1288496 BLAKE2B c31a39bcef1ad04a4ce44b97ebea31fc1da78e465e0721cb4c09c143dc85199191dd06e5a2d6a80ff1fd6c35da21c9987917b4e0b1604090165c9e9cce477386 SHA512 8885f3cdb437062b14292d213a5e1599c3722c991e2edaad777769cd1430e354fa46f27b033310621dcba7aa08c9d6397afe7c31a2e189ed21ff29df880f282e DIST gupnp-1.6.9.tar.xz 1289220 BLAKE2B 6e6e46599ed1fbf8402eaa0c3c2a1714f0909822455d72497d4ed1f810e76d0ff5df2c96230625c2097e6f73ef64cad40d5740a46aa95eec54f3493ed12479e8 SHA512 016c946f6fff47f65abd2761afc7ac3b7b42d7f48626472c28badaa6ec8a1d656e3860fd780ad4c189b1673c2b32486e113bd8b2d7c09c00aefd9486888dc029 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 deleted file mode 100644 index 75099d26d1eb..000000000000 --- a/net-libs/gupnp/files/gupnp-1.6.6-libxml2-2.12.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 <[email protected]> -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.6.6-r1.ebuild b/net-libs/gupnp/gupnp-1.6.6-r1.ebuild deleted file mode 100644 index a46480e5dda0..000000000000 --- a/net-libs/gupnp/gupnp-1.6.6-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -PYTHON_REQ_USE="xml(+)" - -inherit gnome.org meson-multilib python-single-r1 vala xdg - -DESCRIPTION="An object-oriented framework for creating UPnP devs and control points" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"; - -LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ -SLOT="1.6/1.6-0" # <API version>-<soname> -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" - -IUSE="connman gtk-doc +introspection networkmanager +vala" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( connman networkmanager ) - gtk-doc? ( introspection ) -" - -# prefix: uuid dependency can be adapted to non-linux platforms -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] - >=net-libs/gssdp-1.6.2:1.6=[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:=[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}] - >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - virtual/pkgconfig - !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) - vala? ( $(vala_depend) - >=net-libs/gssdp-1.5.2:1.6[vala] - net-libs/libsoup:3.0[vala] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.6-libxml2-2.12.patch -) - -src_prepare() { - default - use vala && vala_setup - - # This makes sense for upstream but not for us downstream, bug #906124. - sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die -} - -multilib_src_configure() { - local backend=system - use kernel_linux && backend=linux - use connman && backend=connman - use networkmanager && backend=network-manager - - local emesonargs=( - -Dcontext_manager=${backend} - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - -Dexamples=false - ) - meson_src_configure -} - -multilib_src_install_all() { - python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6 - if use gtk-doc ; then - mkdir "${ED}"/usr/share/gtk-doc || die - mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die - fi -} diff --git a/net-libs/gupnp/gupnp-1.6.7-r1.ebuild b/net-libs/gupnp/gupnp-1.6.7-r1.ebuild deleted file mode 100644 index 10fb4cbd652e..000000000000 --- a/net-libs/gupnp/gupnp-1.6.7-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -PYTHON_REQ_USE="xml(+)" - -inherit gnome.org meson-multilib python-single-r1 vala xdg - -DESCRIPTION="An object-oriented framework for creating UPnP devs and control points" -HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"; - -LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+ -SLOT="1.6/1.6-0" # <API version>-<soname> -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" - -IUSE="connman gtk-doc +introspection networkmanager +vala" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( connman networkmanager ) - gtk-doc? ( introspection ) -" - -# prefix: uuid dependency can be adapted to non-linux platforms -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] - >=net-libs/gssdp-1.6.2:1.6=[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:=[${MULTILIB_USEDEP}] - >=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}] - >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - virtual/pkgconfig - !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) - vala? ( $(vala_depend) - >=net-libs/gssdp-1.5.2:1.6[vala] - net-libs/libsoup:3.0[vala] - ) -" - -src_prepare() { - default - use vala && vala_setup - - # This makes sense for upstream but not for us downstream, bug #906124. - sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die -} - -multilib_src_configure() { - local backend=system - use kernel_linux && backend=linux - use connman && backend=connman - use networkmanager && backend=network-manager - - local emesonargs=( - -Dcontext_manager=${backend} - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_use_bool gtk-doc gtk_doc) - -Dexamples=false - ) - meson_src_configure -} - -multilib_src_install_all() { - python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6 - if use gtk-doc ; then - mkdir "${ED}"/usr/share/gtk-doc || die - mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die - fi -}
