<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/d03c1980793ee83b598aac1e7b507319e89d8733">https://github.com/macports/macports-ports/commit/d03c1980793ee83b598aac1e7b507319e89d8733</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d03c1980793ee83b598aac1e7b507319e89d8733
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 1 09:10:20 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    xorg-server-1.18: clean up current patches to apply cleanly
</span>---
 .../0003-os-connection-Improve-abstraction-for-launchd-secure.patch     | 2 +-
 .../1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-1.18/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch b/x11/xorg-server-1.18/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ff551a..3fe5794 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-1.18/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-1.18/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ index a901ebf..ac7d12b 100644
</span>  #ifndef WIN32
  #include <sys/socket.h>
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1112,15 +1114,34 @@ MakeClientGrabPervious(ClientPtr client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1267,15 +1269,34 @@
</span>  void
  ListenOnOpenFD(int fd, int noxauth)
  {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-1.18/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch b/x11/xorg-server-1.18/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 16d0ea6..d408fcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-1.18/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-1.18/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span> index 768eecf68..821e1c5a1 100644
 --- a/hw/xquartz/X11Application.m
 +++ b/hw/xquartz/X11Application.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -275,13 +275,32 @@ message_kit_thread(SEL selector, NSObject *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,13 +276,32 @@
</span>              if (_x_active) [self activateX:NO];
          }
          else if ([self modalWindow] == nil) {
</pre><pre style='margin:0'>

</pre>