Control: tags 955812 + patch
Dear maintainer,
I've prepared an NMU for gedit-latex-plugin (versioned as 3.20.0-1.1). The diff
is attached to this message.
cu
Adrian
diff -Nru gedit-latex-plugin-3.20.0/debian/changelog gedit-latex-plugin-3.20.0/debian/changelog
--- gedit-latex-plugin-3.20.0/debian/changelog 2016-11-26 00:52:44.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/changelog 2021-02-07 11:24:42.000000000 +0200
@@ -1,3 +1,11 @@
+gedit-latex-plugin (3.20.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backported upstream fix to stop using gvfs-open. (Closes: #877740)
+ * Backported upstream fixes for recent gedit. (Closes: #955812)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 07 Feb 2021 11:24:42 +0200
+
gedit-latex-plugin (3.20.0-1) unstable; urgency=low
* New upstream version 3.20.0 (Closes: #842957)
diff -Nru gedit-latex-plugin-3.20.0/debian/control gedit-latex-plugin-3.20.0/debian/control
--- gedit-latex-plugin-3.20.0/debian/control 2016-11-26 00:52:44.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/control 2021-02-07 11:24:42.000000000 +0200
@@ -13,7 +13,7 @@
Package: gedit-latex-plugin
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, gedit (>= 3.20),
- rubber, python3-dbus, python3-gi, gvfs-bin
+ rubber, python3-dbus, python3-gi
Recommends: texlive
Enhances: gedit
Description: gedit plugin for composing and compiling LaTeX documents
diff -Nru gedit-latex-plugin-3.20.0/debian/patches/0001-Do-not-rely-on-deprecated-Gedit.Document.get_encodin.patch gedit-latex-plugin-3.20.0/debian/patches/0001-Do-not-rely-on-deprecated-Gedit.Document.get_encodin.patch
--- gedit-latex-plugin-3.20.0/debian/patches/0001-Do-not-rely-on-deprecated-Gedit.Document.get_encodin.patch 1970-01-01 02:00:00.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/patches/0001-Do-not-rely-on-deprecated-Gedit.Document.get_encodin.patch 2021-02-07 11:23:05.000000000 +0200
@@ -0,0 +1,25 @@
+From 959755c21d9909dafdd639455a1e621063b9c633 Mon Sep 17 00:00:00 2001
+From: Pietro Battiston <pbattis...@src.gnome.org>
+Date: Thu, 16 Apr 2020 15:33:34 +0200
+Subject: Do not rely on deprecated Gedit.Document.get_encoding()
+
+---
+ latex/editor.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/latex/editor.py b/latex/editor.py
+index 4f7cbe0..953be77 100644
+--- a/latex/editor.py
++++ b/latex/editor.py
+@@ -286,7 +286,7 @@ class Editor(object):
+ """
+ Return the character set used by this Editor
+ """
+- return self._text_buffer.get_encoding().get_charset()
++ return self._text_buffer.get_file().get_encoding().get_charset()
+
+ @property
+ def content(self):
+--
+2.20.1
+
diff -Nru gedit-latex-plugin-3.20.0/debian/patches/0001-Replace-deprecated-time.clock.patch gedit-latex-plugin-3.20.0/debian/patches/0001-Replace-deprecated-time.clock.patch
--- gedit-latex-plugin-3.20.0/debian/patches/0001-Replace-deprecated-time.clock.patch 1970-01-01 02:00:00.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/patches/0001-Replace-deprecated-time.clock.patch 2021-02-07 11:23:05.000000000 +0200
@@ -0,0 +1,34 @@
+From 0cf04556eeb3f35084051d5ec98c345432a838fe Mon Sep 17 00:00:00 2001
+From: Pietro Battiston <pbattis...@src.gnome.org>
+Date: Thu, 16 Apr 2020 17:57:27 +0200
+Subject: Replace deprecated time.clock()
+
+---
+ latex/latex/editor.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/latex/latex/editor.py b/latex/latex/editor.py
+index b1655ce..55b35a4 100644
+--- a/latex/latex/editor.py
++++ b/latex/latex/editor.py
+@@ -249,7 +249,7 @@ class LaTeXEditor(Editor, IIssueHandler):
+ # reset issues
+ self._issue_view.clear()
+
+- if BENCHMARK: t = time.clock()
++ if BENCHMARK: t = time.perf_counter()
+
+ # parse document
+ if self._document != None:
+@@ -260,7 +260,7 @@ class LaTeXEditor(Editor, IIssueHandler):
+ # update document preferences
+ self._preferences.parse_content(self.content)
+
+- if BENCHMARK: LOG.info("LaTeXParser.parse: %f" % (time.clock() - t))
++ if BENCHMARK: LOG.info("LaTeXParser.parse: %f" % (time.perf_counter() - t))
+
+ LOG.debug("Parsed %s bytes of content" % len(self.content))
+
+--
+2.20.1
+
diff -Nru gedit-latex-plugin-3.20.0/debian/patches/0001-Use-gio-open-instead-of-deprecated-gvfs-open.patch gedit-latex-plugin-3.20.0/debian/patches/0001-Use-gio-open-instead-of-deprecated-gvfs-open.patch
--- gedit-latex-plugin-3.20.0/debian/patches/0001-Use-gio-open-instead-of-deprecated-gvfs-open.patch 1970-01-01 02:00:00.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/patches/0001-Use-gio-open-instead-of-deprecated-gvfs-open.patch 2021-02-07 11:23:05.000000000 +0200
@@ -0,0 +1,72 @@
+From ff0c8aaefc72fe31322466ace68f005f51ab3948 Mon Sep 17 00:00:00 2001
+From: Pietro Battiston <pbattis...@src.gnome.org>
+Date: Fri, 22 May 2020 09:09:52 +0200
+Subject: Use "gio open" instead of deprecated "gvfs-open"
+
+---
+ data/tools.xml | 8 ++++----
+ latex/latex/preview.py | 2 +-
+ latex/latex/views.py | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/data/tools.xml b/data/tools.xml
+index 1f0811f..02e3923 100644
+--- a/data/tools.xml
++++ b/data/tools.xml
+@@ -1,15 +1,15 @@
+ <tools>
+ <tool description="Create a PDF from LaTeX source" extensions=".tex" id="1" label="LaTeX → PDF">
+ <job mustSucceed="True" postProcessor="RubberPostProcessor">rubber --inplace --maxerr -1 --short --force --warn all --pdf "$filename"</job>
+- <job mustSucceed="True" postProcessor="GenericPostProcessor">gvfs-open "$shortname.pdf"</job>
++ <job mustSucceed="True" postProcessor="GenericPostProcessor">gio open "$shortname.pdf"</job>
+ </tool>
+ <tool description="Create a PostScript from LaTeX source" extensions=".tex" id="3" label="LaTeX → PS">
+ <job mustSucceed="true" postProcessor="RubberPostProcessor">rubber --inplace --maxerr -1 --short --force --warn all --ps "$filename"</job>
+- <job mustSucceed="true" postProcessor="GenericPostProcessor">gvfs-open "$shortname.ps"</job>
++ <job mustSucceed="true" postProcessor="GenericPostProcessor">gio open "$shortname.ps"</job>
+ </tool>
+ <tool description="Create a DVI from LaTeX source" extensions=".tex" id="4" label="LaTeX → DVI">
+ <job mustSucceed="true" postProcessor="RubberPostProcessor">rubber --inplace --maxerr -1 --short --force --warn all "$filename"</job>
+- <job mustSucceed="true" postProcessor="GenericPostProcessor">gvfs-open "$shortname.dvi"</job>
++ <job mustSucceed="true" postProcessor="GenericPostProcessor">gio open "$shortname.dvi"</job>
+ </tool>
+ <tool description="Create a DVI with source specials from LaTeX source" extensions=".tex" id="5" label="LaTeX → DVI (Source Specials)">
+ <job mustSucceed="true" postProcessor="LaTeXPostProcessor">latex -interaction batchmode -src "$filename"</job>
+@@ -19,7 +19,7 @@
+ <tool description="Process R Sweave file and create a PDF from the resulting LaTeX source" extensions=".Rnw" id="6" label="R Sweave → PDF">
+ <job mustSucceed="true" postProcessor="GenericPostProcessor">R CMD Sweave "$shortname.Rnw"</job>
+ <job mustSucceed="true" postProcessor="RubberPostProcessor">rubber --inplace --maxerr -1 --short --force --warn all --pdf "$shortname.tex"</job>
+- <job mustSucceed="true" postProcessor="GenericPostProcessor">gvfs-open "$shortname.pdf"</job>
++ <job mustSucceed="true" postProcessor="GenericPostProcessor">gio open "$shortname.pdf"</job>
+ </tool>
+ <tool description="Remove LaTeX build files" extensions=".tex" id="7" label="Cleanup LaTeX Build Files">
+ <job mustSucceed="False" postProcessor="GenericPostProcessor">rm -f "$directory"/*.aux "$directory"/*.log "$directory"/*.toc "$directory"/*.bbl "$directory"/*.blg</job>
+diff --git a/latex/latex/preview.py b/latex/latex/preview.py
+index b936e9e..7a808b8 100644
+--- a/latex/latex/preview.py
++++ b/latex/latex/preview.py
+@@ -97,7 +97,7 @@ class ImageToolGenerator(object):
+
+ if self.open:
+ extension = {self.FORMAT_PNG : "png", self.FORMAT_JPEG: "jpg", self.FORMAT_GIF : "gif"}[self.format]
+- tool.jobs.append(Job("gvfs-open \"$shortname.%s\"" % extension, True, GenericPostProcessor))
++ tool.jobs.append(Job("gio open \"$shortname.%s\"" % extension, True, GenericPostProcessor))
+
+ return tool
+
+diff --git a/latex/latex/views.py b/latex/latex/views.py
+index e4e88ce..fec9af8 100644
+--- a/latex/latex/views.py
++++ b/latex/latex/views.py
+@@ -223,7 +223,7 @@ class LaTeXOutlineView(BaseOutlineView):
+ @param node: an instance of latex.outline.OutlineNode
+ """
+ if node.type == OutlineNode.GRAPHICS:
+- # use 'gvfs-open' to open the graphics file
++ # use 'gio open' to open the graphics file
+
+ target = node.value
+
+--
+2.20.1
+
diff -Nru gedit-latex-plugin-3.20.0/debian/patches/series gedit-latex-plugin-3.20.0/debian/patches/series
--- gedit-latex-plugin-3.20.0/debian/patches/series 2016-11-26 00:52:44.000000000 +0200
+++ gedit-latex-plugin-3.20.0/debian/patches/series 2021-02-07 11:24:42.000000000 +0200
@@ -1,3 +1,6 @@
0001-Templates-in-systemdir.patch
0002-Fix-retrieval-of-LaTeX-environment-paths.patch
0003-Do-not-look-into-non-existing-dirs.patch
+0001-Use-gio-open-instead-of-deprecated-gvfs-open.patch
+0001-Replace-deprecated-time.clock.patch
+0001-Do-not-rely-on-deprecated-Gedit.Document.get_encodin.patch
