<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/42b8b5016b898c913cc66254254589c030e0416a">https://github.com/macports/macports-ports/commit/42b8b5016b898c913cc66254254589c030e0416a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 42b8b5016b898c913cc66254254589c030e0416a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Dec 1 21:18:08 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-meson,meson: update to 1.3.0
</span>---
devel/meson/Portfile | 2 +-
python/py-meson/Portfile | 8 ++++----
python/py-meson/files/patch-meson-32bit-apple.diff | 20 ++++++++------------
3 files changed, 13 insertions(+), 17 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 b68a3bce86d..418b437ddab 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name meson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.3.0
</span> revision 0
license Apache-2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/Portfile b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 313f0d05e50..ab05be08655 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,13 +6,13 @@ PortGroup github 1.0
</span>
name py-meson
# update version and revision also in the meson port
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mesonbuild meson 1.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mesonbuild meson 1.3.0
</span> github.tarball_from releases
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9b32a4cc4dc44d14d97675c6f21ca52f0e74d1a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2184484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ab5b0514c9046df363a1de4159937ceb6a47c929 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2222383
</span>
license Apache-2
categories-append devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson-32bit-apple.diff b/python/py-meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 80ba35a739f..fcdf753d456 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git mesonbuild/environment.py.orig mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 71286a5..0b004e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/environment.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/environment.py.orig 2023-12-01 21:19:37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/environment.py 2023-12-01 21:24:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</span>
import itertools
import os, platform, re, sys, shutil
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +8,10 @@ index 71286a5..0b004e7 100644
</span> import typing as T
import collections
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -284,6 +285,23 @@ def detect_windows_arch(compilers: CompilersDict) -> str:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,6 +284,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if compiler.id == 'gcc' and compiler.has_builtin_define('__i386__'):
</span> return 'x86'
return os_arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> +
+def detect_osx_arch() -> str:
+ """
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,12 +27,10 @@ index 71286a5..0b004e7 100644
</span> + # very old MacOS version with implicit 32-bit CPU due to calling if-elif stack
+ trial = 'x86'
+ return trial
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def any_compiler_has_define(compilers: CompilersDict, define):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def any_compiler_has_define(compilers: CompilersDict, define: str) -> bool:
</span> for c in compilers.values():
<span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -308,7 +326,11 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,7 +324,11 @@
</span> else:
trial = platform.machine().lower()
if trial.startswith('i') and trial.endswith('86'):
</pre><pre style='margin:0'>
</pre>