<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1e9766ce33c7786bcebb2af6272065e48194c398">https://github.com/macports/macports-ports/commit/1e9766ce33c7786bcebb2af6272065e48194c398</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1e9766ce33c7786bcebb2af6272065e48194c398
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Oct 20 13:20:24 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome-terminal: build fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Build fails if ossp-uuid (not a direct dependency of this port)
</span><span style='display:block; white-space:pre;color:#404040;'> is active. This fix forces the build to use system uuid even
</span><span style='display:block; white-space:pre;color:#404040;'> if ossp-uuid is installed. Includes support for Xcode 10, Mojave.
</span>---
gnome/gnome-terminal/Portfile | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-terminal/Portfile b/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 290d2cf..6b2a13f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,10 +49,18 @@ patchfiles patch-src-Makefile.am.diff \
</span> patch-src-server.c.diff \
patch-strchrnul.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span> xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build fails with ossp-uuid active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force use of system uuid even if ossp-uuid is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#include <uuid.h>|#include <uuid/uuid.h>|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/terminal-prefs.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/terminal-profiles-list.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/terminal-screen.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/terminal-settings-list.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/terminal-window.c
</span> }
# The driver driver trips over gterminal.c for some reason
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +78,7 @@ configure.args --with-gtk=3.0 \
</span> --disable-schemas-compile
configure.cflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -iwithsysroot /usr/include/uuid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -iwithsysroot ${configure.sdkroot}/usr/include
</span>
variant nautilus description {Build optional nautilus extension} {
configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
</pre><pre style='margin:0'>
</pre>