<pre style='margin:0'>
Benjamin Gilbert (bgilbert) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/73f85fb64b88dc60480de22e38694dc45099b798">https://github.com/macports/macports-ports/commit/73f85fb64b88dc60480de22e38694dc45099b798</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 73f85fb64b88dc60480de22e38694dc45099b798
</span>Author: Benjamin Gilbert <bgilbert@macports.org>
AuthorDate: Sun Mar 21 12:26:01 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-openslide: Revert to upstream method for finding OpenSlide dylib
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    MacPorts has been setting DEFAULT_LIBRARY_FALLBACK on Python 3.x for
</span><span style='display:block; white-space:pre;color:#404040;'>    quite a while now.
</span>---
 python/py-openslide/Portfile                       |  8 +-------
 .../files/patch-disable-find_library-fallback.diff | 24 ----------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-openslide/Portfile b/python/py-openslide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98f1782148a..5fe8bcbce42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-openslide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-openslide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup           github 1.0
</span> 
 github.setup        openslide openslide-python 1.1.2 v
 name                py-openslide
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories-append   graphics
 platforms           darwin
 license             LGPL-2.1 MIT BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,13 +51,6 @@ if {${name} ne ${subport}} {
</span>     build.target-append build_sphinx
     test.run            yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          patch-disable-find_library-fallback.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/openslide/lowlevel.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     post-destroot {
         set docdir ${prefix}/share/doc/${subport}
         xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-openslide/files/patch-disable-find_library-fallback.diff b/python/py-openslide/files/patch-disable-find_library-fallback.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d82101da5a9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-openslide/files/patch-disable-find_library-fallback.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openslide/lowlevel.py.orig     2016-06-12 00:26:33.183561713 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openslide/lowlevel.py  2016-06-12 00:26:36.116565929 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,20 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if platform.system() == 'Windows':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     _lib = cdll.LoadLibrary('libopenslide-0.dll')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif platform.system() == 'Darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        _lib = cdll.LoadLibrary('libopenslide.0.dylib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    except OSError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        # MacPorts doesn't add itself to the dyld search path, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        # does add itself to the find_library() search path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        # (DEFAULT_LIBRARY_FALLBACK in ctypes.macholib.dyld) on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        # Python 2.6 and 2.7.  Python 3 users on MacPorts should add
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        # the MacPorts lib directory to DYLD_LIBRARY_PATH.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        import ctypes.util
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        _lib = ctypes.util.find_library('openslide')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        if _lib is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            raise ImportError("Couldn't locate OpenSlide dylib.  " +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    "Is OpenSlide installed?")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        _lib = cdll.LoadLibrary(_lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    _lib = cdll.LoadLibrary('@@PREFIX@@/lib/libopenslide.0.dylib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     _lib = cdll.LoadLibrary('libopenslide.so.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span></pre><pre style='margin:0'>

</pre>