diff --git a/.gedit-plugins.metadata b/.gedit-plugins.metadata index 1fd224f..ef196b5 100644 --- a/.gedit-plugins.metadata +++ b/.gedit-plugins.metadata @@ -1 +1 @@ -9f520af13e35c33b2f56f44b2060605f07103ba0 SOURCES/gedit-plugins-3.22.0.tar.xz +ff3cebf0ad62519c4919fab98018f85b66aa0984 SOURCES/gedit-plugins-3.28.1.tar.xz diff --git a/.gitignore b/.gitignore index 4cbf933..58f5690 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gedit-plugins-3.22.0.tar.xz +SOURCES/gedit-plugins-3.28.1.tar.xz diff --git a/SOURCES/gedit-plugins-disable-python3.patch b/SOURCES/gedit-plugins-disable-python3.patch index fb128cf..579bab3 100644 --- a/SOURCES/gedit-plugins-disable-python3.patch +++ b/SOURCES/gedit-plugins-disable-python3.patch @@ -1,31 +1,34 @@ -From 87063ace66368bc1602281ea3e26e402fbbffbf5 Mon Sep 17 00:00:00 2001 +From 61a02d97f9f294537992a42f5f28432bd359caf1 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 15 Mar 2017 15:04:47 -0400 -Subject: [PATCH] gedit-plugins-disable-python3.patch +Subject: [PATCH] plugins: disable python 3 +We only have python2 in rhel7 --- - configure.ac | 2 +- - plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in | 2 +- - plugins/charmap/charmap.plugin.desktop.in.in | 2 +- - plugins/codecomment/codecomment.plugin.desktop.in.in | 2 +- - plugins/colorpicker/colorpicker.plugin.desktop.in.in | 2 +- - plugins/colorschemer/colorschemer.plugin.desktop.in.in | 2 +- - plugins/commander/commander.plugin.desktop.in.in | 2 +- - plugins/commander/commander/entry.py | 4 ++-- - plugins/commander/commander/info.py | 4 ++-- - plugins/dashboard/dashboard.plugin.desktop.in.in | 2 +- - plugins/git/git/appactivatable.py | 2 +- - plugins/git/git/debug.py | 2 +- - plugins/joinlines/joinlines.plugin.desktop.in.in | 2 +- - plugins/multiedit/multiedit.plugin.desktop.in.in | 2 +- - plugins/smartspaces/smartspaces.plugin.desktop.in.in | 2 +- - plugins/synctex/synctex.plugin.desktop.in.in | 2 +- - plugins/terminal/terminal.plugin.desktop.in.in | 2 +- - plugins/textsize/textsize.plugin.desktop.in.in | 2 +- - 18 files changed, 20 insertions(+), 20 deletions(-) + configure.ac | 2 +- + .../bracketcompletion/bracketcompletion.plugin.desktop.in.in | 2 +- + plugins/charmap/charmap.plugin.desktop.in.in | 2 +- + plugins/codecomment/codecomment.plugin.desktop.in.in | 2 +- + plugins/colorpicker/colorpicker.plugin.desktop.in.in | 2 +- + plugins/colorschemer/colorschemer.plugin.desktop.in.in | 2 +- + plugins/commander/commander.plugin.desktop.in.in | 2 +- + plugins/commander/commander/entry.py | 4 ++-- + plugins/commander/commander/info.py | 4 ++-- + plugins/dashboard/dashboard.plugin.desktop.in.in | 2 +- + plugins/git/git/appactivatable.py | 2 +- + plugins/git/git/debug.py | 2 +- + plugins/joinlines/joinlines.plugin.desktop.in.in | 2 +- + plugins/multiedit/multiedit.plugin.desktop.in.in | 2 +- + plugins/smartspaces/smartspaces.plugin.desktop.in.in | 2 +- + plugins/synctex/synctex.plugin.desktop.in.in | 2 +- + plugins/terminal/terminal.plugin.desktop.in.in | 2 +- + plugins/textsize/textsize.plugin.desktop.in.in | 2 +- + plugins/translate/translate.plugin.desktop.in.in | 2 +- + plugins/translate/translate/services/service.py | 3 ++- + 20 files changed, 23 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac -index db9353d..a8807cc 100644 +index 870bd3a..3c071c4 100644 --- a/configure.ac +++ b/configure.ac @@ -66,61 +66,61 @@ PKG_CHECK_MODULES(GEDIT, [ @@ -35,7 +38,7 @@ index db9353d..a8807cc 100644 C_PLUGINS="bookmarks drawspaces wordcompletion" # Python plugins that don't need special dependencies, besides Python - PY_PLUGINS="bracketcompletion codecomment colorpicker colorschemer commander joinlines multiedit smartspaces textsize" + PY_PLUGINS="bracketcompletion codecomment colorpicker colorschemer commander joinlines multiedit smartspaces textsize translate" # Vala plugins that don't need special dependencies, besides Vala VALA_PLUGINS="findinfiles" @@ -108,7 +111,7 @@ index 71b32b6..0b1c05b 100644 Website=http://www.gedit.org Version=@VERSION@ diff --git a/plugins/charmap/charmap.plugin.desktop.in.in b/plugins/charmap/charmap.plugin.desktop.in.in -index b846fdd..5ce20e4 100644 +index bb82259..719dc9f 100644 --- a/plugins/charmap/charmap.plugin.desktop.in.in +++ b/plugins/charmap/charmap.plugin.desktop.in.in @@ -1,11 +1,11 @@ @@ -119,7 +122,7 @@ index b846fdd..5ce20e4 100644 IAge=3 _Name=Character Map _Description=Insert special characters just by clicking on them. - Icon=gucharmap + Icon=accessories-character-map Authors=Steve Frécinaux ;Ignacio Casal Quinteiro Copyright=Copyright @ 2006 Steve Frécinaux Website=http://www.gedit.org @@ -141,10 +144,10 @@ index 6561a2d..837fbee 100644 Website=http://www.gedit.org Version=@VERSION@ diff --git a/plugins/colorpicker/colorpicker.plugin.desktop.in.in b/plugins/colorpicker/colorpicker.plugin.desktop.in.in -index de0bc94..8d1e527 100644 +index c02867e..1cc2c1e 100644 --- a/plugins/colorpicker/colorpicker.plugin.desktop.in.in +++ b/plugins/colorpicker/colorpicker.plugin.desktop.in.in -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ [Plugin] -Loader=python3 +Loader=python @@ -152,7 +155,6 @@ index de0bc94..8d1e527 100644 IAge=3 _Name=Color Picker _Description=Pick a color from a dialog and insert its hexadecimal representation. - Icon=gtk-select-color Authors=Jesse van den Kieboom ;Ignacio Casal Quinteiro Copyright=Copyright © 2006 Jesse van den Kieboom;Copyright © 2012 Ignacio Casal Quinteiro Website=http://www.gedit.org @@ -532,7 +534,7 @@ index 7b7b137..6f315ef 100644 Website=http://www.gedit.org Version=@VERSION@ diff --git a/plugins/smartspaces/smartspaces.plugin.desktop.in.in b/plugins/smartspaces/smartspaces.plugin.desktop.in.in -index 7dfce93..5f5be6c 100644 +index f9ca79a..9671fe3 100644 --- a/plugins/smartspaces/smartspaces.plugin.desktop.in.in +++ b/plugins/smartspaces/smartspaces.plugin.desktop.in.in @@ -1,10 +1,10 @@ @@ -542,16 +544,16 @@ index 7dfce93..5f5be6c 100644 Module=smartspaces IAge=3 _Name=Smart Spaces - _Description=Forget you're not using tabulations. + _Description=Forget you’re not using tabulations. Authors=Steve Frécinaux Copyright=Copyright © 2006 Steve Frécinaux Website=http://www.gedit.org Version=@VERSION@ diff --git a/plugins/synctex/synctex.plugin.desktop.in.in b/plugins/synctex/synctex.plugin.desktop.in.in -index 57dcbb2..be51513 100644 +index b465129..1bb8da1 100644 --- a/plugins/synctex/synctex.plugin.desktop.in.in +++ b/plugins/synctex/synctex.plugin.desktop.in.in -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ [Plugin] -Loader=python3 +Loader=python @@ -559,13 +561,12 @@ index 57dcbb2..be51513 100644 IAge=3 _Name=SyncTeX _Description=Synchronize between LaTeX and PDF with gedit and evince. - Icon=gedit-plugin Authors=José Aliste Copyright=Copyright © 2010 José Aliste Website=http://www.gedit.org Version=@VERSION@ diff --git a/plugins/terminal/terminal.plugin.desktop.in.in b/plugins/terminal/terminal.plugin.desktop.in.in -index b0ff054..2d70e7f 100644 +index dac9ac1..fcbe266 100644 --- a/plugins/terminal/terminal.plugin.desktop.in.in +++ b/plugins/terminal/terminal.plugin.desktop.in.in @@ -1,11 +1,11 @@ @@ -576,7 +577,7 @@ index b0ff054..2d70e7f 100644 IAge=3 _Name=Embedded Terminal _Description=Embed a terminal in the bottom pane. - Icon=gnome-terminal + Icon=utilities-terminal Authors=Paolo Borelli Copyright=Copyright © 2005 Paolo Borelli Website=http://www.gedit.org @@ -597,6 +598,81 @@ index 8c12009..c4cecea 100644 Copyright=Copyright © 2008 by the authors Website=http://www.gedit.org Version=@VERSION@ +diff --git a/plugins/translate/translate.plugin.desktop.in.in b/plugins/translate/translate.plugin.desktop.in.in +index 76ecfb7..4e75739 100644 +--- a/plugins/translate/translate.plugin.desktop.in.in ++++ b/plugins/translate/translate.plugin.desktop.in.in +@@ -1,10 +1,10 @@ + [Plugin] +-Loader=python3 ++Loader=python + Module=translate + IAge=3 + _Name=Translate + _Description=Translates text into different languages + Authors=Jordi Mas i Hernàndez + Copyright=Copyright @ 2017 Jordi Mas i Hernàndez. Powered by Apertium and Yandex.Translate translation engines. + Website=http://www.gedit.org + Version=@VERSION@ +diff --git a/plugins/translate/translate/services/service.py b/plugins/translate/translate/services/service.py +index 5406c6e..05a4182 100644 +--- a/plugins/translate/translate/services/service.py ++++ b/plugins/translate/translate/services/service.py +@@ -1,52 +1,53 @@ + # -*- coding: utf-8 -*- + # + # Copyrignt (C) 2017 Jordi Mas + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, + # Boston, MA 02110-1301, USA. + + from abc import ABCMeta, abstractmethod + +-class Service(metaclass=ABCMeta): ++class Service: ++ __metaclass__ = ABCMeta + + @abstractmethod + def translate_text(self, text, language_pair): + pass + + @abstractmethod + def get_language_names(self): + pass + + @abstractmethod + def get_language_codes(self): + pass + + @abstractmethod + def get_language_pair_name(self, source, target, locales_names=None): + pass + + @abstractmethod + def get_default_language_codes(self): + pass + + @abstractmethod + def has_api_key(self): + pass + + @abstractmethod + def get_api_hint(self): + pass + + @abstractmethod -- -2.11.1 +2.17.1 diff --git a/SPECS/gedit-plugins.spec b/SPECS/gedit-plugins.spec index 0a0bf10..9484162 100644 --- a/SPECS/gedit-plugins.spec +++ b/SPECS/gedit-plugins.spec @@ -11,14 +11,14 @@ %endif Name: gedit-plugins -Version: 3.22.0 +Version: 3.28.1 Release: 1%{?dist} Summary: Plugins for gedit Group: Applications/Editors License: GPLv2+ URL: http://live.gnome.org/Gedit -Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz Patch0: gedit-plugins-disable-python3.patch BuildRequires: gedit-devel @@ -195,6 +195,13 @@ Requires: pygobject3 >= 3.14.0 %description -n gedit-plugin-textsize The gedit textsize plugin. +%package -n gedit-plugin-translate +Summary: gedit textsize plugin +Requires: %{name}-data = %{version}-%{release} +Requires: pygobject3 >= 3.14.0 +%description -n gedit-plugin-translate +The gedit translate plugin. + %package -n gedit-plugin-wordcompletion Summary: gedit wordcompletion plugin Requires: %{name}-data = %{version}-%{release} @@ -256,6 +263,13 @@ fi %posttrans -n gedit-plugin-terminal glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +%postun -n gedit-plugin-translate +if [ $1 -eq 0 ]; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +fi + +%posttrans -n gedit-plugin-translate +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %postun -n gedit-plugin-wordcompletion if [ $1 -eq 0 ]; then @@ -355,6 +369,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/gedit/plugins/textsize.plugin %{_datadir}/appdata/gedit-textsize.metainfo.xml +%files -n gedit-plugin-translate +%{_datadir}/gedit/plugins/translate/ui/preferences.ui +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.translate.gschema.xml +%{_libdir}/gedit/plugins/translate +%{_libdir}/gedit/plugins/translate.plugin +%{_datadir}/appdata/gedit-translate.metainfo.xml + %files -n gedit-plugin-wordcompletion %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.wordcompletion.gschema.xml %{_libdir}/gedit/plugins/libwordcompletion.so @@ -369,6 +390,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %endif %changelog +* Wed Jun 06 2018 Ray Strode - 3.28.1-1 +- Rebase to 3.28.1 + Resolves: #1569721 + * Wed Mar 15 2017 Ray Strode - 3.22.0-1 - Rebase to 3.22.0 Resolves: #1386865