Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: caja-extensions

caja-extensions (1.22.0-2ubuntu3) eoan; urgency=medium * debian/patches/53.patch: * debian/patches/53-fixup.patch: - upstream proposed patch to allow both gupnp 1.0 and 1.2 versions -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 03 Aug 2019 10:32:35 +0200

Modifications :
  1. Download patch debian/patches/53.patch

    --- 1.22.0-2/debian/patches/53.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.22.0-2ubuntu3/debian/patches/53.patch 2019-08-03 08:32:35.000000000 +0000 @@ -0,0 +1,48 @@ +From d15a6028f5f5a49ffeba0b224d9a757ec2f1c469 Mon Sep 17 00:00:00 2001 +From: Jonathan Brielmaier <jbrielmaier@suse.de> +Date: Tue, 30 Jul 2019 15:20:18 +0200 +Subject: [PATCH] Build either with gupnp version 1.0 or 1.2. + +This fixes https://github.com/mate-desktop/caja-extensions/issues/52. + +* (configure.ac): Check also for gupnp-1.2 and set HAS_GUPNP_VERSION_1_2 +to yes if found. +* (sendto/plugins/upnp/upnp.c): Use gupnp_context_manager_create when +building with gupnp-1.2 as gupnp_context_manager_new was removed. + +Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de> +--- + configure.ac | 3 +++ + sendto/plugins/upnp/upnp.c | 4 ++++ + 2 files changed, 7 insertions(+) + +Index: caja-extensions-1.22.0/configure.ac +=================================================================== +--- caja-extensions-1.22.0.orig/configure.ac ++++ caja-extensions-1.22.0/configure.ac +@@ -193,6 +193,9 @@ + fi + ;; + upnp) ++ HAS_GUPNP_VERSION_1_2=no ++ PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED, ++ enable_upnp=yes, enable_upnp=no, HAS_GUPNP_VERSION_1_2=yes) + PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED, + enable_upnp=yes, enable_upnp=no) + if test "${enable_upnp}" != "yes" ; then +Index: caja-extensions-1.22.0/sendto/plugins/upnp/upnp.c +=================================================================== +--- caja-extensions-1.22.0.orig/sendto/plugins/upnp/upnp.c ++++ caja-extensions-1.22.0/sendto/plugins/upnp/upnp.c +@@ -206,7 +206,11 @@ + 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);
  2. Download patch debian/patches/53-fixup.patch

    --- 1.22.0-2/debian/patches/53-fixup.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.22.0-2ubuntu3/debian/patches/53-fixup.patch 2019-08-03 08:32:35.000000000 +0000 @@ -0,0 +1,17 @@ +Description: The define was not correctly exported to the upnp.c source file. +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Last-Update: 2019-08-03 + +--- caja-extensions-1.22.0.orig/configure.ac ++++ caja-extensions-1.22.0/configure.ac +@@ -193,9 +193,8 @@ AS_IF([test "x$enable_sendto" = "xyes"], + fi + ;; + upnp) +- HAS_GUPNP_VERSION_1_2=no + PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED, +- enable_upnp=yes, enable_upnp=no, HAS_GUPNP_VERSION_1_2=yes) ++ 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
  3. Download patch debian/patches/series

    --- 1.22.0-2/debian/patches/series 2018-07-21 21:16:42.000000000 +0000 +++ 1.22.0-2ubuntu3/debian/patches/series 2019-08-03 08:32:35.000000000 +0000 @@ -1,2 +1,4 @@ 2001_support-icedove-in-caja-sendto.patch 1001_pkg-config-macro-not-cross-compilation-safe.patch +53.patch +53-fixup.patch
  1. caja-extensions