<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/43468f1fad296a9a5486e27547f802194142a571">https://github.com/macports/macports-ports/commit/43468f1fad296a9a5486e27547f802194142a571</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 43468f1fad2 py*-meson: update Tiger version to 1.61
</span>43468f1fad2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 43468f1fad296a9a5486e27547f802194142a571
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Dec 26 12:07:35 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> py*-meson: update Tiger version to 1.61
</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/71614
</span>---
python/py-meson/Portfile | 29 ++++-----
...-apple.diff => patch-meson161-32bit-apple.diff} | 18 +++---
...meson161-clang-unknown-optimization-error.diff} | 10 ++--
...iff => patch-meson161-gcc-appleframeworks.diff} | 8 +--
...meson161-gnome-dont-set-cc-for-gir-scanner.diff | 12 ++++
python/py-meson/files/patch-meson161-gnome.diff | 34 +++++++++++
...patch-meson161-remove-Wl,-no_weak_imports.diff} | 8 +--
...ch-meson161-search-prefix-for-cross-files.diff} | 14 ++---
...diff => patch-meson161-tiger-no-rpath-fix.diff} | 68 ++++++++++++++--------
python/py-meson/files/patch-meson64-gnome.diff | 16 -----
10 files changed, 134 insertions(+), 83 deletions(-)
<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 5c46dee7d9b..606264397da 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;'>@@ -73,22 +73,23 @@ if {${subport} ne ${name}} {
</span> patchfiles-append patch-meson-search-prefix-for-cross-files.diff
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this meson is modified for systems without @rpath support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and is therefore fragile. Keep pegged, and update occasionally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup mesonbuild meson 0.64.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup mesonbuild meson 1.6.1
</span> github.tarball_from releases
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6ed7a0c8b1ac2a0de91d25aa253ad2efa132c6dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2089752
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-meson64-tiger-no-rpath-fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-remove-Wl,-no_weak_imports.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-gnome.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson64-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b7c38c2626e32a40c1989a54f7bffca1a4a01a28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2276144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-meson161-remove-Wl,-no_weak_imports.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-gnome.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-gnome-dont-set-cc-for-gir-scanner.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-search-prefix-for-cross-files.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson161-tiger-no-rpath-fix.diff
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-32bit-apple.diff b/python/py-meson/files/patch-meson161-32bit-apple.diff
</span>similarity index 80%
rename from python/py-meson/files/patch-meson64-32bit-apple.diff
rename to python/py-meson/files/patch-meson161-32bit-apple.diff
<span style='display:block; white-space:pre;color:#808080;'>index 333268155f5..fcdf753d456 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-32bit-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</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;'>-@@ -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;'>@@ -8,10 +8,10 @@
</span> import typing as T
import collections
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,6 +314,23 @@
</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;'>@@ -27,12 +27,10 @@
</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;'>-@@ -338,7 +355,11 @@
</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'):
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-clang-unknown-optimization-error.diff b/python/py-meson/files/patch-meson161-clang-unknown-optimization-error.diff
</span>similarity index 57%
rename from python/py-meson/files/patch-meson64-clang-unknown-optimization-error.diff
rename to python/py-meson/files/patch-meson161-clang-unknown-optimization-error.diff
<span style='display:block; white-space:pre;color:#808080;'>index bfef142554b..f8a8b109500 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-clang-unknown-optimization-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-clang-unknown-optimization-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/compilers/mixins/clang.py.orig 2024-09-28 13:52:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/compilers/mixins/clang.py 2024-09-28 13:52:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,7 +106,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- myargs: T.List[str] = ['-Werror=implicit-function-declaration']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mesonbuild/compilers/mixins/clang.py.orig mesonbuild/compilers/mixins/clang.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index acdb352..0a3e879 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clang.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clang.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@ class ClangCompiler(GnuLikeCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ myargs = [] # type: T.List[str]
</span> if mode is CompileCheckMode.COMPILE:
myargs.extend(['-Werror=unknown-warning-option', '-Werror=unused-command-line-argument'])
- if mesonlib.version_compare(self.version, '>=3.6.0'):
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-gcc-appleframeworks.diff b/python/py-meson/files/patch-meson161-gcc-appleframeworks.diff
</span>similarity index 63%
rename from python/py-meson/files/patch-meson64-gcc-appleframeworks.diff
rename to python/py-meson/files/patch-meson161-gcc-appleframeworks.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5dc8e21420f..e90cc85ddb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/compilers/mixins/clike.py.orig 2024-09-20 13:16:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/compilers/mixins/clike.py 2024-09-28 13:52:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1185,9 +1185,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clike.py.orig 2022-01-03 04:12:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clike.py 2022-04-06 05:50:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1123,9 +1123,6 @@
</span> unless you select a particular macOS SDK with the -isysroot flag.
You can also add to this by setting -F in CFLAGS.
'''
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,5 +8,5 @@
</span> - if self.id != 'clang':
- raise mesonlib.MesonException('Cannot find framework path with non-clang compiler')
# Construct the compiler command-line
<span style='display:block; white-space:pre;background:#ffe0e0;'>- commands = self.get_exelist(ccache=False) + ['-v', '-E', '-']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commands = self.get_exelist() + ['-v', '-E', '-']
</span> commands += self.get_always_args()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson161-gnome-dont-set-cc-for-gir-scanner.diff b/python/py-meson/files/patch-meson161-gnome-dont-set-cc-for-gir-scanner.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..91e60af4874
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-gnome-dont-set-cc-for-gir-scanner.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./mesonbuild/modules/gnome.py2 2023-12-21 20:03:04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./mesonbuild/modules/gnome.py 2023-12-21 20:04:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -983,7 +983,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ run_env = PkgConfigInterface.get_env(state.environment, MachineChoice.HOST, uninstalled=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # g-ir-scanner uses Python's distutils to find the compiler, which uses 'CC'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc_exelist = state.environment.coredata.compilers.host['c'].get_exelist()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- run_env.set('CC', [quote_arg(x) for x in cc_exelist], ' ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MACPORTS MOD -- do not set CC here. MacPorts sets it directly, with modifications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # run_env.set('CC', [quote_arg(x) for x in cc_exelist], ' ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ run_env.merge(kwargs['env'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GirTarget(
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson161-gnome.diff b/python/py-meson/files/patch-meson161-gnome.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f5fcfea0877
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Due to a presumed bug in MP's g-ir-scanner[1], generated typelib files often
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+point to the dylib's relative build path. E.g. running
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g-ir-inspect --print-shlibs Pango
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Will print something like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shlib: ./pango/libpango-1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+At run-time, the GObject Introspection infrastructure won't be able to find the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libpango dylib, and panic ensues. This patch ensures that the full install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+paths are specified in the typelib file. You can ensure correct operation with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the above command, which should print something like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shlib: /opt/local/lib/libpango-1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[1] https://trac.macports.org/ticket/62391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/modules/gnome.py.orig 2022-03-22 05:17:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/modules/gnome.py 2022-04-06 05:54:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1177,6 +1177,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for incdir in typelib_includes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typelib_cmd += ["--includedir=" + incdir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for target in girtargets:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if isinstance(target, build.SharedLibrary):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typelib_cmd += ["--shared-library=" +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.path.join(state.environment.get_prefix(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ state.environment.get_shared_lib_dir(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target.filename)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typelib_target = self._make_typelib_target(state, typelib_output, typelib_cmd, generated_files, T.cast('T.Dict[str, T.Any]', kwargs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._devenv_prepend('GI_TYPELIB_PATH', os.path.join(state.environment.get_build_dir(), state.subdir))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-remove-Wl,-no_weak_imports.diff b/python/py-meson/files/patch-meson161-remove-Wl,-no_weak_imports.diff
</span>similarity index 84%
rename from python/py-meson/files/patch-meson64-remove-Wl,-no_weak_imports.diff
rename to python/py-meson/files/patch-meson161-remove-Wl,-no_weak_imports.diff
<span style='display:block; white-space:pre;color:#808080;'>index 26ea92099e7..d192c1f3f27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-remove-Wl,-no_weak_imports.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-remove-Wl,-no_weak_imports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,10 @@ the version of ld64 that MacPorts uses by default on Snow Leopard and
</span> earlier doesn't understand that option.
Temporary workaround for https://github.com/mesonbuild/meson/issues/7204
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/compilers/mixins/clang.py.orig 2020-04-26 04:07:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/compilers/mixins/clang.py 2020-05-28 08:15:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,13 +81,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies: T.Optional[T.List['Dependency']] = None) -> bool:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clang.py.orig 2024-09-20 13:16:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clang.py 2024-09-28 13:47:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,13 +115,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: T.Optional[T.List['Dependency']] = None) -> T.Tuple[bool, bool]:
</span> if extra_args is None:
extra_args = []
- # Starting with XCode 8, we need to pass this to force linker
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-search-prefix-for-cross-files.diff b/python/py-meson/files/patch-meson161-search-prefix-for-cross-files.diff
</span>similarity index 67%
rename from python/py-meson/files/patch-meson64-search-prefix-for-cross-files.diff
rename to python/py-meson/files/patch-meson161-search-prefix-for-cross-files.diff
<span style='display:block; white-space:pre;color:#808080;'>index 83b4df5ffc0..73720cae3f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/shell-completions/bash/meson.orig 2020-08-03 09:20:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/shell-completions/bash/meson 2020-08-03 09:21:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,6 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/shell-completions/bash/meson.orig 2024-09-20 13:16:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/shell-completions/bash/meson 2024-09-28 13:50:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,6 +183,7 @@
</span> cross-file)
_filedir
COMPREPLY+=($(_filedir_in "$XDG_DATA_DIRS"/meson/cross))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMPREPLY+=($(_filedir_in @@PREFIX@@/share/@@SUBPORT@@meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPREPLY+=($(_filedir_in @@PREFIX@@/share/@@SUBPORT@@/meson/cross))
</span> COMPREPLY+=($(_filedir_in /usr/local/share/meson/cross))
COMPREPLY+=($(_filedir_in /usr/share/meson/cross))
COMPREPLY+=($(_filedir_in "$XDG_DATA_HOME"/meson/cross))
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./mesonbuild/coredata.py.orig 2020-08-03 09:46:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./mesonbuild/coredata.py 2020-08-03 09:46:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -431,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/coredata.py.orig 2024-09-20 13:16:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/coredata.py 2024-09-28 13:50:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,7 +328,7 @@
</span> if sys.platform != 'win32':
paths = [
os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-tiger-no-rpath-fix.diff b/python/py-meson/files/patch-meson161-tiger-no-rpath-fix.diff
</span>similarity index 60%
rename from python/py-meson/files/patch-meson64-tiger-no-rpath-fix.diff
rename to python/py-meson/files/patch-meson161-tiger-no-rpath-fix.diff
<span style='display:block; white-space:pre;color:#808080;'>index d810c1b20d6..efd68164e36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-tiger-no-rpath-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/patch-meson161-tiger-no-rpath-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git mesonbuild/build.py mesonbuild/build.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a06979c..8b8d6ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cf71dc2..1118830 100644
</span> --- mesonbuild/build.py
+++ mesonbuild/build.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@ known_jar_kwargs = known_exe_kwargs | {'main_class'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,7 +131,7 @@ def _process_install_tag(install_tag: T.Optional[T.List[T.Optional[str]]],
</span>
@lru_cache(maxsize=None)
def get_target_macos_dylib_install_name(ld) -> str:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,20 @@ index a06979c..8b8d6ca 100644
</span> if ld.soversion is not None:
name.append('.' + ld.soversion)
name.append('.dylib')
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mesonbuild/linkers/linkers.py mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c4df0fa..88a04c1 100644
</span> --- mesonbuild/linkers/linkers.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/llnkers/linkers.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -678,7 +678,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -705,7 +705,7 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = padding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = paths + ':' + padding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.extend(self._apply_prefix('-rpath,' + paths))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN args.extend(self._apply_prefix('-rpath,' + paths))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: should this actually be "for solaris/sunos"?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: Remove the zigcc check once zig support "-rpath-link"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,7 +808,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span>
def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str,
suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,22 +33,31 @@ index a06979c..8b8d6ca 100644
</span> if soversion is not None:
install_name.append('.' + soversion)
install_name.append('.dylib')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -701,8 +701,8 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -834,7 +834,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all_paths.update(build_rpath.split(':'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for rp in all_paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpath_dirs_to_remove.add(rp.encode('utf8'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.extend(self._apply_prefix('-rpath,' + rp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN args.extend(self._apply_prefix('-rpath,' + rp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (args, rpath_dirs_to_remove)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1204,8 +1204,8 @@ class NAGDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
</span> all_paths = mesonlib.OrderedSet([os.path.join(origin_placeholder, p) for p in processed_rpaths])
if build_rpath != '':
all_paths.add(build_rpath)
- for rp in all_paths:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- args.extend(self._apply_prefix('-rpath,' + rp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.extend(self._apply_prefix('-Wl,-Wl,,-rpath,,' + rp))
</span> + #KEN for rp in all_paths:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #KEN args.extend(self._apply_prefix('-rpath,' + rp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN args.extend(self._apply_prefix('-Wl,-Wl,,-rpath,,' + rp))
</span>
return (args, set())
diff --git mesonbuild/modules/gnome.py mesonbuild/modules/gnome.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1faa128..4ef1b07 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a1513c6..92b8147 100644
</span> --- mesonbuild/modules/gnome.py
+++ mesonbuild/modules/gnome.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -277,8 +277,8 @@ class GnomeModule(ExtensionModule):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -625,8 +625,8 @@ class GnomeModule(ExtensionModule):
</span> if isinstance(lib, build.SharedLibrary):
libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib))
link_command.append('-L' + libdir)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +68,7 @@ index 1faa128..4ef1b07 100644
</span> new_depends.append(lib)
# Needed for the following binutils bug:
# https://github.com/mesonbuild/meson/issues/1911
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,8 +287,8 @@ class GnomeModule(ExtensionModule):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -635,8 +635,8 @@ class GnomeModule(ExtensionModule):
</span> for d in state.backend.determine_rpath_dirs(lib):
d = os.path.join(state.environment.get_build_dir(), d)
link_command.append('-L' + d)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +79,7 @@ index 1faa128..4ef1b07 100644
</span> if use_gir_args and self._gir_has_option('--extra-library'):
link_command.append('--extra-library=' + lib.name)
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -345,8 +345,8 @@ class GnomeModule(ExtensionModule):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,8 +701,8 @@ class GnomeModule(ExtensionModule):
</span> getattr(dep, 'is_libtool', False)):
lib_dir = os.path.dirname(flag)
external_ldflags.update([f'-L{lib_dir}'])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,19 +91,19 @@ index 1faa128..4ef1b07 100644
</span> if libname.startswith("lib"):
libname = libname[3:]
diff --git mesonbuild/scripts/depfixer.py mesonbuild/scripts/depfixer.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f927693..c1e4541 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db9c97d..77e8feb 100644
</span> --- mesonbuild/scripts/depfixer.py
+++ mesonbuild/scripts/depfixer.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -424,9 +424,9 @@ def fix_darwin(fname, new_rpath, final_path, install_name_mappings):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stdout=subprocess.DEVNULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -420,9 +420,9 @@ def fix_darwin(fname: str, rpath_dirs_to_remove: T.Set[bytes], new_rpath: str, f
</span> args = []
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if new_rpath:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args += ['-add_rpath', new_rpath]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Rewrite -install_name @rpath/libfoo.dylib to /path/to/libfoo.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #KEN if new_rpath:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #KEN args += ['-add_rpath', new_rpath]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Rewrite -install_name @loader_path/libfoo.dylib to /path/to/libfoo.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if fname.endswith('dylib'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args += ['-id', final_path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if install_name_mappings:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compute diff, translate it into -delete_rpath and -add_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # calls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for path in new_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if path not in old_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args += ['-add_rpath', path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN for path in new_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN if path not in old_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #KEN args += ['-add_rpath', path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for path in old_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if path not in new_rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args += ['-delete_rpath', path]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson64-gnome.diff b/python/py-meson/files/patch-meson64-gnome.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8000b7ca66b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/files/patch-meson64-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/modules/gnome.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/modules/gnome.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -816,6 +816,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for incdir in typelib_includes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typelib_cmd += ["--includedir=" + incdir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for target in girtargets:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isinstance(target, build.SharedLibrary):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typelib_cmd += ["--shared-library=" +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.path.join(state.environment.get_prefix(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ state.environment.get_shared_lib_dir(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target.filename)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typelib_target = self._make_typelib_target(state, typelib_output, typelib_cmd, generated_files, T.cast('T.Dict[str, T.Any]', kwargs))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self._devenv_prepend('GI_TYPELIB_PATH', os.path.join(state.environment.get_build_dir(), state.subdir))
</span></pre><pre style='margin:0'>
</pre>