gentoo resync : 28.04.2019

2 files changed, 0 insertions, 68 deletions

diff --git a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
deleted file mode 100644
index 046c72c0ca2d..000000000000
--- a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 285392b27db7cb01b0566b4bda3920e6559b75e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
-Date: Fri, 26 May 2017 23:10:05 +0200
-Subject: [PATCH] Add config option to activate XEP-0146 commands
-
-Some of the Commands have security implications, thats why we disable them per default
-Fixes #8378
----
- src/common/commands.py | 7 ++++---
- src/common/config.py   | 1 +
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/commands.py b/src/common/commands.py
-index 40d700710..46d6947f8 100644
---- a/src/common/commands.py
-+++ b/src/common/commands.py
-@@ -345,9 +345,10 @@ class ConnectionCommands:
-     def __init__(self):
-         # a list of all commands exposed: node -> command class
-         self.__commands = {}
--        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
--        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
--            self.__commands[cmdobj.commandnode] = cmdobj
-+        if gajim.config.get('remote_commands'):
-+            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
-+            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
-+                self.__commands[cmdobj.commandnode] = cmdobj
- 
-         # a list of sessions; keys are tuples (jid, sessionid, node)
-         self.__sessions = {}
-diff --git a/src/common/config.py b/src/common/config.py
-index 3884d9e1d..7c1313fc4 100644
---- a/src/common/config.py
-+++ b/src/common/config.py
-@@ -313,6 +313,7 @@ class Config:
-             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
-             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
-             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
-+            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
-     }, {})
- 
-     __options_per_key = {
--- 
-2.12.2
-
diff --git a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch b/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
deleted file mode 100644
index fbffa1123342..000000000000
--- a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gajim/common/app.py	2018-05-16 05:59:40.278703415 +0300
-+++ b/gajim/common/app.py	2018-05-16 06:00:14.520423471 +0300
-@@ -265,20 +265,6 @@
-     HAVE_IDLE = False
- 
- HAVE_SPELL = False
--try:
--    spell_log = logging.getLogger('gajim.speller')
--    gi.require_version('Gspell', '1')
--    from gi.repository import Gspell
--    langs = Gspell.language_get_available()
--    for lang in langs:
--        spell_log.info('%s (%s) dict available',
--                       lang.get_name(), lang.get_code())
--    if langs:
--        HAVE_SPELL = True
--    else:
--        spell_log.info('No dicts available')
--except (ImportError, ValueError):
--    pass
- 
- gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
- gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE,