diff options
Diffstat (limited to 'mail-client/thunderbird/files')
-rw-r--r-- | mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch | 70 | ||||
-rw-r--r-- | mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch | 37 |
2 files changed, 107 insertions, 0 deletions
diff --git a/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch b/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch new file mode 100644 index 000000000000..975e0cf6fe7b --- /dev/null +++ b/mail-client/thunderbird/files/thunderbird-60.0-blessings-TERM.patch @@ -0,0 +1,70 @@ +https://github.com/erikrose/blessings/pull/137 + +Fixes: https://bugs.gentoo.org/654316 + +From 5fefc65c306cf9ec492e7b422d6bb4842385afbc Mon Sep 17 00:00:00 2001 +From: Jay Kamat <jaygkamat@gmail.com> +Date: Fri, 24 Aug 2018 11:11:57 -0700 +Subject: [PATCH 1/2] Fix error when TERM is unset or improperly set + +--- + blessings/__init__.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/blessings/__init__.py b/blessings/__init__.py +index 98b75c3..3872b5f 100644 +--- a/third_party/python/blessings/blessings/__init__.py ++++ b/third_party/python/blessings/blessings/__init__.py +@@ -94,8 +94,13 @@ def __init__(self, kind=None, stream=None, force_styling=False): + # init sequences to the stream if it has a file descriptor, and + # send them to stdout as a fallback, since they have to go + # somewhere. +- setupterm(kind or environ.get('TERM', 'unknown'), +- self._init_descriptor) ++ try: ++ setupterm(kind or environ.get('TERM', 'dumb') or 'dumb', ++ self._init_descriptor) ++ except: ++ # There was an error setting up the terminal, either curses is ++ # not supported or TERM is incorrectly set. Fall back to dumb. ++ self._does_styling = False + + self.stream = stream + + +From d885df78c6f931abf3259343aaaa897e16c8cba1 Mon Sep 17 00:00:00 2001 +From: Jay Kamat <jaygkamat@gmail.com> +Date: Sat, 1 Sep 2018 13:20:32 -0700 +Subject: [PATCH 2/2] Explicitly catch curses.error + +--- + blessings/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blessings/__init__.py b/blessings/__init__.py +index 3872b5f..fdceb09 100644 +--- a/third_party/python/blessings/blessings/__init__.py ++++ b/third_party/python/blessings/blessings/__init__.py +@@ -97,7 +97,7 @@ def __init__(self, kind=None, stream=None, force_styling=False): + try: + setupterm(kind or environ.get('TERM', 'dumb'), + self._init_descriptor) +- except: ++ except curses.error: + # There was an error setting up the terminal, either curses is + # not supported or TERM is incorrectly set. Fall back to dumb. + self._does_styling = False + + +--- a/python/mach/mach/logging.py ++++ b/python/mach/mach/logging.py +@@ -93,7 +93,7 @@ + + def set_terminal(self, terminal): + self.terminal = terminal +- self._sgr0 = blessings.tigetstr('sgr0') or '' if terminal and blessings else '' ++ self._sgr0 = terminal.normal if terminal and blessings else '' + + def format(self, record): + f = record.msg.format(**record.params) + diff --git a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch new file mode 100644 index 000000000000..6fbd13fe639a --- /dev/null +++ b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/666898 + +https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -572,17 +572,26 @@ option('--target', nargs=1, + @imports(_from='__builtin__', _import='KeyError') + @imports(_from='__builtin__', _import='ValueError') + def split_triplet(triplet, allow_unknown=False): + # The standard triplet is defined as + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM + # There is also a quartet form: + # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM + # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. +- cpu, manufacturer, os = triplet.split('-', 2) ++ # Additionally, some may omit "unknown" when the manufacturer ++ # is not specified and emit ++ # CPU_TYPE-OPERATING_SYSTEM ++ parts = triplet.split('-', 2) ++ if len(parts) == 3: ++ cpu, _, os = parts ++ elif len(parts) == 2: ++ cpu, os = parts ++ else: ++ die("Unexpected triplet string: %s" % triplet) + + # Autoconf uses config.sub to validate and canonicalize those triplets, + # but the granularity of its results has never been satisfying to our + # use, so we've had our own, different, canonicalization. We've also + # historically not been very consistent with how we use the canonicalized + # values. Hopefully, this will help us make things better. + # The tests are inherited from our decades-old autoconf-based configure, + # which can probably be improved/cleaned up because they are based on a + + + + |