<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45c59fe0a66e382927fbf6fe629d37898eb42b6b">https://github.com/macports/macports-ports/commit/45c59fe0a66e382927fbf6fe629d37898eb42b6b</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 45c59fe glib2: Default to +quartz when -x11 is given
</span>45c59fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 45c59fe0a66e382927fbf6fe629d37898eb42b6b
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Mar 13 00:52:59 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> glib2: Default to +quartz when -x11 is given
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When building pango -x11 in a clean prefix, glib2 will fail to install,
</span><span style='display:block; white-space:pre;color:#404040;'> because the -x11 variant is being passed down to glib2, but glib2
</span><span style='display:block; white-space:pre;color:#404040;'> requires either +quartz or +x11, and +quartz was not enabled by default
</span><span style='display:block; white-space:pre;color:#404040;'> when x11 was disabled.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This caused problems when implementing variant support for the buildbot
</span><span style='display:block; white-space:pre;color:#404040;'> in https://github.com/macports/mpbb/pull/5 and initially caused me to
</span><span style='display:block; white-space:pre;color:#404040;'> think that I would have to revert
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/mpbb/commit/f6e46815a5033358212ce383956fd567eb51e53c
</span><span style='display:block; white-space:pre;color:#404040;'> which was added due to https://github.com/macports/mpbb/pull/4 and
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.macports.org/pipermail/macports-dev/2017-June/035978.html.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This solution should instead work without the revert and still allow the
</span><span style='display:block; white-space:pre;color:#404040;'> buildbot to build both wine and +quartz-x11 ports.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/52742
</span>---
devel/glib2/Portfile | 3 +++
1 file changed, 3 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0635b6b..3ec3cd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,6 +148,9 @@ variant x11 conflicts quartz {
</span> if {![variant_isset quartz]} {
default_variants +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type gnome
livecheck.name ${my_name}
</pre><pre style='margin:0'>
</pre>