Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id E6CBB7A264 for ; Sat, 3 Dec 2016 04:08:54 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 905CA855C0; Sat, 3 Dec 2016 04:08:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 220A6855A5 for ; Sat, 3 Dec 2016 04:08:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id sTT2_nGx9V0u for ; Sat, 3 Dec 2016 04:08:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 68E3084CEE for ; Sat, 3 Dec 2016 04:08:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6385EFBA6; Sat, 3 Dec 2016 04:08:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148073813358240" MIME-Version: 1.0 Date: Sat, 3 Dec 2016 04:08:53 +0000 From: "NONAKA Kimihiro" Subject: CVS commit: pkgsrc/graphics/py-mcomix To: pkgsrc-changes@NetBSD.org Reply-To: nonaka@netbsd.org X-Mailer: log_accum Message-Id: <20161203040853.6385EFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148073813358240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nonaka Date: Sat Dec 3 04:08:53 UTC 2016 Modified Files: pkgsrc/graphics/py-mcomix: Makefile distinfo Added Files: pkgsrc/graphics/py-mcomix/patches: patch-mcomix_archive_archive_base.py patch-mcomix_archive_pdf_external.py patch-mcomix_archive_rar_external.py patch-mcomix_archive_sevenzip_external.py Log Message: fix read subprocess stdout line by line. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/py-mcomix/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/py-mcomix/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py \ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py \ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py \ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148073813358240 Content-Disposition: inline Content-Length: 7358 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/py-mcomix/Makefile diff -u pkgsrc/graphics/py-mcomix/Makefile:1.10 pkgsrc/graphics/py-mcomix/Makefile:1.11 --- pkgsrc/graphics/py-mcomix/Makefile:1.10 Thu Sep 1 17:33:28 2016 +++ pkgsrc/graphics/py-mcomix/Makefile Sat Dec 3 04:08:53 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2016/09/01 17:33:28 nonaka Exp $ +# $NetBSD: Makefile,v 1.11 2016/12/03 04:08:53 nonaka Exp $ DISTNAME= mcomix-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcomix/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/graphics/py-mcomix/distinfo diff -u pkgsrc/graphics/py-mcomix/distinfo:1.4 pkgsrc/graphics/py-mcomix/distinfo:1.5 --- pkgsrc/graphics/py-mcomix/distinfo:1.4 Sat Jun 11 14:34:17 2016 +++ pkgsrc/graphics/py-mcomix/distinfo Sat Dec 3 04:08:53 2016 @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.4 2016/06/11 14:34:17 wiz Exp $ +$NetBSD: distinfo,v 1.5 2016/12/03 04:08:53 nonaka Exp $ SHA1 (mcomix-1.2.1.tar.bz2) = c18b920269dea5c77f97af4c1d72d195c13a4c5f RMD160 (mcomix-1.2.1.tar.bz2) = db5d4c4ef695384581a504976d09a7e7a28d244e SHA512 (mcomix-1.2.1.tar.bz2) = efa4d57edc3a48d9e711767fb3e233ef9b334ff8ba467999e572e60ed747a4ee4aa420c8aa7788b16d7eb6e0901d454d6a405fcec47a8c74098a49491e915cd0 Size (mcomix-1.2.1.tar.bz2) = 571128 bytes +SHA1 (patch-mcomix_archive_archive_base.py) = 1098362d435aa0325b1a6b0fe1c12148fedf176c +SHA1 (patch-mcomix_archive_pdf_external.py) = 4b758daff2e1bd1312961870b209833277bb4cb6 +SHA1 (patch-mcomix_archive_rar_external.py) = 9a2d5f90ae4d618dd43acd29547e2d47ccb48b8b +SHA1 (patch-mcomix_archive_sevenzip_external.py) = 2c6366e45a40f34349112e41944ae56a6255f95d Added files: Index: pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py diff -u /dev/null pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py:1.1 --- /dev/null Sat Dec 3 04:08:53 2016 +++ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py Sat Dec 3 04:08:53 2016 @@ -0,0 +1,17 @@ +$NetBSD: patch-mcomix_archive_archive_base.py,v 1.1 2016/12/03 04:08:53 nonaka Exp $ + +fix read subprocess stdout line by line. + +See http://stackoverflow.com/questions/2715847/python-read-streaming-input-from-subprocess-communicate/17698359#17698359 + +--- mcomix/archive/archive_base.py.orig 2016-02-12 18:52:12.000000000 +0000 ++++ mcomix/archive/archive_base.py 2016-12-03 03:47:22.878349500 +0000 +@@ -211,7 +211,7 @@ class ExternalExecutableArchive(NonUnico + self._get_list_arguments() + + [self.archive]) + try: +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + filename = self._parse_list_output_line(line.rstrip(os.linesep)) + if filename is not None: + yield self._unicode_filename(filename) Index: pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py diff -u /dev/null pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py:1.1 --- /dev/null Sat Dec 3 04:08:53 2016 +++ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py Sat Dec 3 04:08:53 2016 @@ -0,0 +1,26 @@ +$NetBSD: patch-mcomix_archive_pdf_external.py,v 1.1 2016/12/03 04:08:53 nonaka Exp $ + +fix read subprocess stdout line by line. + +See http://stackoverflow.com/questions/2715847/python-read-streaming-input-from-subprocess-communicate/17698359#17698359 + +--- mcomix/archive/pdf_external.py.orig 2016-02-12 18:52:12.000000000 +0000 ++++ mcomix/archive/pdf_external.py 2016-12-03 03:47:31.069776589 +0000 +@@ -34,7 +34,7 @@ class PdfArchive(archive_base.BaseArchiv + def iter_contents(self): + proc = process.popen(_mutool_exec + ['show', '--', self.archive, 'pages']) + try: +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + if line.startswith('page '): + yield line.split()[1] + '.png' + finally: +@@ -52,7 +52,7 @@ class PdfArchive(archive_base.BaseArchiv + try: + max_size = 0 + max_dpi = PDF_RENDER_DPI_DEF +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + match = self._fill_image_regex.match(line) + if not match: + continue Index: pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py diff -u /dev/null pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py:1.1 --- /dev/null Sat Dec 3 04:08:53 2016 +++ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py Sat Dec 3 04:08:53 2016 @@ -0,0 +1,17 @@ +$NetBSD: patch-mcomix_archive_rar_external.py,v 1.1 2016/12/03 04:08:53 nonaka Exp $ + +fix read subprocess stdout line by line. + +See http://stackoverflow.com/questions/2715847/python-read-streaming-input-from-subprocess-communicate/17698359#17698359 + +--- mcomix/archive/rar_external.py.orig 2016-02-12 18:52:12.000000000 +0000 ++++ mcomix/archive/rar_external.py 2016-12-03 03:47:38.157303416 +0000 +@@ -100,7 +100,7 @@ class RarArchive(archive_base.ExternalEx + self._path = None + proc = process.popen(self._get_list_arguments(), stderr=process.STDOUT) + try: +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + filename = self._parse_list_output_line(line.rstrip(os.linesep)) + if filename is not None: + yield self._unicode_filename(filename) Index: pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py diff -u /dev/null pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py:1.1 --- /dev/null Sat Dec 3 04:08:53 2016 +++ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py Sat Dec 3 04:08:53 2016 @@ -0,0 +1,26 @@ +$NetBSD: patch-mcomix_archive_sevenzip_external.py,v 1.1 2016/12/03 04:08:53 nonaka Exp $ + +fix read subprocess stdout line by line. + +See http://stackoverflow.com/questions/2715847/python-read-streaming-input-from-subprocess-communicate/17698359#17698359 + +--- mcomix/archive/sevenzip_external.py.orig 2016-02-12 18:52:12.000000000 +0000 ++++ mcomix/archive/sevenzip_external.py 2016-12-03 03:47:59.108184817 +0000 +@@ -112,7 +112,7 @@ class SevenZipArchive(archive_base.Exter + self._path = None + proc = process.popen(self._get_list_arguments(), stderr=process.STDOUT) + try: +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + filename = self._parse_list_output_line(line.rstrip(os.linesep)) + if filename is not None: + yield self._unicode_filename(filename) +@@ -231,7 +231,7 @@ class TarArchive(SevenZipArchive): + self._path = 'archive.tar' + proc = process.popen(self._get_list_arguments(), stderr=process.STDOUT) + try: +- for line in proc.stdout: ++ for line in iter(proc.stdout.readline, b''): + self._parse_list_output_line(line.rstrip(os.linesep)) + finally: + proc.stdout.close() --_----------=_148073813358240--