<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/855b9e1d358c416b63e0287a1224a015917b5b25">https://github.com/macports/macports-ports/commit/855b9e1d358c416b63e0287a1224a015917b5b25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 855b9e1d358c416b63e0287a1224a015917b5b25
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 29 23:54:12 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-pikepdf: Fix patch failure on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64908
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also use the patch always since it does no harm and is simpler and will
</span><span style='display:block; white-space:pre;color:#404040;'>    avoid forgetting to update the patch in the future.
</span>---
 python/py-pikepdf/Portfile                  |  4 +---
 python/py-pikepdf/files/patch-setup.py.diff | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pikepdf/Portfile b/python/py-pikepdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0662d983e31..2ea4a80774d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pikepdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pikepdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,10 +41,8 @@ if {${name} ne ${subport}} {
</span>     # error: no matching constructor for initialization of 'match_replace'
     compiler.blacklist-append {clang < 900}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${os.arch} == "arm" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span>                     patch-setup.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> 
     livecheck.type  none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pikepdf/files/patch-setup.py.diff b/python/py-pikepdf/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 13155f1aaaa..ebf79cbc976 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pikepdf/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pikepdf/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2022-03-21 03:14:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2022-03-23 05:44:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,9 +18,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     extra_library_dirs.append(join(qpdf_source_tree, 'libqpdf/build/.libs'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if 'bsd' in sys.platform:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     extra_includes.append('/usr/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif 'darwin' in sys.platform and machine() == 'arm64':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    extra_includes.append('/opt/homebrew/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    extra_library_dirs.append('/opt/homebrew/lib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not look for things in Homebrew paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2022-03-29 14:59:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2022-03-29 23:52:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,9 +25,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if 'bsd' in sys.platform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         extra_includes.append('/usr/local/include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    elif 'darwin' in sys.platform and machine() == 'arm64':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        extra_includes.append('/opt/homebrew/include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        extra_library_dirs.append('/opt/homebrew/lib')
</span>  
  try:
      from setuptools_scm import get_version
</pre><pre style='margin:0'>

</pre>