[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1022007: caja-extensions: transition to gssdp/gupnp 1.6



Hello,

I'm attaching the changes I made to my local clone of the caja-extenions
git packaging repo which will soon be uploaded to experimental as a
NMU.

Regards,
Andreas Henriksson
>From 47b1a07356abdbfefa8f7c17e5155b0aae2947ba Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Fri, 28 Oct 2022 23:10:56 +0200
Subject: [PATCH 1/3] Add debian/patches/caja-extensions-gupnp-1.6.patch

---
 debian/patches/caja-extensions-gupnp-1.6.patch | 13 +++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 debian/patches/caja-extensions-gupnp-1.6.patch

diff --git a/debian/patches/caja-extensions-gupnp-1.6.patch b/debian/patches/caja-extensions-gupnp-1.6.patch
new file mode 100644
index 0000000..ed8bace
--- /dev/null
+++ b/debian/patches/caja-extensions-gupnp-1.6.patch
@@ -0,0 +1,13 @@
+Origin: https://github.com/mate-desktop/caja-extensions/issues/110#issuecomment-1115036764
+
+--- a/configure.ac	2022-10-28 23:09:15.335956924 +0200
++++ b/configure.ac	2022-10-28 23:08:33.190650398 +0200
+@@ -211,6 +211,8 @@
+             fi
+             ;;
+             upnp)
++                PKG_CHECK_MODULES(UPNP, gupnp-1.6 >= $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.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,
diff --git a/debian/patches/series b/debian/patches/series
index 8e46221..4c4127e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_support-icedove-in-caja-sendto.patch
 1001_pkg-config-macro-not-cross-compilation-safe.patch
+caja-extensions-gupnp-1.6.patch
-- 
2.30.2

>From abd8a646a38a66963400c960ec7546c80fb80671 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Fri, 28 Oct 2022 23:11:07 +0200
Subject: [PATCH 2/3] Change gupnp build-dep to 1.6

Closes: #1022007
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e3a3f2e..e4fd28c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
                libdbus-glib-1-dev,
                libdconf-dev,
                libgtk-3-dev,
-               libgupnp-1.2-dev,
+               libgupnp-1.6-dev,
                libmate-desktop-dev (>= 1.18),
                libstartup-notification0-dev,
                libxml2-utils,
-- 
2.30.2

>From 98ab3a30dad069bc6aa8af393605f2111774e836 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Fri, 28 Oct 2022 23:12:14 +0200
Subject: [PATCH 3/3] Update debian/changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6eae12..4c304cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+caja-extensions (1.26.1-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/caja-extensions-gupnp-1.6.patch
+  * Change gupnp build-dep to 1.6 (Closes: #1022007)
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 28 Oct 2022 23:11:55 +0200
+
 caja-extensions (1.26.1-1) unstable; urgency=medium
 
   * New upstream release.
-- 
2.30.2


Reply to: