<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/11ee07e284dba3b48f3fd4650e9111ec9fa0c003">https://github.com/macports/macports-ports/commit/11ee07e284dba3b48f3fd4650e9111ec9fa0c003</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 11ee07e284d meson: Fix error building pango-devel with GCC
</span>11ee07e284d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 11ee07e284dba3b48f3fd4650e9111ec9fa0c003
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Thu Sep 2 16:25:49 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> meson: Fix error building pango-devel with GCC
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/mesonbuild/meson/pull/9211
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/11948
</span>---
devel/meson/Portfile | 9 +++++++--
devel/meson/files/patch-meson-gcc-appleframeworks.diff | 18 ++++++++++++++++++
.../meson/files/patch-meson55-gcc-appleframeworks.diff | 11 +++++++++++
3 files changed, 36 insertions(+), 2 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 fce7f83f6b1..9ceb20d1ab3 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;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
github.setup mesonbuild meson 0.58.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
github.tarball_from releases
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,9 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> # https://github.com/mesonbuild/meson/issues/6187
patchfiles-append patch-meson-32bit-apple.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/mesonbuild/meson/pull/9211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # disable warning not accepted by older clang versions
# this manifests currently on systems up to 10.9
# https://github.com/mesonbuild/meson/issues/8307
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +75,7 @@ platform darwin 8 {
</span> # and is therefore fragile. Keep pegged, and update occasionally
github.setup mesonbuild meson 0.55.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 b1e7f12184a7a61ae8bfa7ed210af8020d531009 \
sha256 6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 \
size 1740465
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +84,8 @@ platform darwin 8 {
</span> patchfiles-append patch-meson-powermacintosh.diff
patchfiles-delete patch-meson-clang-unknown-optimization-error.diff
patchfiles-append patch-meson55-tiger-no-rpath-fix.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace patch-meson-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson55-gcc-appleframeworks.diff
</span> }
# add a search path for crossfiles in our prefix
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8809064474c
</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-meson-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/mesonbuild/meson/pull/9211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix the following error when configuring pango (or any project with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+appleframeworks listed as a dependency) using GCC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ERROR: Dependency "appleframeworks" not found, tried framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clike.py.orig 2021-09-02 16:07:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clike.py 2021-09-02 16:07:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1199,9 +1199,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Finds the framework with the specified name, and returns link args for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the same or returns None when the framework is not found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TODO: maybe this belongs in clang? also, should probably check for macOS?
</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 frameworks with non-clang compiler')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self._find_framework_impl(name, env, extra_dirs, allow_system)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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-meson55-gcc-appleframeworks.diff b/devel/meson/files/patch-meson55-gcc-appleframeworks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a292a12e2cf
</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-meson55-gcc-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clike.py.orig 2021-09-02 15:59:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clike.py 2021-09-02 15:59:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1142,8 +1142,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Finds the framework with the specified name, and returns link args for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the same or returns None when the framework is not found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''
</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 frameworks with non-clang compiler')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self.find_framework_impl(name, env, extra_dirs, allow_system)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_crt_compile_args(self, crt_val: str, buildtype: str) -> T.List[str]:
</span></pre><pre style='margin:0'>
</pre>