<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/9eaac52d45e052d7ed33e6c493fd47893107695b">https://github.com/macports/macports-ports/commit/9eaac52d45e052d7ed33e6c493fd47893107695b</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 9eaac52d45e meson: update to 0.62.1, add cross-files for ppc & ppc64
</span>9eaac52d45e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9eaac52d45e052d7ed33e6c493fd47893107695b
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri May 13 07:53:47 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> meson: update to 0.62.1, add cross-files for ppc & ppc64
</span>---
devel/meson/Portfile | 18 +++++----------
devel/meson/files/cross/ppc-darwin | 9 ++++++++
devel/meson/files/cross/ppc64-darwin | 9 ++++++++
.../files/patch-meson-gcc-appleframeworks.diff | 26 +++++++++-------------
devel/meson/files/patch-meson-gnome.diff | 10 ++++-----
5 files changed, 39 insertions(+), 33 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 5d32066a0b1..d1b68de5322 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mesonbuild meson 0.59.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mesonbuild meson 0.62.1
</span> revision 0
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,13 @@ long_description Meson is a build system designed to optimize programmer prod
</span> Valgrind, CCache and the like. It is both extremely fast, and, even more importantly, \
as user friendly as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 36994a8e29e15751a9a1977aad581057a52f3943 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a35cfd4cb779a6a415ad3ccbf2d4143334e96139125585ce49915bec494da02 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1953620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 96db39f90328a64d508cc7c0075aa89fecde939b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2034805
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# as of verison 0.45.0,requires python 3.5 or better
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# As of verison 0.62.0, requires python 3.7 or later
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37 38 39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</span> python.link_binaries no
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +79,6 @@ platform darwin 8 {
</span> size 1899464
patchfiles-delete patch-meson-clang-unknown-optimization-error.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-objc-accept-gnu89.diff \
</span> patch-meson-32bit-apple.diff \
patch-meson-gnome.diff
patchfiles-append patch-meson57-tiger-no-rpath-fix.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,10 +123,6 @@ post-destroot {
</span> xinstall -d ${destroot}${vim_dir}/${d}
xinstall -m 644 ${worksrcpath}/data/syntax-highlighting/vim/${d}/meson.vim ${destroot}${vim_dir}/${d}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_lispdir ${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${emacs_lispdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/data/syntax-highlighting/emacs/meson.el ${destroot}${emacs_lispdir}
</span> }
# the following block avoids requiring users to 'sudo port select python3 python37'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/cross/ppc-darwin b/devel/meson/files/cross/ppc-darwin
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0daab987131
</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/cross/ppc-darwin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[host_machine]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+system = 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu_family = 'ppc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu = 'ppc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endian = 'big'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[binaries]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pkgconfig = '@@PREFIX@@/bin/pkg-config'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake = '@@PREFIX@@/bin/cmake'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/cross/ppc64-darwin b/devel/meson/files/cross/ppc64-darwin
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..669d96e9699
</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/cross/ppc64-darwin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[host_machine]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+system = 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu_family = 'ppc64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpu = 'ppc64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endian = 'big'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[binaries]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pkgconfig = '@@PREFIX@@/bin/pkg-config'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake = '@@PREFIX@@/bin/cmake'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson-gcc-appleframeworks.diff b/devel/meson/files/patch-meson-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8809064474c..e90cc85ddb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,12 @@
</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:#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:#ffe0e0;'>-- # TODO: maybe this belongs in clang? also, should probably check for macOS?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TODO: this really needs to be *AppleClang*, not just any clang.
</span> - if self.id != 'clang':
<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;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-meson-gnome.diff b/devel/meson/files/patch-meson-gnome.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c6d16041b64..f5fcfea0877 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/files/patch-meson-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,9 @@ the above command, which should print something like
</span>
[1] https://trac.macports.org/ticket/62391
<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:#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> for incdir in typelib_includes:
typelib_cmd += ["--includedir=" + incdir]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,6 @@ the above command, which should print something like
</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, generated_files, 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;'>- self._devenv_append('GI_TYPELIB_PATH', os.path.join(state.environment.get_build_dir(), state.subdir))
</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></pre><pre style='margin:0'>
</pre>