[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp/, net-libs/gupnp/files/
commit: bedc298560e0331a73f8ca95e8a5e02bbd5ecaee
Author: Sam James gentoo org>
AuthorDate: Tue Jan 16 03:04:34 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 16 03:14:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bedc2985
net-libs/gupnp: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/917555
Signed-off-by: Sam James gentoo.org>
.../gupnp/files/gupnp-1.4.3-libxml2-2.12.patch | 63 +
.../gupnp/files/gupnp-1.6.6-libxml2-2.12.patch | 66 ++
net-libs/gupnp/gupnp-1.4.3.ebuild | 3 +-
net-libs/gupnp/gupnp-1.6.6.ebuild | 4 ++
4 files changed, 135 insertions(+), 1 deletion(-)
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 ..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
+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
+ #include
+
++#include
++
+ #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
+
++#include
++
+ #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
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/libgupnp/gupnp-xml-doc.c
b/libgupnp/gupnp-xml-doc.c
+@@ -22,6 +22,7 @@
+
+ #include
+ #include
++#include
+ #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
++#include
+ #include
+ #include
+ #include
+--
+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 ..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
+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
+ #include
+
++#include
++
+ #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
+
++#include
++
+ #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
+ #include
+
++#include
++
+ #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
+ #include
+ #include
++
++#include
++
+ #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
++#include
++
+ #include
+ #include
+
+--
+GitLab
diff --git a/net-libs/gupnp/gupnp-1.4.3.ebuild
b/net-libs/gupnp/gupnp-1.4.3.ebuild
index 6f21d4ba078e..ed3e1e7879cd 100644
--- a/net-libs/gupnp/gupnp-1.4.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.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=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() {
diff --git a/net-libs/gupnp/gupnp-1.6.6.ebuild
b/net-libs/gupnp/gupnp-1.6.6.ebuild
index 65a1aa08e3f7..d9c421131769 100644
--- a/net-libs/gupnp/gupnp-1.6.6.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.6.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.6-libxml2-2.12.patch
+)
+
src_prepare() {
default
use vala &&
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp/, net-libs/gupnp/files/
commit: 44ebdf9667d91b76105264dfd8e8cc2c99d0b064
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Nov 7 15:07:18 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Nov 7 15:21:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44ebdf96
net-libs/gupnp: remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp/Manifest| 1 -
net-libs/gupnp/files/1.2.2-build-manpage.patch | 55 -
net-libs/gupnp/gupnp-1.2.3.ebuild | 84 --
3 files changed, 140 deletions(-)
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 9c1a48f14df..f527ac0d13b 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,2 +1 @@
-DIST gupnp-1.2.3.tar.xz 138428 BLAKE2B
23f7f677ee9d58c43ba69d6e707e26b17efa5b510f4b14b41006b332f196037fcb103b64e6b1f91260383232ad6d19872b1e8d856878b103c5c2612d3bafae63
SHA512
85caa68a4c6f4b1ccf21d910048a59b6db2b21e8bd728404b28eb0f00b588a1ab55f3ff3227e76199a20554b0708128680379e7ffa5fe162cccb4a1e3e322101
DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B
a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b0de85c5b7151f0ffca93b50248a303dd040c2d7e9fb215a0edb0627fa3a8a16835b55d90459c623faaad62b
SHA512
cb787264b5a1bcb4f547f7a9d7a5e4e712f91ecbb593f12b2c51aed0607abd6fbfd43e5c42e261eb853d09358685637e172c78e3e9a6059bccdeb1176e6e4ef7
diff --git a/net-libs/gupnp/files/1.2.2-build-manpage.patch
b/net-libs/gupnp/files/1.2.2-build-manpage.patch
deleted file mode 100644
index ce03a171b88..000
--- a/net-libs/gupnp/files/1.2.2-build-manpage.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 23f54c2a1e8718e836224d68dafded091604a677 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp
-Date: Thu, 20 Feb 2020 12:15:33 +0200
-Subject: [PATCH] build: Always build gupnp-binding-tool manpage
-
-manpage generation shouldn't be dependent on gtk_doc option
- doc/meson.build | 2 ++
- meson.build | 5 +
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index 478650b..b71b657 100644
a/doc/meson.build
-+++ b/doc/meson.build
-@@ -4,6 +4,7 @@ version_xml = configure_file(input: 'version.xml.in',
-output: 'version.xml', configuration:
-entities)
-
-+if get_option('gtk_doc')
- gnome.gtkdoc('gupnp',
- main_xml : 'gupnp-docs.xml',
- src_dir : [join_paths(meson.source_root(), 'libgupnp'),
-@@ -26,6 +27,7 @@ gnome.gtkdoc('gupnp',
- 'gupnp-types-private.h'
- ],
- install : true)
-+endif
-
- xsltproc = find_program('xsltproc', required: false)
- if xsltproc.found()
-diff --git a/meson.build b/meson.build
-index e0dce33..eb3c82d 100644
a/meson.build
-+++ b/meson.build
-@@ -31,15 +31,12 @@ dependencies = [
- subdir('libgupnp')
- subdir('tests')
- subdir('tools')
-+subdir('doc')
-
- if get_option('vapi') and get_option('introspection')
- subdir('vala')
- endif
-
--if get_option('gtk_doc')
--subdir('doc')
--endif
--
- if get_option('examples')
- subdir('examples')
- endif
---
-2.20.1
-
diff --git a/net-libs/gupnp/gupnp-1.2.3.ebuild
b/net-libs/gupnp/gupnp-1.2.3.ebuild
deleted file mode 100644
index f95420747be..000
--- a/net-libs/gupnp/gupnp-1.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control
points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP;
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="0/1.2-0" # -
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
- >=net-libs/gssdp-1.2.3:0=[introspection?,${MULTILIB_USEDEP}]
- >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4[${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/gtk-doc-1.14
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.2 )
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- virtual/pkgconfig
- !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers
) ) )
- vala? ( $(vala_depend)
-
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp/, net-libs/gupnp/files/
commit: 0fd110fccf5e9108dd2dd55b0649695e87c0a27f
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 10:47:11 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd110fc
net-libs/gupnp: bump to 1.2.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp/Manifest| 1 +
net-libs/gupnp/files/1.2.2-build-manpage.patch | 55
net-libs/gupnp/gupnp-1.2.2.ebuild | 88 ++
3 files changed, 144 insertions(+)
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index c585e23a214..5dab800f9ca 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1 +1,2 @@
DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B
ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef
SHA512
54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
+DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B
f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588
SHA512
08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
diff --git a/net-libs/gupnp/files/1.2.2-build-manpage.patch
b/net-libs/gupnp/files/1.2.2-build-manpage.patch
new file mode 100644
index 000..ce03a171b88
--- /dev/null
+++ b/net-libs/gupnp/files/1.2.2-build-manpage.patch
@@ -0,0 +1,55 @@
+From 23f54c2a1e8718e836224d68dafded091604a677 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Thu, 20 Feb 2020 12:15:33 +0200
+Subject: [PATCH] build: Always build gupnp-binding-tool manpage
+
+manpage generation shouldn't be dependent on gtk_doc option
+---
+ doc/meson.build | 2 ++
+ meson.build | 5 +
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index 478650b..b71b657 100644
+--- a/doc/meson.build
b/doc/meson.build
+@@ -4,6 +4,7 @@ version_xml = configure_file(input: 'version.xml.in',
+output: 'version.xml', configuration:
+entities)
+
++if get_option('gtk_doc')
+ gnome.gtkdoc('gupnp',
+ main_xml : 'gupnp-docs.xml',
+ src_dir : [join_paths(meson.source_root(), 'libgupnp'),
+@@ -26,6 +27,7 @@ gnome.gtkdoc('gupnp',
+ 'gupnp-types-private.h'
+ ],
+ install : true)
++endif
+
+ xsltproc = find_program('xsltproc', required: false)
+ if xsltproc.found()
+diff --git a/meson.build b/meson.build
+index e0dce33..eb3c82d 100644
+--- a/meson.build
b/meson.build
+@@ -31,15 +31,12 @@ dependencies = [
+ subdir('libgupnp')
+ subdir('tests')
+ subdir('tools')
++subdir('doc')
+
+ if get_option('vapi') and get_option('introspection')
+ subdir('vala')
+ endif
+
+-if get_option('gtk_doc')
+-subdir('doc')
+-endif
+-
+ if get_option('examples')
+ subdir('examples')
+ endif
+--
+2.20.1
+
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild
b/net-libs/gupnp/gupnp-1.2.2.ebuild
new file mode 100644
index 000..7dbdfad5cae
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control
points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP;
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # -
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+ >=net-libs/gssdp-1.1.3:0=[introspection?,${MULTILIB_USEDEP}]
+ >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${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/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.2 )
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers
) ) )
+ vala? (
