<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84e44c01750be5e17f9d972efa1654c79edebe5c">https://github.com/macports/macports-ports/commit/84e44c01750be5e17f9d972efa1654c79edebe5c</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 84e44c01750 xorg-server-1.18: Fix builds on Darwin 19 and newer
</span>84e44c01750 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84e44c01750be5e17f9d972efa1654c79edebe5c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Dec 9 09:49:00 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-1.18: Fix builds on Darwin 19 and newer
</span>---
x11/xorg-server-1.18/Portfile | 7 +++++++
.../files/remove-appflags-active-hack.diff | 14 ++++++++++++++
2 files changed, 21 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-1.18/Portfile b/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0400f2adfc1..0f4868d9394 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +87,13 @@ patchfiles \
</span> # doesn't complain about subdirectory *.in replacement files usage.
patchfiles-append 2001-enable-automake-subdir-objects.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove this line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _appFlags._active = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as _appFlags is no longer available in Darwin19 and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append remove-appflags-active-hack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patch.pre_args -p1
platform darwin 8 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-1.18/files/remove-appflags-active-hack.diff b/x11/xorg-server-1.18/files/remove-appflags-active-hack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88517db080d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-1.18/files/remove-appflags-active-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/X11Application.m 2020-12-09 09:26:40.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/hw/xquartz/X11Application.m 2020-12-09 09:27:38.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,11 +426,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL order_all_windows = YES, workspaces, ok;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for_appkit = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* FIXME: This is a hack to avoid passing the event to AppKit which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * would result in it raising one of its windows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _appFlags._active = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self set_front_process:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Get the Spaces preference for SwitchOnActivate */
</span></pre><pre style='margin:0'>
</pre>