Accepting request 708468 from GNOME:Next

- Add gupnp-igd-port-to-new-gupnp-api.patch: Port to new GUPnP API.
- Following the above patch, replace pkgconfig(gssdp-1.0) and
  pkgconfig(gupnp-1.0) with pkgconfig(gssdp-1.2) and
  pkgconfig(gupnp-1.2) and add libtool BuildRequires aswell as pass
  autoreconf, as the patch touches the  buildsystem.

OBS-URL: https://build.opensuse.org/request/show/708468
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-igd?expand=0&rev=48

gupnp-igd-port-to-new-gupnp-api.patch

@@ -0,0 +1,99 @@
+From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+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
+

gupnp-igd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Jan  6 00:34:44 UTC 2019 - bjorn.lie@gmail.com
+
+- Add gupnp-igd-port-to-new-gupnp-api.patch: Port to new GUPnP API.
+- Following the above patch, replace pkgconfig(gssdp-1.0) and
+  pkgconfig(gupnp-1.0) with pkgconfig(gssdp-1.2) and
+  pkgconfig(gupnp-1.2) and add libtool BuildRequires aswell as pass
+  autoreconf, as the patch touches the  buildsystem.
+
 -------------------------------------------------------------------
 Sat Jan  5 22:51:40 UTC 2019 - bjorn.lie@gmail.com
 

gupnp-igd.spec

@@ -27,15 +27,18 @@ Source:         http://download.gnome.org/sources/gupnp-igd/0.2/%{name}-%{versio
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM gupnp-igd-free-GStaticMutex-in-AddRemoveData.patch -- Free GStaticMutex in AddRemoveData
 Patch0:         gupnp-igd-free-GStaticMutex-in-AddRemoveData.patch
+# PATCH-FIX-UPSTREAM gupnp-igd-port-to-new-gupnp-api.patch -- Port to new GUPnP API
+Patch1:         gupnp-igd-port-to-new-gupnp-api.patch
 
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0) >= 2.26
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.26
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gssdp-1.0)
+BuildRequires:  pkgconfig(gssdp-1.2)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk-doc)
-BuildRequires:  pkgconfig(gupnp-1.0) >= 0.18
+BuildRequires:  pkgconfig(gupnp-1.2)
 
 %description
 GUPnP-IGD is a library to handle UPnP IGD port mapping. It is supposed
@@ -75,6 +78,7 @@ to have a very simple API.
 %autosetup -p1
 
 %build
+autoreconf -fiv
 %configure \
 	--disable-static \
 	%{nil}