[63598] trunk/dports/x11/xorg-server-devel

[jeremyhu at macports.org]

Revision: 63598
          http://trac.macports.org/changeset/63598
Author:   jeremyhu at macports.org
Date:     2010-02-09 17:50:25 -0800 (Tue, 09 Feb 2010)
Log Message:
-----------
xorg-server-devel: Fix a bad FatalError, so we don't crash in glx

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

Added Paths:
-----------
    trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2010-02-10 01:35:00 UTC (rev 63597)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2010-02-10 01:50:25 UTC (rev 63598)
@@ -5,6 +5,7 @@
 name		xorg-server-devel
 set my_name	xorg-server
 version		1.7.99.2
+revision        1
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -75,6 +76,9 @@
 # GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
 configure.cppflags-append -I/usr/include -I${filespath}/dri
 
+patchfiles 0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch
+patch.args -p1
+
 post-destroot {
 	ln -s Xquartz ${destroot}${prefix}/bin/X
 }

Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Don-t-FatalError-in-x_hook_run-if-the-list-i.patch	2010-02-10 01:50:25 UTC (rev 63598)
@@ -0,0 +1,27 @@
+From 6f6a99abc12ddee82898fdabfb50c17e90e094b9 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at freedesktop.org>
+Date: Wed, 13 Jan 2010 14:39:54 -0800
+Subject: [PATCH] XQuartz: Don't FatalError in x_hook_run if the list is empty
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
+---
+ hw/xquartz/xpr/x-hook.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xquartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
+index 03e7f85..5b850fe 100644
+--- a/hw/xquartz/xpr/x-hook.c
++++ b/hw/xquartz/xpr/x-hook.c
+@@ -79,6 +79,9 @@ X_PFX (hook_run) (x_list *lst, void *arg)
+     void **data;
+     int length, i;
+ 
++    if(!lst)
++        return;
++
+     length = X_PFX (list_length) (lst);
+     fun = xalloc (sizeof (x_hook_function *) * length);
+     data = xalloc (sizeof (void *) * length);
+-- 
+1.6.6.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100209/85f6fac1/attachment-0001.html>