[152636] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Tue Sep 13 20:42:51 PDT 2016
Revision: 152636
https://trac.macports.org/changeset/152636
Author: jeremyhu at macports.org
Date: 2016-09-13 20:42:51 -0700 (Tue, 13 Sep 2016)
Log Message:
-----------
xorg-server-devel: Bump to current master and include some in-flight fixes for issues uncovered by ASan
Modified Paths:
--------------
trunk/dports/x11/xorg-server-devel/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-server-devel/files/0001-randr-Initialize-RandR-even-if-there-are-currently-n.patch
trunk/dports/x11/xorg-server-devel/files/0002-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
trunk/dports/x11/xorg-server-devel/files/0003-dix-dispatch-Fix-SmartScheduleClient-interval-adjust.patch
trunk/dports/x11/xorg-server-devel/files/0004-os-connection-Improve-abstraction-for-launchd-secure.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch
trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch
trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2016-09-14 02:49:10 UTC (rev 152635)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2016-09-14 03:42:51 UTC (rev 152636)
@@ -6,7 +6,7 @@
conflicts xorg-server
set my_name xorg-server
version 1.18.99.1
-revision 2
+revision 3
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -17,7 +17,7 @@
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
-git.branch 527c6baa294d17c5eca1d87ac941844872e90dac
+git.branch c4799f186b31e579721f5874c897f3f46db6ad0a
#git.branch xorg-server-${version}
use_parallel_build yes
@@ -83,10 +83,10 @@
RAWCPP=${configure.cpp}
patchfiles \
- 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 \
- 0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch \
+ 0001-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
+ 0002-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
+ 0003-dix-dispatch-Fix-SmartScheduleClient-interval-adjust.patch \
+ 0004-os-connection-Improve-abstraction-for-launchd-secure.patch \
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 \
Deleted: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch 2016-09-14 02:49:10 UTC (rev 152635)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -1,42 +0,0 @@
-From b1ee5cc0015e702c8e13c3895f4b2344ab2aeacb Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sun, 29 May 2016 14:01:38 -0700
-Subject: [PATCH 1/4] XQuartz: Fix the issue where the h key could be come
- "stuck" after hiding XQuartz with cmd-h
-
-The issue was that we set a flag to ignore the k key's up event when sent
-the cmd-h down event, but because the cmd-h keycode hides XQuartz, we
-became !_x_active by the time the event is delivered which caused us to
-go down a differnet codepath rather than getting a chance to ignore it.
-We then incorrectly ignored the next h up key.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=92648
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- hw/xquartz/X11Application.m | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index d2c5d30..9a22909 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -366,6 +366,15 @@ message_kit_thread(SEL selector, NSObject *arg)
- else {
- /* No kit window is focused, so send it to X. */
- for_appkit = NO;
-+
-+ /* Reset our swallow state if we're seeing the same keyCode again.
-+ * This can happen if we become !_x_active when the keyCode we
-+ * intended to swallow is delivered. See:
-+ * https://bugs.freedesktop.org/show_bug.cgi?id=92648
-+ */
-+ if ([e keyCode] == swallow_keycode) {
-+ do_swallow = NO;
-+ }
- }
- }
- else { /* KeyUp */
---
-2.9.3
-
Added: trunk/dports/x11/xorg-server-devel/files/0001-randr-Initialize-RandR-even-if-there-are-currently-n.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-randr-Initialize-RandR-even-if-there-are-currently-n.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-randr-Initialize-RandR-even-if-there-are-currently-n.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -0,0 +1,48 @@
+From 908f3e9d9a9324657e9054e767e5a3f9aaca6051 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 11 Sep 2016 02:19:19 -0700
+Subject: [PATCH 1/4] randr: Initialize RandR even if there are currently no
+ screens attached
+
+Failure to do so causes an overvlow in RRClientCallback().
+
+=================================================================
+==41262==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000103ccfbc8 at pc 0x0001034f32b9 bp 0x7000035a94c0 sp 0x7000035a94b8
+WRITE of size 4 at 0x000103ccfbc8 thread T6
+ #0 0x1034f32b8 in RRClientCallback randr.c:72
+ #1 0x1038c75e3 in _CallCallbacks dixutils.c:737
+ #2 0x10388f406 in CallCallbacks callback.h:83
+ #3 0x1038bc49a in NextAvailableClient dispatch.c:3562
+ #4 0x103ad094c in AllocNewConnection connection.c:777
+ #5 0x103ad1695 in EstablishNewConnections connection.c:863
+ #6 0x1038c6630 in ProcessWorkQueue dixutils.c:523
+ #7 0x103ab2dbf in WaitForSomething WaitFor.c:175
+ #8 0x103880836 in Dispatch dispatch.c:411
+ #9 0x1038c2141 in dix_main main.c:301
+ #10 0x1032ac75a in server_thread quartzStartup.c:66
+ #11 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
+ #12 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
+ #13 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ randr/randr.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/randr/randr.c b/randr/randr.c
+index 0138dc1..efd3859 100644
+--- a/randr/randr.c
++++ b/randr/randr.c
+@@ -387,9 +387,6 @@ RRExtensionInit(void)
+ {
+ ExtensionEntry *extEntry;
+
+- if (RRNScreens == 0)
+- return;
+-
+ if (!dixRegisterPrivateKey(&RRClientPrivateKeyRec, PRIVATE_CLIENT,
+ sizeof(RRClientRec) +
+ screenInfo.numScreens * sizeof(RRTimesRec)))
+--
+2.10.0 (Apple Git-99)
+
Deleted: trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch 2016-09-14 02:49:10 UTC (rev 152635)
+++ trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -1,28 +0,0 @@
-From b863c6cc90f9e0d3db361fbc3210c34ed5298203 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 10 Sep 2016 22:16:11 -0700
-Subject: [PATCH 2/4] XQuartz: Cleanup CPPFLAGS that are no longer necessary on
- darwin
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- hw/xquartz/pbproxy/Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
-index 1b14dff..9429ea2 100644
---- a/hw/xquartz/pbproxy/Makefile.am
-+++ b/hw/xquartz/pbproxy/Makefile.am
-@@ -1,7 +1,6 @@
--AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
-- -DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
-+AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
-
--AM_CFLAGS=$(XPBPROXY_CFLAGS)
-+AM_CFLAGS=$(XPBPROXY_CFLAGS)
- AM_OBJCFLAGS=$(XPBPROXY_CFLAGS)
-
- noinst_LTLIBRARIES = libxpbproxy.la
---
-2.9.3
-
Added: trunk/dports/x11/xorg-server-devel/files/0002-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -0,0 +1,76 @@
+From c174b1064cce139f0b54fb02814fa1d0278a773f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 11 Sep 2016 02:47:00 -0700
+Subject: [PATCH 2/4] glx: Initialize glx even if there are currently no
+ screens attached
+
+Failure to do so causes an overvlow in glxClientCallback
+
+Application Specific Information:
+X.Org X Server 1.18.99.1 Build Date: 20160911
+=================================================================
+==52118==ERROR: AddressSanitizer: SEGV on unknown address 0x000102b27b80 (pc 0x000103433245 bp 0x70000de67c20 sp 0x70000de67c00 T6)
+ #0 0x103433244 in __asan::asan_free(void*, __sanitizer::BufferedStackTrace*, __asan::AllocType) (libclang_rt.asan_osx_dynamic.dylib+0x3244)
+ #1 0x10347aeee in wrap_free (libclang_rt.asan_osx_dynamic.dylib+0x4aeee)
+ #2 0x102e6a5ed in glxClientCallback glxext.c:301
+ #3 0x102b672a3 in _CallCallbacks dixutils.c:737
+ #4 0x102b2f0c6 in CallCallbacks callback.h:83
+ #5 0x102b5c15a in NextAvailableClient dispatch.c:3562
+ #6 0x102d7060c in AllocNewConnection connection.c:777
+ #7 0x102d71355 in EstablishNewConnections connection.c:863
+ #8 0x102b662f0 in ProcessWorkQueue dixutils.c:523
+ #9 0x102d52a7f in WaitForSomething WaitFor.c:175
+ #10 0x102b204f6 in Dispatch dispatch.c:411
+ #11 0x102b61e01 in dix_main main.c:301
+ #12 0x10254c42a in server_thread quartzStartup.c:66
+ #13 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
+ #14 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
+ #15 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ glx/glxext.c | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/glx/glxext.c b/glx/glxext.c
+index d595a05..d216c9d 100644
+--- a/glx/glxext.c
++++ b/glx/glxext.c
+@@ -319,23 +319,6 @@ GlxPushProvider(__GLXprovider * provider)
+ __glXProviderStack = provider;
+ }
+
+-static Bool
+-checkScreenVisuals(void)
+-{
+- int i, j;
+-
+- for (i = 0; i < screenInfo.numScreens; i++) {
+- ScreenPtr screen = screenInfo.screens[i];
+- for (j = 0; j < screen->numVisuals; j++) {
+- if (screen->visuals[j].class == TrueColor ||
+- screen->visuals[j].class == DirectColor)
+- return True;
+- }
+- }
+-
+- return False;
+-}
+-
+ static void
+ GetGLXDrawableBytes(void *value, XID id, ResourceSizePtr size)
+ {
+@@ -371,10 +354,6 @@ GlxExtensionInit(void)
+ *stack = &__glXDRISWRastProvider;
+ }
+
+- /* Mesa requires at least one True/DirectColor visual */
+- if (!checkScreenVisuals())
+- return;
+-
+ __glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
+ "GLXContext");
+ __glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone,
+--
+2.10.0 (Apple Git-99)
+
Added: trunk/dports/x11/xorg-server-devel/files/0003-dix-dispatch-Fix-SmartScheduleClient-interval-adjust.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-dix-dispatch-Fix-SmartScheduleClient-interval-adjust.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0003-dix-dispatch-Fix-SmartScheduleClient-interval-adjust.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -0,0 +1,45 @@
+From 7c6972ae971bfac55c941b420013ff101517d82c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 11 Sep 2016 03:02:49 -0700
+Subject: [PATCH 3/4] dix/dispatch: Fix SmartScheduleClient interval adjustment
+ to use best rather than pClient
+
+pClient does not contain a live value after the transition to lists
+
+https://bugs.freedesktop.org/show_bug.cgi?id=97765
+
+Application Specific Information:
+X.Org X Server 1.18.99.1 Build Date: 20160910
+=================================================================
+==16921==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000108ce3834 at pc 0x000108880766 bp 0x7000045f76c0 sp 0x7000045f76b8
+READ of size 4 at 0x000108ce3834 thread T6
+ #0 0x108880765 in SmartScheduleClient dispatch.c:365
+ #1 0x10887ecc5 in Dispatch dispatch.c:422
+ #2 0x1088c05f1 in dix_main main.c:301
+ #3 0x1082aabba in server_thread quartzStartup.c:66
+ #4 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
+ #5 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
+ #6 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
+
+Regressed-in: 8f1edf4bd3a1f050ce9eeb5eac45dd1a8f7a6d5e
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ dix/dispatch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 0edcfee..26a461b 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
+@@ -362,7 +362,7 @@ SmartScheduleClient(void)
+ * has run, bump the slice up to get maximal
+ * performance from a single client
+ */
+- if ((now - pClient->smart_start_tick) > 1000 &&
++ if ((now - best->smart_start_tick) > 1000 &&
+ SmartScheduleSlice < SmartScheduleMaxSlice) {
+ SmartScheduleSlice += SmartScheduleInterval;
+ }
+--
+2.10.0 (Apple Git-99)
+
Deleted: trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch 2016-09-14 02:49:10 UTC (rev 152635)
+++ trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -1,73 +0,0 @@
-From 455d862774b791f4ca93f9885e1e899208a5080c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 10 Sep 2016 22:32:56 -0700
-Subject: [PATCH 3/4] os/connection: Improve abstraction for launchd secure
- sockets
-
-This changes away from hard-coding the /tmp/launch-* path to now
-supporting a generic <path to unix socket>[.<screen>] format for
-$DISPLAY.
-
-cf-libxcb: d978a4f69b30b630f28d07f1003cf290284d24d8
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- os/connection.c | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/os/connection.c b/os/connection.c
-index a901ebf..ac7d12b 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -79,6 +79,8 @@ SOFTWARE.
- #include <stdio.h>
- #include <stdlib.h>
-
-+#include <sys/stat.h>
-+
- #ifndef WIN32
- #include <sys/socket.h>
-
-@@ -1112,15 +1114,34 @@ MakeClientGrabPervious(ClientPtr client)
- void
- ListenOnOpenFD(int fd, int noxauth)
- {
-- char port[256];
-+ char port[PATH_MAX];
- XtransConnInfo ciptr;
- const char *display_env = getenv("DISPLAY");
-
-- if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
-- /* Make the path the launchd socket if our DISPLAY is set right */
-- strcpy(port, display_env);
-+ /* First check if display_env matches a <path to unix socket>[.<screen number>] scheme (eg: launchd) */
-+ if (display_env) {
-+ struct stat sbuf;
-+
-+ strlcpy(port, display_env, sizeof(port));
-+
-+ /* If the path exists, we don't have do do anything else.
-+ * If it doesn't, we need to check for a .<screen number> to strip off and recheck.
-+ */
-+ if (0 != stat(port, &sbuf)) {
-+ char *dot = strrchr(port, '.');
-+ if (dot) {
-+ *dot = '\0';
-+
-+ if (0 != stat(port, &sbuf)) {
-+ display_env = NULL;
-+ }
-+ } else {
-+ display_env = NULL;
-+ }
-+ }
- }
-- else {
-+
-+ if (!display_env) {
- /* Just some default so things don't break and die. */
- snprintf(port, sizeof(port), ":%d", atoi(display));
- }
---
-2.9.3
-
Added: trunk/dports/x11/xorg-server-devel/files/0004-os-connection-Improve-abstraction-for-launchd-secure.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0004-os-connection-Improve-abstraction-for-launchd-secure.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0004-os-connection-Improve-abstraction-for-launchd-secure.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -0,0 +1,74 @@
+From 2cb26de70fcc9e0aa5f1b152b8a6ad6d8c57962d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 10 Sep 2016 22:32:56 -0700
+Subject: [PATCH 4/4] os/connection: Improve abstraction for launchd secure
+ sockets
+
+This changes away from hard-coding the /tmp/launch-* path to now
+supporting a generic <absolute path to unix socket>[.<screen>]
+format for $DISPLAY.
+
+cf-libxcb: d978a4f69b30b630f28d07f1003cf290284d24d8
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+CC: Adam Jackson <ajax at kemper.freedesktop.org>
+---
+ os/connection.c | 31 ++++++++++++++++++++++++++-----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/os/connection.c b/os/connection.c
+index a901ebf..0d42184 100644
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -79,6 +79,8 @@ SOFTWARE.
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#include <sys/stat.h>
++
+ #ifndef WIN32
+ #include <sys/socket.h>
+
+@@ -1112,15 +1114,34 @@ MakeClientGrabPervious(ClientPtr client)
+ void
+ ListenOnOpenFD(int fd, int noxauth)
+ {
+- char port[256];
++ char port[PATH_MAX];
+ XtransConnInfo ciptr;
+ const char *display_env = getenv("DISPLAY");
+
+- if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
+- /* Make the path the launchd socket if our DISPLAY is set right */
+- strcpy(port, display_env);
++ /* First check if display_env matches a <absolute path to unix socket>[.<screen number>] scheme (eg: launchd) */
++ if (display_env && display_env[0] == '/') {
++ struct stat sbuf;
++
++ strlcpy(port, display_env, sizeof(port));
++
++ /* If the path exists, we don't have do do anything else.
++ * If it doesn't, we need to check for a .<screen number> to strip off and recheck.
++ */
++ if (0 != stat(port, &sbuf)) {
++ char *dot = strrchr(port, '.');
++ if (dot) {
++ *dot = '\0';
++
++ if (0 != stat(port, &sbuf)) {
++ display_env = NULL;
++ }
++ } else {
++ display_env = NULL;
++ }
++ }
+ }
+- else {
++
++ if (!display_env) {
+ /* Just some default so things don't break and die. */
+ snprintf(port, sizeof(port), ":%d", atoi(display));
+ }
+--
+2.10.0 (Apple Git-99)
+
Deleted: trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch 2016-09-14 02:49:10 UTC (rev 152635)
+++ trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch 2016-09-14 03:42:51 UTC (rev 152636)
@@ -1,78 +0,0 @@
-From dd85834e3995671da908e825eaa7a228d11f0b3d Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 10 Sep 2016 23:37:46 -0700
-Subject: [PATCH 4/4] xquartz: Update for removal of AddEnabledDevice and
- RemoveEnabledDevice
-
-Regressed-in: be5a513fee6cbf29ef7570e57eb0436d70fbd88c
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- hw/xquartz/darwin.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
-index 3403436..c0d0b8a 100644
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -303,6 +303,11 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
- =============================================================================
- */
-
-+static void
-+DarwinInputHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
-+{
-+}
-+
- /*
- * DarwinMouseProc: Handle the initialization, etc. of a mouse
- */
-@@ -362,13 +367,13 @@ DarwinMouseProc(DeviceIntPtr pPointer, int what)
-
- case DEVICE_ON:
- pPointer->public.on = TRUE;
-- AddEnabledDevice(darwinEventReadFD);
-+ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
- return Success;
-
- case DEVICE_CLOSE:
- case DEVICE_OFF:
- pPointer->public.on = FALSE;
-- RemoveEnabledDevice(darwinEventReadFD);
-+ RemoveNotifyFd(darwinEventReadFD);
- return Success;
- }
-
-@@ -431,13 +436,13 @@ DarwinTabletProc(DeviceIntPtr pPointer, int what)
-
- case DEVICE_ON:
- pPointer->public.on = TRUE;
-- AddEnabledDevice(darwinEventReadFD);
-+ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
- return Success;
-
- case DEVICE_CLOSE:
- case DEVICE_OFF:
- pPointer->public.on = FALSE;
-- RemoveEnabledDevice(darwinEventReadFD);
-+ RemoveNotifyFd(darwinEventReadFD);
- return Success;
- }
- return Success;
-@@ -459,12 +464,12 @@ DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
-
- case DEVICE_ON:
- pDev->public.on = TRUE;
-- AddEnabledDevice(darwinEventReadFD);
-+ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
- break;
-
- case DEVICE_OFF:
- pDev->public.on = FALSE;
-- RemoveEnabledDevice(darwinEventReadFD);
-+ RemoveNotifyFd(darwinEventReadFD);
- break;
-
- case DEVICE_CLOSE:
---
-2.9.3
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160913/1e355f50/attachment-0001.html>
More information about the macports-changes
mailing list