<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0cf6918ade2ceb06ef935402773527d42dd0bc72">https://github.com/macports/macports-ports/commit/0cf6918ade2ceb06ef935402773527d42dd0bc72</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0cf6918ade2 comix: Fix outdated PIL version check
</span>0cf6918ade2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cf6918ade2ceb06ef935402773527d42dd0bc72
</span>Author: Edwar D Day <4127904+EdwarDDay@users.noreply.github.com>
AuthorDate: Mon Jun 22 15:11:59 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> comix: Fix outdated PIL version check
</span>---
graphics/comix/Portfile | 5 ++--
.../comix/files/patch-pillow-version-compat.diff | 34 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/comix/Portfile b/graphics/comix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d620d37e5e..15e7b979c39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/comix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/comix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span>
name comix
version 4.0.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories graphics
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,8 @@ depends_lib port:py${python.version}-pygtk \
</span> port:python${python.version} \
port:unrar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pillow-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-pillow-compat.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pillow-version-compat.diff
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/comix/files/patch-pillow-version-compat.diff b/graphics/comix/files/patch-pillow-version-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c6fcccc9aec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/comix/files/patch-pillow-version-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.py.old 2020-06-22 14:49:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.py 2020-06-22 14:49:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,13 +241,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ required_found = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from PIL import Image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert Image.VERSION >= '1.1.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert Image.__version__ >= '1.1.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ' Python Imaging Library ....... OK'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ' !!! Python Imaging Library ... Not found'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ required_found = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except AssertionError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print ' !!! Python Imaging Library ... version', Image.VERSION,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print ' !!! Python Imaging Library ... version', Image.__version__,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print 'found'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ' !!! Python Imaging Library 1.1.5 or higher is required'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ required_found = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/comix.py.old 2020-06-22 14:48:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/comix.py 2020-06-22 14:49:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,11 +50,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from PIL import Image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert Image.VERSION >= '1.1.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert Image.__version__ >= '1.1.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except AssertionError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "You don't have the required version of the Python Imaging",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print 'Library (PIL) installed.'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'Installed PIL version is: %s' % Image.VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print 'Installed PIL version is: %s' % Image.__version__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print 'Required PIL version is: 1.1.5 or higher'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span></pre><pre style='margin:0'>
</pre>