<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/559a1183470af2586010d8d755961b00dff3b9d8">https://github.com/macports/macports-ports/commit/559a1183470af2586010d8d755961b00dff3b9d8</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 559a1183470 meson: update to 0.64.1 on Tiger
</span>559a1183470 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 559a1183470af2586010d8d755961b00dff3b9d8
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Fri May 12 09:30:56 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> meson: update to 0.64.1 on Tiger
</span>---
devel/meson/Portfile | 26 +++++++++++-----------
.../files/patch-meson58-gcc-appleframeworks.diff | 18 ---------------
...t-apple.diff => patch-meson64-32bit-apple.diff} | 0
...-meson64-clang-unknown-optimization-error.diff} | 0
.../files/patch-meson64-gcc-appleframeworks.diff | 12 ++++++++++
...meson58-gnome.diff => patch-meson64-gnome.diff} | 4 ++--
... patch-meson64-remove-Wl,-no_weak_imports.diff} | 0
...tch-meson64-search-prefix-for-cross-files.diff} | 0
....diff => patch-meson64-tiger-no-rpath-fix.diff} | 20 ++++++++---------
9 files changed, 36 insertions(+), 44 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 3b856a4ba15..9b1d5f5be25 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;'>@@ -73,20 +73,20 @@ platform darwin 8 {
</span> # this meson is modified for systems without @rpath support
# and is therefore fragile. Keep pegged, and update occasionally
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup mesonbuild meson 0.58.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup mesonbuild meson 0.64.1
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 252d6261d3b8ecad345b1f966f8cfc60b52da6e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1899464
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-meson58-tiger-no-rpath-fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-remove-Wl,-no_weak_imports.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-gnome.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson58-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6ed7a0c8b1ac2a0de91d25aa253ad2efa132c6dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2089752
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-meson64-tiger-no-rpath-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-remove-Wl,-no_weak_imports.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-gnome.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson64-search-prefix-for-cross-files.diff
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-gcc-appleframeworks.diff b/devel/meson/files/patch-meson58-gcc-appleframeworks.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8809064474c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson58-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/mesonbuild/meson/pull/9211
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix the following error when configuring pango (or any project with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-appleframeworks listed as a dependency) using GCC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ERROR: Dependency "appleframeworks" not found, tried framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/compilers/mixins/clike.py.orig 2021-09-02 16:07:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/compilers/mixins/clike.py 2021-09-02 16:07:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1199,9 +1199,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Finds the framework with the specified name, and returns link args for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the same or returns None when the framework is not found.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # TODO: maybe this belongs in clang? also, should probably check for macOS?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if self.id != 'clang':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- raise mesonlib.MesonException('Cannot find frameworks with non-clang compiler')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return self._find_framework_impl(name, env, extra_dirs, allow_system)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def get_crt_compile_args(self, crt_val: str, buildtype: str) -> T.List[str]:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-32bit-apple.diff b/devel/meson/files/patch-meson64-32bit-apple.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson58-32bit-apple.diff
rename to devel/meson/files/patch-meson64-32bit-apple.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-clang-unknown-optimization-error.diff b/devel/meson/files/patch-meson64-clang-unknown-optimization-error.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson58-clang-unknown-optimization-error.diff
rename to devel/meson/files/patch-meson64-clang-unknown-optimization-error.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson64-gcc-appleframeworks.diff b/devel/meson/files/patch-meson64-gcc-appleframeworks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e90cc85ddb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson64-gcc-appleframeworks.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/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unless you select a particular macOS SDK with the -isysroot flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can also add to this by setting -F in CFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TODO: this really needs to be *AppleClang*, not just any clang.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if self.id != 'clang':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raise mesonlib.MesonException('Cannot find framework path with non-clang compiler')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Construct the compiler command-line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commands = self.get_exelist() + ['-v', '-E', '-']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commands += self.get_always_args()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-gnome.diff b/devel/meson/files/patch-meson64-gnome.diff
</span>similarity index 76%
rename from devel/meson/files/patch-meson58-gnome.diff
rename to devel/meson/files/patch-meson64-gnome.diff
<span style='display:block; white-space:pre;color:#808080;'>index 9ceabec04cf..8000b7ca66b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson58-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson64-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,6 @@
</span> + state.environment.get_shared_lib_dir(),
+ target.filename)]
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- typelib_target = self._make_typelib_target(state, typelib_output, typelib_cmd, kwargs)
</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:#ffe0e0;'>- rv = [scan_target, typelib_target]
</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/devel/meson/files/patch-meson58-remove-Wl,-no_weak_imports.diff b/devel/meson/files/patch-meson64-remove-Wl,-no_weak_imports.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson58-remove-Wl,-no_weak_imports.diff
rename to devel/meson/files/patch-meson64-remove-Wl,-no_weak_imports.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-search-prefix-for-cross-files.diff b/devel/meson/files/patch-meson64-search-prefix-for-cross-files.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson58-search-prefix-for-cross-files.diff
rename to devel/meson/files/patch-meson64-search-prefix-for-cross-files.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson58-tiger-no-rpath-fix.diff b/devel/meson/files/patch-meson64-tiger-no-rpath-fix.diff
</span>similarity index 89%
rename from devel/meson/files/patch-meson58-tiger-no-rpath-fix.diff
rename to devel/meson/files/patch-meson64-tiger-no-rpath-fix.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8b1331c6535..d810c1b20d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson58-tiger-no-rpath-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson64-tiger-no-rpath-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,14 +11,12 @@ 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:#ffe0e0;'>-diff --git mesonbuild/linkers.py mesonbuild/linkers.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fe1441e..841fafa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mesonbuild/linkers.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mesonbuild/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/linkers/linkers.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/llnkers/linkers.py
</span> @@ -678,7 +678,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- is_shared_module: bool) -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if is_shared_module:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]:
</span> - install_name = ['@rpath/', prefix, shlib_name]
+ install_name = ['@loader_path/', prefix, shlib_name]
if soversion is not None:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +45,7 @@ index 1faa128..4ef1b07 100644
</span> - link_command.append('-Wl,-rpath,' + libdir)
+ #KEN if include_rpath:
+ #KEN link_command.append('-Wl,-rpath,' + libdir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends.append(lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new_depends.append(lib)
</span> # Needed for the following binutils bug:
# https://github.com/mesonbuild/meson/issues/1911
@@ -287,8 +287,8 @@ class GnomeModule(ExtensionModule):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,13 +61,13 @@ index 1faa128..4ef1b07 100644
</span> else:
@@ -345,8 +345,8 @@ class GnomeModule(ExtensionModule):
getattr(dep, 'is_libtool', False)):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib_dir = os.path.dirname(lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- external_ldflags.update(["-L%s" % lib_dir])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_dir = os.path.dirname(flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ external_ldflags.update([f'-L{lib_dir}'])
</span> - if include_rpath:
- external_ldflags.update([f'-Wl,-rpath {lib_dir}'])
+ #KEN if include_rpath:
+ #KEN external_ldflags.update([f'-Wl,-rpath {lib_dir}'])
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libname = os.path.basename(lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libname = os.path.basename(flag)
</span> if libname.startswith("lib"):
libname = libname[3:]
diff --git mesonbuild/scripts/depfixer.py mesonbuild/scripts/depfixer.py
</pre><pre style='margin:0'>
</pre>