<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7051dfb91456d8d5dbcc5b16297dadde46b6d7a">https://github.com/macports/macports-ports/commit/e7051dfb91456d8d5dbcc5b16297dadde46b6d7a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e7051dfb91456d8d5dbcc5b16297dadde46b6d7a
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Thu Jun 17 12:38:34 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-magic: update to 0.4.24
</span>---
python/py-magic/Portfile | 8 +++---
python/py-magic/files/patch-magic_loader.py.diff | 34 ++++++++++--------------
2 files changed, 18 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/Portfile b/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1b979a2962..689e22ecf72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-magic
python.rootname python-magic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.24
</span> revision 0
categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ long_description Determines the mime type of a file using magic \
</span>
homepage https://github.com/ahupp/python-magic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3a90368e41f15584565321408145ba481e6c3680 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 139333b721a95953a1979fcee7623c4f186ed829 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 de800df9fb50f8ec5974761054a708af6e4246b03b4bdaee993f948947b0ebcf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17295
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/files/patch-magic_loader.py.diff b/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b9488ee19f6..a27c8e43f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- magic/loader.py.orig 2021-03-12 13:23:04.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ magic/loader.py 2021-03-12 13:24:56.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,10 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- magic/loader.py.orig 2021-06-03 16:42:29.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ magic/loader.py 2021-06-17 12:33:48.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,10 +11,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'darwin':
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '/usr/local/lib/libmagic.dylib'] +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Assumes there will only be one version installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), # flake8:noqa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cygwin': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'linux': ['libmagic.so.1'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,4 +34,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is better to raise an ImportError since we are importing magic module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise ImportError('failed to find libmagic. Check your installation')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return libmagic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return libmagic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/opt/local/lib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/usr/local/lib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/opt/homebrew/lib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ] + glob.glob('/usr/local/Cellar/libmagic/*/lib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '__PREFIX__/lib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield os.path.join(i, 'libmagic.dylib')
</span></pre><pre style='margin:0'>
</pre>