<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/c88ba70d8029a3e17394ffe7fbc8ede4a5aa99ad">https://github.com/macports/macports-ports/commit/c88ba70d8029a3e17394ffe7fbc8ede4a5aa99ad</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c88ba70d8029a3e17394ffe7fbc8ede4a5aa99ad
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Jul 29 23:49:20 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-mseson, meson: updsate to 1.5.1
</span>---
devel/meson/Portfile | 2 +-
python/py-meson/Portfile | 16 ++++---------
.../files/duplicate-rpath-delete-darwin-fix.diff | 28 ----------------------
3 files changed, 6 insertions(+), 40 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 21db6d74534..f65040774a0 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.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.1
</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 595b36d31cf..824f90c4a4e 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.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mesonbuild meson 1.5.1
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a344eeb69d38eff4e54334caf1ca25941b08a6f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 45d7b8653c1e5139df35b33be2dd5b2d040c5b2c6129f9a7c890d507e33312b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2257170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9d8c02bf13789368f7af53c0cc66fe0ccc88c476 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2257106
</span>
license Apache-2
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,12 +71,6 @@ if {${subport} ne ${name}} {
</span>
# add a search path for crossfiles in our prefix
patchfiles-append patch-meson-search-prefix-for-cross-files.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary fix for the destroot failure on a lot of packages using meson build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Since version release 1.5.0 on darwin platform.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/70394#comment:5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append duplicate-rpath-delete-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>
platform darwin 8 {
# this meson is modified for systems without @rpath support
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff b/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index accabb65d47..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/scripts/depfixer.py.orig 2024-07-01 17:31:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/scripts/depfixer.py 2024-07-24 12:56:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -379,11 +379,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # note: e.get_rpath() and e.get_runpath() may be useful
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e.fix_rpath(fname, rpath_dirs_to_remove, new_rpath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--def get_darwin_rpaths(fname: str) -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def get_darwin_rpaths(fname: str) -> OrderedSet[str]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p, out, _ = Popen_safe(['otool', '-l', fname], stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if p.returncode != 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise subprocess.CalledProcessError(p.returncode, p.args, out)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Need to deduplicate rpaths, as macOS's install_name_tool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # is *very* allergic to duplicate -delete_rpath arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # when calling depfixer on installation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result = OrderedSet()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current_cmd = 'FOOBAR'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for line in out.split('\n'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- line = line.strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -394,7 +397,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current_cmd = value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if key == 'path' and current_cmd == 'LC_RPATH':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rp = value.split('(', 1)[0].strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result.append(rp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result.add(rp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def fix_darwin(fname: str, rpath_dirs_to_remove: T.Set[bytes], new_rpath: str, final_path: str, install_name_mappings: T.Dict[str, str]) -> None:
</span></pre><pre style='margin:0'>
</pre>