From 46642fdeeb9123a894df864c8fa1230620ce74a1 Mon Sep 17 00:00:00 2001 From: Vinfall Date: Fri, 28 Jun 2024 13:41:54 +0800 Subject: [PATCH] alot: update to 0.10. --- ...ix-mailcap-rendering-no-content-type.patch | 65 ------------------- srcpkgs/alot/template | 10 +-- 2 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch diff --git a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch b/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch deleted file mode 100644 index e1aec812a58c50..00000000000000 --- a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0339a33818adc6fc33e83336f9eea289d5e7e893 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Ma=C4=8Ds?= -Date: Tue, 19 May 2020 13:48:17 +0300 -Subject: [PATCH] Fix mailcap rendering for e-mails without `Content-Type` - header - -`get_params()` returns `None` when the header is missing. Use `failobj` -argument to mitigate that. - -Fixes #1512 ---- - alot/db/utils.py | 2 +- - tests/db/test_utils.py | 10 ++++++++++ - tests/static/mail/basic.eml | 5 +++++ - 3 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 tests/static/mail/basic.eml - -diff --git a/alot/db/utils.py b/alot/db/utils.py -index 27c85942..e55768b1 100644 ---- a/alot/db/utils.py -+++ b/alot/db/utils.py -@@ -365,7 +365,7 @@ def render_part(part, field_key='copiousoutput'): - stdin = raw_payload - - # read parameter, create handler command -- parms = tuple('='.join(p) for p in part.get_params()) -+ parms = tuple('='.join(p) for p in part.get_params(failobj=[])) - - # create and call external command - cmd = mailcap.subst(entry['view'], ctype, -diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py -index 36ce77cf..40c2fb91 100644 ---- a/tests/db/test_utils.py -+++ b/tests/db/test_utils.py -@@ -762,6 +762,16 @@ class TestExtractBodyPart(unittest.TestCase): - - self.assertEqual(actual, expected) - -+ @mock.patch('alot.db.utils.settings.mailcap_find_match', -+ mock.Mock(return_value=(None, {'view': 'cat'}))) -+ def test_plaintext_mailcap_wo_content_type(self): -+ with open('tests/static/mail/basic.eml') as fp: -+ mail = email.message_from_file(fp, -+ _class=email.message.EmailMessage) -+ body_part = utils.get_body_part(mail) -+ actual = utils.extract_body_part(body_part) -+ expected = 'test body\n' -+ self.assertEqual(actual, expected) - - class TestRemoveCte(unittest.TestCase): - -diff --git a/tests/static/mail/basic.eml b/tests/static/mail/basic.eml -new file mode 100644 -index 00000000..95f15693 ---- /dev/null -+++ b/tests/static/mail/basic.eml -@@ -0,0 +1,5 @@ -+From: me@localhost -+To: you@localhost -+Subject: test subject -+ -+test body --- -2.29.2 - diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template index 8538b71ad3f194..1eb596387e3260 100644 --- a/srcpkgs/alot/template +++ b/srcpkgs/alot/template @@ -1,10 +1,10 @@ # Template file for 'alot' pkgname=alot -version=0.9.1 -revision=8 +version=0.10 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-Sphinx" -depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj +hostmakedepends="python3-setuptools python3-Sphinx python3-notmuch2 python3-cffi" +depends="python3-setuptools python3-Twisted python3-notmuch2 python3-configobj gpgme-python3 python3-magic python3-urwidtrees" checkdepends="$depends gnupg2 procps-ng python3-pytest" short_desc="Terminal-based mail user agent based on the notmuch mail indexer" @@ -12,7 +12,7 @@ maintainer="Felix Van der Jeugt " license="GPL-3.0-or-later" homepage="https://github.com/pazz/alot" distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz" -checksum=ee2c1ab1b43d022a8fe2078820ed57d8d72aec260a7d750776dac4ee841d1de4 +checksum=71f382aa751fb90fde1a06a0a4ba43628ee6aa6d41b5cd53c8701fd7c5ab6e6e do_check() { pytest3 -k 'not test_no_spawn_no_stdin_attached'