From c8c45a2d1ccc475bfa49bd8c748172b47a72cc5b Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Sat, 21 Sep 2019 12:21:23 +0200 Subject: [PATCH] debian/patches: 0001_build_with_gupnp10_or_gupnp12.patch. Applied upstream. --- .../0001_build_with_gupnp10_or_gupnp12.patch | 33 ------------------- debian/patches/series | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 debian/patches/0001_build_with_gupnp10_or_gupnp12.patch diff --git a/debian/patches/0001_build_with_gupnp10_or_gupnp12.patch b/debian/patches/0001_build_with_gupnp10_or_gupnp12.patch deleted file mode 100644 index b74467f..0000000 --- a/debian/patches/0001_build_with_gupnp10_or_gupnp12.patch +++ /dev/null @@ -1,33 +0,0 @@ -Origin: https://patch-diff.githubusercontent.com/raw/mate-desktop/caja-extensions/pull/53.diff -Author: Jonathan Brielmaier -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); diff --git a/debian/patches/series b/debian/patches/series index 9903e51..ab92631 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 2001_support-icedove-in-caja-sendto.patch -1001_pkg-config-macro-not-cross-compilation-safe.patch -0001_build_with_gupnp10_or_gupnp12.patch +1001_pkg-config-macro-not-cross-compilation-safe.patch \ No newline at end of file