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

[jeremyhu at macports.org]

Revision: 91727
          https://trac.macports.org/changeset/91727
Author:   jeremyhu at macports.org
Date:     2012-04-09 00:22:15 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
xorg-server-devel: Fix a Leopard x86_64 build failure

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

Added Paths:
-----------
    trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2012-04-09 07:07:45 UTC (rev 91726)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2012-04-09 07:22:15 UTC (rev 91727)
@@ -74,7 +74,8 @@
 patchfiles \
         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
+        5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
+        leopard-x86_64.patch
 
 patch.pre_args -p1
 

Added: trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch	2012-04-09 07:22:15 UTC (rev 91727)
@@ -0,0 +1,15 @@
+--- xorg-server-devel-1.12.99.0/hw/xquartz/quartz.c.orig	2012-04-09 00:16:20.000000000 -0700
++++ xorg-server-devel-1.12.99.0/hw/xquartz/quartz.c	2012-04-09 00:18:39.000000000 -0700
+@@ -69,6 +69,12 @@
+ #include <rootlessCommon.h>
+ #include <Xplugin.h>
+ 
++/* Work around a bug on Leopard's headers */
++#if defined (__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 && __MAC_OS_X_VERSION_MAX_ALLOWED < 1060
++extern OSErr UpdateSystemActivity(UInt8 activity);
++#define OverallAct 0
++#endif
++
+ DevPrivateKeyRec quartzScreenKeyRec;
+ int aquaMenuBarHeight = 0;
+ QuartzModeProcsPtr quartzProcs = NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/a80d3c71/attachment.html>