Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id BCC951A9217 for ; Sat, 9 Jan 2021 00:43:45 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 75326850D9; Sat, 9 Jan 2021 00:43:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B0297850CA for ; Sat, 9 Jan 2021 00:43:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hYgB5xKZvfO6 for ; Sat, 9 Jan 2021 00:43:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2BEC584D6A for ; Sat, 9 Jan 2021 00:43:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 25375FA9D; Sat, 9 Jan 2021 00:43:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610153024283900" MIME-Version: 1.0 Date: Sat, 9 Jan 2021 00:43:44 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/comms/py-colorama To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20210109004344.25375FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610153024283900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Sat Jan 9 00:43:44 UTC 2021 Modified Files: pkgsrc/comms/py-colorama: distinfo Added Files: pkgsrc/comms/py-colorama/patches: patch-setup.py Log Message: (comms/py-colorama) Add patch for py36, can't decode byte 0xc2 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/comms/py-colorama/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/comms/py-colorama/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1610153024283900 Content-Disposition: inline Content-Length: 2244 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/py-colorama/distinfo diff -u pkgsrc/comms/py-colorama/distinfo:1.8 pkgsrc/comms/py-colorama/distinfo:1.9 --- pkgsrc/comms/py-colorama/distinfo:1.8 Sun Jan 3 21:51:46 2021 +++ pkgsrc/comms/py-colorama/distinfo Sat Jan 9 00:43:43 2021 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2021/01/03 21:51:46 adam Exp $ +$NetBSD: distinfo,v 1.9 2021/01/09 00:43:43 mef Exp $ SHA1 (colorama-0.4.4.tar.gz) = 4591cc4448b3b23dfc958e997b7622e066a57132 RMD160 (colorama-0.4.4.tar.gz) = 7b2251157a315d0fd9d592b838a32d9bf7a6fddc SHA512 (colorama-0.4.4.tar.gz) = 84db73bed5a6d4ab1624bdbeea65aef2061126e730f9d4a853f3b2504b9ebf5eb7c0649024ec687b538a89c20c83a5f3365d4fb1aba9fdba3db0b375942c48f4 Size (colorama-0.4.4.tar.gz) = 27813 bytes +SHA1 (patch-setup.py) = aba7883e6c6c2514e70d0e0e12417186bc01f1a3 Added files: Index: pkgsrc/comms/py-colorama/patches/patch-setup.py diff -u /dev/null pkgsrc/comms/py-colorama/patches/patch-setup.py:1.1 --- /dev/null Sat Jan 9 00:43:44 2021 +++ pkgsrc/comms/py-colorama/patches/patch-setup.py Sat Jan 9 00:43:43 2021 @@ -0,0 +1,34 @@ +$NetBSD: patch-setup.py,v 1.1 2021/01/09 00:43:43 mef Exp $ + +This patch is necessary only for python-3.6 + +Traceback (most recent call last): + File "setup.py", line 36, in + long_description=read_file('README.rst'), + File "setup.py", line 19, in read_file + return fp.read() + File "/usr/pkg/lib/python3.6/encodings/ascii.py", line 26, in decode + return codecs.ascii_decode(input, self.errors)[0] +UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 852: ordinal not in range(128) +*** Error code 1 + +--- setup.py.orig 2020-10-13 06:22:32.000000000 +0900 ++++ setup.py 2021-01-09 09:24:27.258231596 +0900 +@@ -5,6 +5,8 @@ from __future__ import with_statement + + import os + import re ++import sys ++ + try: + from setuptools import setup + except ImportError: +@@ -15,7 +17,7 @@ NAME = 'colorama' + + + def read_file(path): +- with open(os.path.join(os.path.dirname(__file__), path)) as fp: ++ with open(os.path.join(os.path.dirname(__file__), path), **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as fp: + return fp.read() + + def _get_version_match(content): --_----------=_1610153024283900--