diff --git a/common/shlibs b/common/shlibs index 067e790d432..3c9340ef0af 100644 --- a/common/shlibs +++ b/common/shlibs @@ -821,7 +821,7 @@ libfolks-dummy.so.26 folks-0.15.0_1 libfolks-telepathy.so.26 folks-0.15.0_1 libfolks-eds.so.26 folks-0.15.0_1 libnice.so.10 libnice-0.1.18_3 -libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1 +libgupnp-igd-1.6.so.0 gupnp-igd-1.4.0_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1 libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 diff --git a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch b/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch deleted file mode 100644 index 248e9704f8c..00000000000 --- a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch +++ /dev/null @@ -1,100 +0,0 @@ -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.18.1 - - diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template index 17a80d67b9a..3fab6566e01 100644 --- a/srcpkgs/gupnp-igd/template +++ b/srcpkgs/gupnp-igd/template @@ -1,27 +1,26 @@ # Template file for 'gupnp-igd' pkgname=gupnp-igd -version=0.2.5 -revision=3 -build_style=gnu-configure +version=1.4.0 +revision=1 +_commit=a10bc3732e978f364319cbf7e67b71efa6b0b504 +build_style=meson build_helper="gir" -configure_args="--disable-python --disable-static $(vopt_enable gir introspection)" -hostmakedepends="automake pkg-config glib-devel libtool gobject-introspection gtk-doc" +configure_args="$(vopt_bool gir introspection)" +hostmakedepends="pkg-config glib-devel" makedepends="libglib-devel libxml2-devel libsoup-devel gssdp-devel gupnp-devel" short_desc="Library to handle UPnP IGD port mapping" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://gupnp.org" -distfiles="${GNOME_SITE}/${pkgname}/0.2/${pkgname}-${version}.tar.xz" -checksum=8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20 +changelog="https://gitlab.gnome.org/GNOME/gupnp-igd/-/raw/master/NEWS" +#distfiles="${GNOME_SITE}/gupnp-igd/${version%.*}/gupnp-igd-${version}.tar.xz" +distfiles="https://gitlab.gnome.org/GNOME/gupnp-igd/-/archive/$_commit/gupnp-igd-$_commit.tar.gz" +checksum=6dcfef6298bd2fceed36393b43cb46254b22bded577bad244f8b043210e98b5f # Package build options build_options="gir" build_options_default="gir" -pre_configure() { - autoreconf -fi -} - gupnp-igd-devel_package() { depends="gupnp-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"