debian/patches: 0001_build_with_gupnp10_or_gupnp12.patch. Applied upstream.

debian/patches/0001_build_with_gupnp10_or_gupnp12.patch

@@ -1,33 +0,0 @@
-Origin: https://patch-diff.githubusercontent.com/raw/mate-desktop/caja-extensions/pull/53.diff
-Author: Jonathan Brielmaier <jbrielmaier@suse.de>
-Description: Build either with gupnp version 1.0 or 1.2.
-
-diff --git a/configure.ac b/configure.ac
-index 96b3578..0594115 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,6 +196,8 @@ if test "x$enable_sendto" = "xyes"; then
-             fi
-             ;;
-             upnp)
-+                PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED,
-+                    enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_2], 1, ["Version is at least 1.2"]), enable_upnp=no)
-                 PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED,
-                     enable_upnp=yes, enable_upnp=no)
-                 if test "${enable_upnp}" != "yes" ; then
-diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c
-index b381587..81a4f0a 100644
---- a/sendto/plugins/upnp/upnp.c
-+++ b/sendto/plugins/upnp/upnp.c
-@@ -206,7 +206,11 @@ init (NstPlugin *plugin)
- 		return FALSE;
- 	g_free (upload_cmd);
- 
-+#ifdef HAS_GUPNP_VERSION_1_2
-+	context_manager = gupnp_context_manager_create (0);
-+#else
- 	context_manager = gupnp_context_manager_new (NULL, 0);
-+#endif
- 	g_assert (context_manager != NULL);
- 	g_signal_connect (context_manager, "context-available",
- 			  G_CALLBACK (on_context_available), NULL);

debian/patches/series

@@ -1,3 +1,2 @@
 2001_support-icedove-in-caja-sendto.patch
-1001_pkg-config-macro-not-cross-compilation-safe.patch
+1001_pkg-config-macro-not-cross-compilation-safe.patch
-0001_build_with_gupnp10_or_gupnp12.patch