gentoo resync : 14.07.2018

2 files changed, 77 insertions, 0 deletions

diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
new file mode 100644
index 000000000000..19a3a6d1e985
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
@@ -0,0 +1,26 @@
+From acc785dd63379f08f08b52fae9d7e5c5666495c8 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 17 Apr 2017 00:15:58 +0200
+Subject: [PATCH] Silence gobject-introspection warning on version-less imports
+
+---
+ plugins/charmap/charmap/__init__.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index b504cb61..6f8c2b61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -16,6 +16,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++import gi
++gi.require_version('Gucharmap', '2.90')
++
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+ from .panel import CharmapPanel
+ import sys
+-- 
+2.12.2
+
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
new file mode 100644
index 000000000000..1ad491cf3c00
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
@@ -0,0 +1,51 @@
+From 1e4d042f7e9b28a58bd09af5c97e4282441113d2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 16 Apr 2017 23:48:29 +0200
+Subject: [PATCH 1/2] Switch gucharmap plugin to python3 loader
+
+---
+ plugins/charmap/charmap/__init__.py           | 2 +-
+ plugins/charmap/gtr-charmap.plugin.desktop.in | 2 +-
+ src/gtr-plugins-engine.c                      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index 414157b1..b504cb61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -17,7 +17,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+-from panel import CharmapPanel
++from .panel import CharmapPanel
+ import sys
+ import gettext
+ 
+diff --git a/plugins/charmap/gtr-charmap.plugin.desktop.in b/plugins/charmap/gtr-charmap.plugin.desktop.in
+index 3949c5f6..a872a545 100644
+--- a/plugins/charmap/gtr-charmap.plugin.desktop.in
++++ b/plugins/charmap/gtr-charmap.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python
++Loader=python3
+ Module=charmap
+ IAge=3
+ _Name=Character Map
+diff --git a/src/gtr-plugins-engine.c b/src/gtr-plugins-engine.c
+index 903ea735..8e41010a 100644
+--- a/src/gtr-plugins-engine.c
++++ b/src/gtr-plugins-engine.c
+@@ -64,7 +64,7 @@ gtr_plugins_engine_init (GtrPluginsEngine * engine)
+                                               GTR_TYPE_PLUGINS_ENGINE,
+                                               GtrPluginsEnginePrivate);
+ 
+-  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++  peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
+ 
+   engine->priv->plugin_settings = g_settings_new ("org.gnome.gtranslator.plugins");
+ 
+-- 
+2.12.2
+