diff --git a/.gitignore b/.gitignore index 4093b21..790a773 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ gedit-2.31.6.tar.bz2 /gedit-3.35.1.tar.xz /gedit-3.35.90.tar.xz /gedit-3.36.0.tar.xz +/gedit-3.36.1.tar.xz diff --git a/0001-snippets-plugin-use-gtk_source_file_get_location.patch b/0001-snippets-plugin-use-gtk_source_file_get_location.patch deleted file mode 100644 index 9e511ae..0000000 --- a/0001-snippets-plugin-use-gtk_source_file_get_location.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b91cb9aa9b56fae74942912adc51d15c80ae979b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= -Date: Thu, 19 Mar 2020 12:04:24 +0100 -Subject: [PATCH] snippets plugin: use gtk_source_file_get_location() - -Not gedit_document_get_location() which was deprecated and then removed. - -Fixes https://gitlab.gnome.org/GNOME/gedit/issues/272 ---- - plugins/snippets/snippets/document.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/plugins/snippets/snippets/document.py b/plugins/snippets/snippets/document.py -index eb20225e1..19dcf696b 100644 ---- a/plugins/snippets/snippets/document.py -+++ b/plugins/snippets/snippets/document.py -@@ -438,7 +438,7 @@ class Document(GObject.Object, Gedit.ViewActivatable, Signals): - - if isinstance(toplevel, Gedit.Window): - for doc in toplevel.get_documents(): -- r = self.location_uri_for_env(doc.get_location()) -+ r = self.location_uri_for_env(doc.get_file().get_location()) - - if isinstance(r, dict): - documents_uri['utf8'].append(r['utf8']) -@@ -457,7 +457,7 @@ class Document(GObject.Object, Gedit.ViewActivatable, Signals): - - if isinstance(toplevel, Gedit.Window): - for doc in toplevel.get_documents(): -- r = self.location_path_for_env(doc.get_location()) -+ r = self.location_path_for_env(doc.get_file().get_location()) - - if isinstance(r, dict): - documents_path['utf8'].append(r['utf8']) -@@ -497,7 +497,7 @@ class Document(GObject.Object, Gedit.ViewActivatable, Signals): - environ['utf8'][var] = v - environ['noenc'][var] = str(v) - -- self.env_add_for_location(environ, buf.get_location(), 'GEDIT_CURRENT_DOCUMENT') -+ self.env_add_for_location(environ, buf.get_file().get_location(), 'GEDIT_CURRENT_DOCUMENT') - - return environ - -@@ -881,7 +881,7 @@ class Document(GObject.Object, Gedit.ViewActivatable, Signals): - self.env_add_for_location(environ, gfile, 'GEDIT_DROP_DOCUMENT') - - buf = self.view.get_buffer() -- location = buf.get_location() -+ location = buf.get_file().get_location() - - relpath = location.get_relative_path(gfile) - --- -2.25.1 - diff --git a/gedit.spec b/gedit.spec index 6940119..e616f49 100644 --- a/gedit.spec +++ b/gedit.spec @@ -14,19 +14,14 @@ Name: gedit Epoch: 2 -Version: 3.36.0 -Release: 3%{?dist} +Version: 3.36.1 +Release: 1%{?dist} Summary: Text editor for the GNOME desktop License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Gedit Source0: https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz -# Fix snippet plugin -# https://gitlab.gnome.org/GNOME/gedit/issues/272 -# https://gitlab.gnome.org/GNOME/gedit/-/commit/b91cb9aa9b56fae74942912adc51d15c80ae979b -Patch0: 0001-snippets-plugin-use-gtk_source_file_get_location.patch - # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/252#note_742198 Patch1: restore-overlay-scrollbars.patch @@ -173,6 +168,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_datadir}/vala/ %changelog +* Fri Mar 27 2020 Kalev Lember - 2:3.36.1-1 +- Update to 3.36.1 + * Fri Mar 20 2020 Michael Catanzaro - 2:3.36.0-3 - Restore overlay scrollbars diff --git a/sources b/sources index d77f8c1..48a62d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gedit-3.36.0.tar.xz) = cd9629c9c4ce7fe62f47218472d482d9241bcdceee5f2b4f3c423d897eed065af428b2b7df12ea72f43dbcfb6502e9b6ca6ca93f175eab3d5260a1d02e4566b2 +SHA512 (gedit-3.36.1.tar.xz) = 0bcd686051698ffec437a06934ac4c11d0d1558e5d9df8629a9eec8e82da9ee6a9f737ee046271d2613840b644a65c8562aca5e4654d0abdb8db220a54a54d10