On Sun, Sep 11, 2022 at 6:37 AM Sebastian Andrzej Siewior
<sebast...@breakpoint.cc> wrote:
> On 8 September 2022 11:44:16 UTC, Jeremy Bicha <jeremy.bi...@canonical.com>
> wrote:
> >To allow clamtk-gnome to continue working after the Nautilus 43
> >transition which will begin soon, I am uploading an NMU with a delay
> >of 5 days to fix this bug. Please let me know if I should speed up or
> >slow down this upload.
> >
> >The NMU contains these 2 merge proposals:
> >https://salsa.debian.org/clamav-team/clamtk/-/merge_requests/1
> >https://salsa.debian.org/clamav-team/clamtk/-/merge_requests/2
>
> Could you please attach a NMU diff to this bug?
> Sorry for not getting to this earlier.
Attached. Or you can use the 2 Salsa merge proposals.
Thank you,
Jeremy Bicha
From e2bb6b0d9b5ba79498b3240815fe9bab11d2a853 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jeremy.bi...@canonical.com>
Date: Sun, 11 Sep 2022 07:21:41 -0400
Subject: [PATCH] clamtk-gnome: NMU for Nautilus 43
---
debian/changelog | 9 +++++
...us-Stop-importing-a-specific-version.patch | 21 +++++++++++
...ompatibility-with-Nautilus-43-Closes.patch | 35 +++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 67 insertions(+)
create mode 100644 debian/patches/nautilus-Stop-importing-a-specific-version.patch
create mode 100644 debian/patches/nautilus-Update-for-compatibility-with-Nautilus-43-Closes.patch
diff --git a/debian/changelog b/debian/changelog
index 1e5ac86..ec84dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clamtk (6.07-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+
+ [ Jesús Soto ]
+ * Add patch for compatibility with nautilus 43 (Closes: #1018883)
+
+ -- Jeremy Bicha <jbi...@ubuntu.com> Thu, 08 Sep 2022 07:33:16 -0400
+
clamtk (6.07-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/patches/nautilus-Stop-importing-a-specific-version.patch b/debian/patches/nautilus-Stop-importing-a-specific-version.patch
new file mode 100644
index 0000000..a34880a
--- /dev/null
+++ b/debian/patches/nautilus-Stop-importing-a-specific-version.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Jes=C3=BAs_Soto?= <jesus.s...@canonical.com>
+Date: Wed, 17 Aug 2022 12:46:22 -0500
+Subject: nautilus: Stop importing a specific version
+
+---
+ clamtk-gnome/clamtk-gnome.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/clamtk-gnome/clamtk-gnome.py b/clamtk-gnome/clamtk-gnome.py
+index 2eaba88..8f1b809 100755
+--- a/clamtk-gnome/clamtk-gnome.py
++++ b/clamtk-gnome/clamtk-gnome.py
+@@ -26,8 +26,6 @@ _ = gettext.gettext
+
+ import gi
+
+-gi.require_version("Nautilus", "3.0")
+-
+ from gi.repository import Nautilus
+ from gi.repository import GObject
+
diff --git a/debian/patches/nautilus-Update-for-compatibility-with-Nautilus-43-Closes.patch b/debian/patches/nautilus-Update-for-compatibility-with-Nautilus-43-Closes.patch
new file mode 100644
index 0000000..7a151f9
--- /dev/null
+++ b/debian/patches/nautilus-Update-for-compatibility-with-Nautilus-43-Closes.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Jes=C3=BAs_Soto?= <jesus.s...@canonical.com>
+Date: Wed, 17 Aug 2022 12:47:01 -0500
+Subject: nautilus: Update for compatibility with Nautilus 43 Closes:
+ https://gitlab.com/dave_m/clamtk-gnome/-/issues/13
+
+---
+ clamtk-gnome/clamtk-gnome.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/clamtk-gnome/clamtk-gnome.py b/clamtk-gnome/clamtk-gnome.py
+index 8f1b809..7560339 100755
+--- a/clamtk-gnome/clamtk-gnome.py
++++ b/clamtk-gnome/clamtk-gnome.py
+@@ -53,7 +53,10 @@ class OpenTerminalExtension(GObject.GObject, Nautilus.MenuProvider):
+ def menu_background_activate_cb(self, menu, file):
+ self._open_scanner(file)
+
+- def get_file_items(self, window, files):
++ def get_file_items(self, *args):
++ # `args` will be `[files: List[Nautilus.FileInfo]]` in Nautilus 4.0 API,
++ # and `[window: Gtk.Widget, files: List[Nautilus.FileInfo]]` in Nautilus 3.0 API.
++ files = args[-1]
+ if len(files) != 1:
+ return
+ file = files[0]
+@@ -70,7 +73,8 @@ class OpenTerminalExtension(GObject.GObject, Nautilus.MenuProvider):
+
+ return [item]
+
+- def get_background_items(self, window, file):
++ def get_background_items(self, *args):
++ file = args[-1]
+ item = Nautilus.MenuItem(
+ name="NautilusPython::openscanner_directory",
+ label=_("Scan directory for threats..."),
diff --git a/debian/patches/series b/debian/patches/series
index 6dd75c7..159bd83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
py3-clamtk-gnome.patch
Remove-no-separator.patch
+nautilus-Stop-importing-a-specific-version.patch
+nautilus-Update-for-compatibility-with-Nautilus-43-Closes.patch
--
2.37.2
