<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/312183d09ea2185bad3016766fd6d8b30a023551">https://github.com/macports/macports-ports/commit/312183d09ea2185bad3016766fd6d8b30a023551</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 312183d09ea glib2-devel: add meson-related patch from glib2
</span>312183d09ea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 312183d09ea2185bad3016766fd6d8b30a023551
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Oct 25 10:18:08 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: add meson-related patch from glib2
</span>---
devel/glib2-devel/Portfile | 19 +++++++++++++++-
.../files/patch-meson_build-c-version.diff | 25 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d11f24ff96..1dceec2b5c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span> PortGroup meson 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +12,7 @@ name glib2-devel
</span> conflicts glib2
set my_name glib
version 2.62.6
<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 24b9b58216a9d413b0bdb62f85c5b7d816cd133e \
sha256 104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c \
size 4703424
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +38,7 @@ master_sites gnome:sources/${my_name}/${branch}/
</span>
patchfiles libintl.patch \
implicit.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson_build-c-version.diff \
</span> patch-gio-tests-meson.build.diff \
patch-glib-gmain.c.diff \
patch-glib_gunicollate.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +120,21 @@ post-patch {
</span>
build.args-append --verbose
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dirs ${workpath}/build-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -lm is spuriously added by meson NYD to some builds (arm64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q {s| -lm||g} ${dir}/meson-private/glib-2.0.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.args-append --verbose
test.run yes
test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-meson_build-c-version.diff b/devel/glib2-devel/files/patch-meson_build-c-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9699273db51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-meson_build-c-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5b8ee178b30df3e6b1ec9a8d3a43d060976a8f0f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Emmanuel Fleury <emmanuel.fleury@u-bordeaux.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 22 Jan 2019 19:58:17 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Bump default build standard to gnu99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 04ca8c2b0..b25df998e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@ project('glib', 'c', 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_options : [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'buildtype=debugoptimized',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'warning_level=1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'c_std=gnu89'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'c_std=gnu99'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>