<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/1c0954957b9794a0bfcdb2caaab88cd2fc9f1775">https://github.com/macports/macports-ports/commit/1c0954957b9794a0bfcdb2caaab88cd2fc9f1775</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 1c09549 xorg-server*: Blacklist Xcode 8.3's compiler and workaround a focus loss bug
</span>1c09549 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1c0954957b9794a0bfcdb2caaab88cd2fc9f1775
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Tue Jul 18 22:20:03 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> xorg-server*: Blacklist Xcode 8.3's compiler and workaround a focus loss bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53910
</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 | 7 ++-
...k-around-an-issue-that-can-occur-on-macOS.patch | 59 ++++++++++++++++++++++
x11/xorg-server/Portfile | 7 ++-
...k-around-an-issue-that-can-occur-on-macOS.patch | 59 ++++++++++++++++++++++
4 files changed, 128 insertions(+), 4 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 f5c366d..aa53ac2 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;'>@@ -1,10 +1,11 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-server-devel
conflicts xorg-server
set my_name xorg-server
version 1.18.99.901
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11 devel
license X11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +62,8 @@ depends_lib \
</span>
# https://trac.macports.org/ticket/36055
# https://llvm.org/bugs/show_bug.cgi?id=30346
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist gcc-4.0 macports-clang-3.8 macports-clang-3.9 macports-clang-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/53910
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist gcc-4.0 macports-clang-3.8 macports-clang-3.9 macports-clang-devel {clang >= 802 < 900}
</span>
configure.args --with-apple-applications-dir=${applications_dir} \
--with-bundle-id-prefix=org.macports \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +86,7 @@ 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:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..16d0ea6
</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-devel/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7c2f104ace0bfdc033145db478f17111fedaa432 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 18 Jul 2017 21:35:49 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] XQuartz: Hack around an issue that can occur on macOS due to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ background apps incorrectly stealing focus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Works around <rdar://problem/7150340>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tested-by: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hw/xquartz/X11Application.m | 29 ++++++++++++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 24 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 768eecf68..821e1c5a1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,13 +275,32 @@ message_kit_thread(SEL selector, NSObject *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_x_active) [self activateX:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ([self modalWindow] == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Must be an X window. Tell appkit it doesn't have focus. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Must be an X window. Tell appkit windows to resign main/key */
</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;'>+- if ([self isActive]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self deactivate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!_x_active && quartzProcs->IsX11Window([e windowNumber])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([self respondsToSelector:@selector(_setKeyWindow:)] && [self respondsToSelector:@selector(_setMainWindow:)]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSWindow *keyWindow = [self keyWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (keyWindow) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self _setKeyWindow:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [keyWindow resignKeyWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSWindow *mainWindow = [self mainWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mainWindow) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self _setMainWindow:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [mainWindow resignMainWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* This has a side effect of causing background apps to steal focus from XQuartz.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Unfortunately, there is no public and stable API to do what we want, but this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * is a decent fallback in the off chance that the above selectors get dropped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in the future.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self deactivate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b588a68..4550eda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
version 1.18.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories x11 devel
license X11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +68,8 @@ depends_lib \
</span>
# https://trac.macports.org/ticket/36055
# https://llvm.org/bugs/show_bug.cgi?id=30346
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist gcc-4.0 macports-clang-3.8 macports-clang-3.9 macports-clang-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/53910
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist gcc-4.0 macports-clang-3.8 macports-clang-3.9 macports-clang-devel {clang >= 802 < 900}
</span>
configure.args --with-apple-applications-dir=${applications_dir} \
--with-bundle-id-prefix=org.macports \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +92,7 @@ patchfiles \
</span> 0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch \
0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch \
0003-os-connection-Improve-abstraction-for-launchd-secure.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch b/x11/xorg-server/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..16d0ea6
</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/files/1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7c2f104ace0bfdc033145db478f17111fedaa432 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 18 Jul 2017 21:35:49 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] XQuartz: Hack around an issue that can occur on macOS due to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ background apps incorrectly stealing focus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Works around <rdar://problem/7150340>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tested-by: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hw/xquartz/X11Application.m | 29 ++++++++++++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 24 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 768eecf68..821e1c5a1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,13 +275,32 @@ message_kit_thread(SEL selector, NSObject *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_x_active) [self activateX:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ([self modalWindow] == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Must be an X window. Tell appkit it doesn't have focus. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Must be an X window. Tell appkit windows to resign main/key */
</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;'>+- if ([self isActive]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self deactivate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!_x_active && quartzProcs->IsX11Window([e windowNumber]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!_x_active && quartzProcs->IsX11Window([e windowNumber])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ([self respondsToSelector:@selector(_setKeyWindow:)] && [self respondsToSelector:@selector(_setMainWindow:)]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSWindow *keyWindow = [self keyWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (keyWindow) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self _setKeyWindow:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [keyWindow resignKeyWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSWindow *mainWindow = [self mainWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mainWindow) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self _setMainWindow:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [mainWindow resignMainWindow];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* This has a side effect of causing background apps to steal focus from XQuartz.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Unfortunately, there is no public and stable API to do what we want, but this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * is a decent fallback in the off chance that the above selectors get dropped
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in the future.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self deactivate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [self activateX:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>