fix read subprocess stdout line by line.

Bump PKGREVISION.

6 files changed, 93 insertions, 3 deletions

diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile
index b8b8dab95bb..2e9375f79a9 100644
--- a/graphics/py-mcomix/Makefile
+++ b/graphics/py-mcomix/Makefile
@@ -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
diff --git a/graphics/py-mcomix/distinfo b/graphics/py-mcomix/distinfo
index bdd3931d379..c949a57a7bb 100644
--- a/graphics/py-mcomix/distinfo
+++ b/graphics/py-mcomix/distinfo
@@ -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
diff --git a/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py b/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py
new file mode 100644
index 00000000000..e82f3e36b2a
--- /dev/null
+++ b/graphics/py-mcomix/patches/patch-mcomix_archive_archive_base.py
@@ -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)
diff --git a/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py b/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py
new file mode 100644
index 00000000000..a57716c6761
--- /dev/null
+++ b/graphics/py-mcomix/patches/patch-mcomix_archive_pdf_external.py
@@ -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
diff --git a/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py b/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py
new file mode 100644
index 00000000000..71d0985bcbe
--- /dev/null
+++ b/graphics/py-mcomix/patches/patch-mcomix_archive_rar_external.py
@@ -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)
diff --git a/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py b/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py
new file mode 100644
index 00000000000..c7d835a2ee1
--- /dev/null
+++ b/graphics/py-mcomix/patches/patch-mcomix_archive_sevenzip_external.py
@@ -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()