[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: 15c30f600b3ae540df62a4672272da705ccb85ae
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Feb 20 17:31:08 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Feb 21 20:56:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c30f60
net-libs/gupnp-igd: add revision compatible with gupnp-1.2 API
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch | 99 ++
net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild | 58 +++
2 files changed, 157 insertions(+)
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
new file mode 100644
index 000..c70bf6fea48
--- /dev/null
+++ b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg
+Date: Sat, 1 Dec 2018 21:33:21 +0100
+Subject: [PATCH] Swtich to new GUPnP API
+
+---
+ configure.ac| 2 +-
+ gupnp-igd-1.0-uninstalled.pc.in | 2 +-
+ gupnp-igd-1.0.pc.in | 2 +-
+ libgupnp-igd/Makefile.am| 2 +-
+ tests/gtest/gupnp-simple-igd.c | 6 --
+ 5 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f03921f..aa7f0ca 100644
+--- a/configure.ac
b/configure.ac
+@@ -11,7 +11,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0
gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2
gupnp-1.2 >= 0.18 gthread-2.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
+index 483956f..6db3bee 100644
+--- a/gupnp-igd-1.0-uninstalled.pc.in
b/gupnp-igd-1.0-uninstalled.pc.in
+@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: ${libdir}/libgupnp-av-1.0.la
+ Cflags: -I${includedir}
+diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
+index 6660d63..aa74ed3 100644
+--- a/gupnp-igd-1.0.pc.in
b/gupnp-igd-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: gupnp-igd-1.0
+ Description: GUPnP Simple IGD library
+-Requires: gupnp-1.0
++Requires: gupnp-1.2
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-igd-1.0
+ Cflags: -I${includedir}/gupnp-igd-1.0
+diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
+index fe020b5..e10d857 100644
+--- a/libgupnp-igd/Makefile.am
b/libgupnp-igd/Makefile.am
+@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
+ GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
+ GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES)
$(libgupnp_igd_inc_HEADERS)
+ GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
+-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
+ GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
+
+ if HAVE_INTROSPECTION
+diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
+index 9b32b2a..d051d13 100644
+--- a/tests/gtest/gupnp-simple-igd.c
b/tests/gtest/gupnp-simple-igd.c
+@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ GUPnPDeviceInfo *subdev1;
+ GUPnPDeviceInfo *subdev2;
+ const gchar *xml_path = ".";
++ GError *error = NULL;
+
+ g_signal_connect (igd, "context-available",
+ G_CALLBACK (ignore_non_localhost), NULL);
+
+ if (mainctx)
+ g_main_context_push_thread_default (mainctx);
+- context = gupnp_context_new (NULL, "lo", 0, NULL);
++ context = gupnp_context_new ("lo", 0, NULL);
+ g_assert (context);
+
+ if (g_getenv ("XML_PATH"))
+@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx,
GUPnPSimpleIgd *igd,
+ gupnp_context_host_path (context, "WANPPPConnection.xml",
"/WANPPPConnection.xml");
+ */
+
+- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path);
++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml",
xml_path, &error);
+ g_assert (dev);
++ g_assert (error == NULL);
+
+ subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
+ "urn:schemas-upnp-org:device:WANDevice:1");
+--
+2.24.1
+
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
new file mode 100644
index 000..2a9e22641b4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune gnome.org multilib-minimal xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org";
+
+LICENSE="LGPL-2.1+"
+SL
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
[gentoo-commits] repo/gentoo:master commit in: net-libs/gupnp-igd/files/, net-libs/gupnp-igd/
commit: feca79459a135344146542bbe18b3689eac592dc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Jan 8 22:23:15 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Jan 8 22:55:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca7945
net-libs/gupnp-igd: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-libs/gupnp-igd/Manifest| 2 -
.../files/gupnp-igd-0.2.2-underlinking.patch | 16
net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild | 94 --
net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild | 106 -
4 files changed, 218 deletions(-)
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 6c46ed393ca..119e1afa2ea 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,4 +1,2 @@
-DIST gupnp-igd-0.2.2.tar.xz 262216 BLAKE2B
a2c1980569b75643b4fc0ce3c28af0e949176572a8368179ad1152b3b9e5a0a879e067c48b37d423855c94f2cf993e8aea8b901b0684c33d31d78e64e3d26d24
SHA512
5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583
-DIST gupnp-igd-0.2.3.tar.xz 269920 BLAKE2B
e3fd67b04f91348c1fbf236f6a9dc03e10575bacbed6ebc99a1be2817983844c2390b2f057c6464ed74e4f140c4cc2fb6bc941296b2db945a90647b77304b14c
SHA512
74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac
DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B
d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c
SHA512
4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8
DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B
2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe
SHA512
3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
deleted file mode 100644
index 0e1dfb48a38..000
--- a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c4f7d47..f13b398 100644
a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
-
--PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0
gssdp-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
deleted file mode 100644
index f1c343c3cbf..000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome.org python-r1
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- net-libs/gssdp
- >=net-libs/gupnp-0.18
- >=dev-libs/glib-2.16:2
- introspection? ( >=dev-libs/gobject-introspection-0.10 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/gobject-introspection-0.10
- >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
- )
-
-src_prepare() {
- rm missing || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
- # Python bindings are built/installed manually.
- if use python; then
- sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
Makefile.in || die
- fi
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --disable-gtk-doc
- $(use_enable introspection)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use pytho
