<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f8870f902c0aa40d383deee09a4d8510c0caff8">https://github.com/macports/macports-ports/commit/6f8870f902c0aa40d383deee09a4d8510c0caff8</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 6f8870f9 xorg-server-devel: Bump to current git master
</span>6f8870f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f8870f902c0aa40d383deee09a4d8510c0caff8
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Jul 20 20:25:40 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-devel: Bump to current git master
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
x11/xorg-server-devel/Portfile | 6 +--
...k-around-an-issue-that-can-occur-on-macOS.patch | 59 ----------------------
2 files changed, 2 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa53ac2..67702d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name xorg-server-devel
conflicts xorg-server
set my_name xorg-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.18.99.901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.19.99.1
</span> categories x11 devel
license X11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +15,7 @@ long_description The X.org X server allows you to run X11 applications on your c
</span>
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
<span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch ade315386cee9a65a3885c65e96256880ac6f00a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch d16133e3e293fe16b291114d344fbd5a61d5ed65
</span> #git.branch xorg-server-${version}
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +85,6 @@ patchfiles \
</span> 0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch \
</span> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch b/x11/xorg-server-devel/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 16d0ea6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7c2f104ace0bfdc033145db478f17111fedaa432 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 18 Jul 2017 21:35:49 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] XQuartz: Hack around an issue that can occur on macOS due to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- background apps incorrectly stealing focus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Works around <rdar://problem/7150340>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hw/xquartz/X11Application.m | 29 ++++++++++++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 24 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 768eecf68..821e1c5a1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hw/xquartz/X11Application.m
</span><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:#ffe0e0;'>- if (_x_active) [self activateX:NO];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ([self modalWindow] == nil) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Must be an X window. Tell appkit it doesn't have focus. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Must be an X window. Tell appkit windows to resign main/key */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for_appkit = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([self isActive]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self deactivate];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!_x_active && quartzProcs->IsX11Window([e windowNumber])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([self respondsToSelector:@selector(_setKeyWindow:)] && [self respondsToSelector:@selector(_setMainWindow:)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSWindow *keyWindow = [self keyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (keyWindow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self _setKeyWindow:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [keyWindow resignKeyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSWindow *mainWindow = [self mainWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mainWindow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self _setMainWindow:nil];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [mainWindow resignMainWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* This has a side effect of causing background apps to steal focus from XQuartz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Unfortunately, there is no public and stable API to do what we want, but this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * is a decent fallback in the off chance that the above selectors get dropped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * in the future.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self deactivate];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>