<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/439761774952ff3cc28fb3ce336bc94f1de71bea">https://github.com/macports/macports-ports/commit/439761774952ff3cc28fb3ce336bc94f1de71bea</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 43976177495 meson: restore old gcc appleframeworks patch for tiger
</span>43976177495 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 439761774952ff3cc28fb3ce336bc94f1de71bea
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri Dec 2 09:48:54 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> meson: restore old gcc appleframeworks patch for tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this patchfile was updated for a new meson version, but the same
</span><span style='display:block; white-space:pre;color:#404040;'> patchfile was being used on an older pegged meson version, and so
</span><span style='display:block; white-space:pre;color:#404040;'> the functionality was broken in the older version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and try to fully sequester the patchfiles so it is not so easy
</span><span style='display:block; white-space:pre;color:#404040;'> to have this happen again
</span>---
devel/meson/Portfile | 22 ++++++++++++----------
...=> patch-meson-remove-Wl,-no_weak_imports.diff} | 0
...e-tiger.diff => patch-meson58-32bit-apple.diff} | 0
...h-meson58-clang-unknown-optimization-error.diff | 13 +++++++++++++
.../files/patch-meson58-gcc-appleframeworks.diff | 18 ++++++++++++++++++
...meson57-gnome.diff => patch-meson58-gnome.diff} | 0
... patch-meson58-remove-Wl,-no_weak_imports.diff} | 0
...atch-meson58-search-prefix-for-cross-files.diff | 21 +++++++++++++++++++++
....diff => patch-meson58-tiger-no-rpath-fix.diff} | 0
9 files changed, 64 insertions(+), 10 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 766a19ae308..96a68c4ef4b 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;'>@@ -46,7 +46,7 @@ if {${os.platform} eq "darwin" && ${os.major} <= 9} {
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- remove-Wl,-no_weak_imports.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-remove-Wl,-no_weak_imports.diff
</span> }
# https://github.com/mesonbuild/meson/issues/6187
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,9 @@ if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span> patchfiles-append patch-meson-clang-unknown-optimization-error.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# add a search path for crossfiles in our prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
# this meson is modified for systems without @rpath support
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,21 +75,20 @@ platform darwin 8 {
</span>
github.setup mesonbuild meson 0.58.2
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 252d6261d3b8ecad345b1f966f8cfc60b52da6e1 \
sha256 7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 \
size 1899464
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-meson-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-gnome.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-meson57-tiger-no-rpath-fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-32bit-apple-tiger.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson57-gnome.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-meson58-tiger-no-rpath-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-remove-Wl,-no_weak_imports.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-32bit-apple.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-gcc-appleframeworks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-gnome.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-clang-unknown-optimization-error.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson58-search-prefix-for-cross-files.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add a search path for crossfiles in our prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson-search-prefix-for-cross-files.diff
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/data/shell-completions/bash/meson \
${worksrcpath}/mesonbuild/coredata.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/remove-Wl,-no_weak_imports.patch b/devel/meson/files/patch-meson-remove-Wl,-no_weak_imports.diff
</span>similarity index 100%
copy from devel/meson/files/remove-Wl,-no_weak_imports.patch
copy to devel/meson/files/patch-meson-remove-Wl,-no_weak_imports.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson-32bit-apple-tiger.diff b/devel/meson/files/patch-meson58-32bit-apple.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson-32bit-apple-tiger.diff
rename to devel/meson/files/patch-meson58-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-meson58-clang-unknown-optimization-error.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f8a8b109500
</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-meson58-clang-unknown-optimization-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if mode is CompileCheckMode.COMPILE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ myargs.extend(['-Werror=unknown-warning-option', '-Werror=unused-command-line-argument'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if mesonlib.version_compare(self.version, '>=3.6.0'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if mesonlib.version_compare(self.version, '>=9.6.0'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ myargs.append('-Werror=ignored-optimization-argument')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return super().get_compiler_check_args(mode) + myargs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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>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-meson58-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-meson57-gnome.diff b/devel/meson/files/patch-meson58-gnome.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson57-gnome.diff
rename to devel/meson/files/patch-meson58-gnome.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/remove-Wl,-no_weak_imports.patch b/devel/meson/files/patch-meson58-remove-Wl,-no_weak_imports.diff
</span>similarity index 100%
rename from devel/meson/files/remove-Wl,-no_weak_imports.patch
rename to devel/meson/files/patch-meson58-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-meson58-search-prefix-for-cross-files.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e52c17c7c55
</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-meson58-search-prefix-for-cross-files.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/shell-completions/bash/meson.orig 2020-08-03 09:20:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/shell-completions/bash/meson 2020-08-03 09:21:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,6 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cross-file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _filedir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in "$XDG_DATA_DIRS"/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPREPLY+=($(_filedir_in @@PREFIX@@/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in /usr/local/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in /usr/share/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPREPLY+=($(_filedir_in "$XDG_DATA_HOME"/meson/cross))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./mesonbuild/coredata.py.orig 2020-08-03 09:46:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./mesonbuild/coredata.py 2020-08-03 09:46:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform != 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ] + os.environ.get('XDG_DATA_DIRS', '@@PREFIX@@/share:/usr/local/share:/usr/share').split(':')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for path in paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_to_try = os.path.join(path, 'meson', ftype, f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isfile(path_to_try):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson57-tiger-no-rpath-fix.diff b/devel/meson/files/patch-meson58-tiger-no-rpath-fix.diff
</span>similarity index 100%
rename from devel/meson/files/patch-meson57-tiger-no-rpath-fix.diff
rename to devel/meson/files/patch-meson58-tiger-no-rpath-fix.diff
</pre><pre style='margin:0'>
</pre>