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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88ba3df2435b85ffd1f21d37fe7bd2f64d0afb69">https://github.com/macports/macports-ports/commit/88ba3df2435b85ffd1f21d37fe7bd2f64d0afb69</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 88ba3df2435 meson: tweak 32bit patch
</span>88ba3df2435 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 88ba3df2435b85ffd1f21d37fe7bd2f64d0afb69
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Sep 14 16:55:52 2021 -0700

<span style='display:block; white-space:pre;color:#404040;'>    meson: tweak 32bit patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    import subprocess needs to be added as it was removed from the source file
</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/63488
</span>---
 devel/meson/Portfile                           |  2 +-
 devel/meson/files/patch-meson-32bit-apple.diff | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da99638b8ac..9a74a36bd73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> PortGroup           github 1.0
 
 github.setup        mesonbuild meson 0.59.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> 
 github.tarball_from releases
 license             Apache-2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson-32bit-apple.diff b/devel/meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e22880563cd..f6a539b6ee5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/environment.py.orig 2020-07-05 13:13:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/environment.py      2020-07-14 13:46:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,6 +314,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mesonbuild/environment.py.orig mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 71286a5..0b004e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/environment.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import itertools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os, platform, re, sys, shutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import subprocess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import typing as T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import collections
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -284,6 +285,23 @@ def detect_windows_arch(compilers: CompilersDict) -> str:
</span>              return 'x86'
      return os_arch
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +34,7 @@
</span>  def any_compiler_has_define(compilers: CompilersDict, define):
      for c in compilers.values():
          try:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,7 +355,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,7 +326,11 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
</span>      else:
          trial = platform.machine().lower()
      if trial.startswith('i') and trial.endswith('86'):
</pre><pre style='margin:0'>

</pre>