[92091] trunk/dports/x11

[jeremyhu at macports.org]

Revision: 92091
          https://trac.macports.org/changeset/92091
Author:   jeremyhu at macports.org
Date:     2012-04-18 01:24:57 -0700 (Wed, 18 Apr 2012)
Log Message:
-----------
xorg-server*: Fix a deadlock on Tiger and Leopard

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

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch
    trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2012-04-18 00:52:10 UTC (rev 92090)
+++ trunk/dports/x11/xorg-server/Portfile	2012-04-18 08:24:57 UTC (rev 92091)
@@ -6,6 +6,7 @@
 conflicts       xorg-server-devel
 set my_name	xorg-server
 version		1.12.1
+revision        1
 categories	x11 devel
 license		X11 BSD
 maintainers	jeremyhu openmaintainer
@@ -81,6 +82,7 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
+        0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.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-Fix-a-deadlock-in-pre-dispatch-code.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	2012-04-18 08:24:57 UTC (rev 92091)
@@ -0,0 +1,29 @@
+From cf059966fcba7eb3c2cc5e298887e4802f0a0126 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 18 Apr 2012 01:01:44 -0700
+Subject: [PATCH] XQuartz: Fix a deadlock in pre-dispatch code
+
+The fact that this has been in place so long makes me really wonder if
+anybody cares about this running in Tiger or Leopard.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/xpr/xprFrame.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
+index 4c7aac4..01f1def 100644
+--- a/hw/xquartz/xpr/xprFrame.c
++++ b/hw/xquartz/xpr/xprFrame.c
+@@ -212,7 +212,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+ #else
+     pthread_rwlock_wrlock(&window_hash_rwlock);
+     x_hash_table_insert(window_hash, pFrame->wid, pFrame);
+-    pthread_rwlock_wrlock(&window_hash_rwlock);
++    pthread_rwlock_unlock(&window_hash_rwlock);
+ #endif
+ 
+     xprSetNativeProperty(pFrame);
+-- 
+1.7.10
+

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2012-04-18 00:52:10 UTC (rev 92090)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2012-04-18 08:24:57 UTC (rev 92091)
@@ -6,6 +6,7 @@
 conflicts       xorg-server
 set my_name	xorg-server
 version		1.12.99.0
+revision        1
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -15,7 +16,7 @@
 
 fetch.type      git
 git.url         git://anongit.freedesktop.org/xorg/xserver
-git.branch      1110facdfeb95b1ad47d03c0ca3d73933b86dbd6
+git.branch      80fefc42f5e67e6b4a4b440d8991bee7e5f38359
 
 use_parallel_build yes
 
@@ -72,6 +73,7 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
+        0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.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-devel/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	2012-04-18 08:24:57 UTC (rev 92091)
@@ -0,0 +1,29 @@
+From cf059966fcba7eb3c2cc5e298887e4802f0a0126 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 18 Apr 2012 01:01:44 -0700
+Subject: [PATCH] XQuartz: Fix a deadlock in pre-dispatch code
+
+The fact that this has been in place so long makes me really wonder if
+anybody cares about this running in Tiger or Leopard.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/xpr/xprFrame.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
+index 4c7aac4..01f1def 100644
+--- a/hw/xquartz/xpr/xprFrame.c
++++ b/hw/xquartz/xpr/xprFrame.c
+@@ -212,7 +212,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
+ #else
+     pthread_rwlock_wrlock(&window_hash_rwlock);
+     x_hash_table_insert(window_hash, pFrame->wid, pFrame);
+-    pthread_rwlock_wrlock(&window_hash_rwlock);
++    pthread_rwlock_unlock(&window_hash_rwlock);
+ #endif
+ 
+     xprSetNativeProperty(pFrame);
+-- 
+1.7.10
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120418/85d881b1/attachment.html>