From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1768A138335 for ; Wed, 15 Aug 2018 21:11:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D32E091F; Wed, 15 Aug 2018 21:11:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B758FE091F for ; Wed, 15 Aug 2018 21:11:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7AE0335CFD for ; Wed, 15 Aug 2018 21:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A02283A0 for ; Wed, 15 Aug 2018 21:11:50 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1534367357.3a1569e99ba430e929e1367ea68f13184f015ab8.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/files/fix-setupterm.patch mail-client/thunderbird/thunderbird-60.0-r1.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 3a1569e99ba430e929e1367ea68f13184f015ab8 X-VCS-Branch: master Date: Wed, 15 Aug 2018 21:11:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 445b8726-2b21-4a32-81f3-1037c30bd26b X-Archives-Hash: 3af1f63d1667496084d1433af9348c52 commit: 3a1569e99ba430e929e1367ea68f13184f015ab8 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Aug 15 21:09:17 2018 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Aug 15 21:09:17 2018 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=3a1569e9 thunderbird: attempt to fix setupterm issues by patch The python lib 'blessings' is what requires setupterm, and it seems to be semi-optional based on the code that loads it; this commit drops the need for blessings by forcing a return of NullTerminal instead of only doing so when blessings.Terminal throws an exception. Note - this is a debug commit, the final fix will involve properly running down why the exception isn't caught, or how to force the disable_colors setting to ensure NullTerminal is always used. mail-client/thunderbird/files/fix-setupterm.patch | 22 ++++++++++++++++++++++ mail-client/thunderbird/thunderbird-60.0-r1.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/mail-client/thunderbird/files/fix-setupterm.patch b/mail-client/thunderbird/files/fix-setupterm.patch new file mode 100644 index 0000000..0928ca0 --- /dev/null +++ b/mail-client/thunderbird/files/fix-setupterm.patch @@ -0,0 +1,22 @@ +--- a/python/mozterm/mozterm/terminal.py 2018-07-31 14:21:02.000000000 -0400 ++++ b/python/mozterm/mozterm/terminal.py 2018-08-15 17:00:45.540515437 -0400 +@@ -32,18 +32,9 @@ + return '' + return args[0] + + def __getattr__(self, attr): + return self.NullCallableString() + + + def Terminal(raises=False, disable_styling=False, **kwargs): +- if disable_styling: +- return NullTerminal(**kwargs) +- +- try: +- import blessings +- except Exception: +- if raises: +- raise +- return NullTerminal(**kwargs) +- return blessings.Terminal(**kwargs) ++ return NullTerminal(**kwargs) diff --git a/mail-client/thunderbird/thunderbird-60.0-r1.ebuild b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild index 6b28658..f87cfb2 100644 --- a/mail-client/thunderbird/thunderbird-60.0-r1.ebuild +++ b/mail-client/thunderbird/thunderbird-60.0-r1.ebuild @@ -112,6 +112,7 @@ src_prepare() { "${WORKDIR}"/firefox/2005_ffmpeg4.patch \ || die eapply "${WORKDIR}/firefox" + eapply "${FILESDIR}"/fix-setupterm.patch # Ensure that are plugins dir is enabled as default sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \