[119711] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 119711
          https://trac.macports.org/changeset/119711
Author:   jeremyhu at macports.org
Date:     2014-05-03 20:10:10 -0700 (Sat, 03 May 2014)
Log Message:
-----------
xorg-server: Bump to 1.14.6

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2014-05-04 03:05:12 UTC (rev 119710)
+++ trunk/dports/x11/xorg-server/Portfile	2014-05-04 03:10:10 UTC (rev 119711)
@@ -5,7 +5,7 @@
 name		xorg-server
 conflicts       xorg-server-devel
 set my_name	xorg-server
-version		1.14.5.901
+version		1.14.6
 categories	x11 devel
 license		X11
 maintainers	jeremyhu openmaintainer
@@ -20,9 +20,9 @@
 dist_subdir     ${my_name}
 distname        ${my_name}-${version}
 
-checksums           sha1    e186a14010656424aa208f1980f9d9198f63e839 \
-                    rmd160  13548a6f3ed6f6d8a1844400b5bbfc40967048ae \
-                    sha256  3ada4e9c048340dd70557dc8ff05334af5e12cc2f25eb7102c3469c8b2cd7b16
+checksums           sha1    257fe290829a685f5bba5809bb1b422b6dae68a5 \
+                    rmd160  e8062894d922ff3bad79dd50057c257fae1f18b7 \
+                    sha256  e8b33f09f6adf706dfd2636990730d7fed6538adf346f78a6c685cf0c3dda730
 
 use_bzip2	yes
 use_parallel_build yes
@@ -84,6 +84,7 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
+	0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch \
 	5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
 	5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
 	5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \

Added: trunk/dports/x11/xorg-server/files/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch	2014-05-04 03:10:10 UTC (rev 119711)
@@ -0,0 +1,33 @@
+From ec6007e6f7772a90713c9c51c64359229961ce27 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 6 Apr 2014 05:32:00 -0700
+Subject: [PATCH] XQuartz: Ensure we wait for the server thread to terminate
+
+AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock
+
+http://xquartz.macosforge.org/trac/ticket/823
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/X11Controller.m | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
+index 5445c6f..022e832 100644
+--- a/hw/xquartz/X11Controller.m
++++ b/hw/xquartz/X11Controller.m
+@@ -942,9 +942,8 @@ extern char *bundle_id_prefix;
+     /* shutdown the X server, it will exit () for us. */
+     DarwinSendDDXEvent(kXquartzQuit, 0);
+ 
+-    /* In case it doesn't, exit anyway after a while. */
+-    remain = 10000000;
+-    while ((remain = usleep(remain)) > 0) ;
++    /* In case it doesn't, exit anyway after 5s. */
++    [NSThread sleepForTimeInterval:5.0];
+ 
+     exit(1);
+ }
+-- 
+1.9.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/9cbaf132/attachment-0001.html>