gentoo Easter resync : 12.04.2020

2 files changed, 59 insertions, 0 deletions

diff --git a/mail-client/alot/files/0.9-0001-remove-non-working-test.patch b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
new file mode 100644
index 000000000000..505f112e5042
--- /dev/null
+++ b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
@@ -0,0 +1,31 @@
+From d534d65e1d4855565124906319c54b179dae20bd Mon Sep 17 00:00:00 2001
+From: Guillaume Seren <guillaumeseren@gmail.com>
+Date: Fri, 3 May 2019 18:17:05 +0200
+Subject: [PATCH] Remove non working test
+
+Some test are not working + fix for master
+---
+ tests/commands/test_global.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/tests/commands/test_global.py b/tests/commands/test_global.py
+index 775a822c..ca79443f 100644
+--- a/tests/commands/test_global.py
++++ b/tests/commands/test_global.py
+@@ -121,13 +121,6 @@ class TestExternalCommand(unittest.TestCase):
+         await cmd.apply(ui)
+         ui.notify.assert_not_called()
+ 
+-    @utilities.async_test
+-    async def test_no_spawn_no_stdin_attached(self):
+-        ui = utilities.make_ui()
+-        cmd = g_commands.ExternalCommand('test -t 0', refocus=False)
+-        await cmd.apply(ui)
+-        ui.notify.assert_not_called()
+-
+     @utilities.async_test
+     async def test_no_spawn_stdin_attached(self):
+         ui = utilities.make_ui()
+-- 
+2.24.1
+
diff --git a/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
new file mode 100644
index 000000000000..8010b50db8ad
--- /dev/null
+++ b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
@@ -0,0 +1,28 @@
+From 67a06f5b9afa132a187956d5f28b0470b84a0235 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc5812..aa1fd436 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ class ComposeCommand(Command):
+                     mimetype = helper.guess_mimetype(sigcontent)
+                     if mimetype.startswith('text'):
+                         sigcontent = helper.try_decode(sigcontent)
+-                        self.envelope.body += '\n' + sigcontent
++                        self.envelope.body_txt += '\n' + sigcontent
+             else:
+                 ui.notify('could not locate signature: %s' % sig,
+                           priority='error')
+-- 
+2.24.1
+