[92825] trunk/dports/x11
jeremyhu at macports.org
jeremyhu at macports.org
Mon May 7 17:19:26 PDT 2012
Revision: 92825
https://trac.macports.org/changeset/92825
Author: jeremyhu at macports.org
Date: 2012-05-07 17:19:25 -0700 (Mon, 07 May 2012)
Log Message:
-----------
xorg-server*: Tiger build fix (#34364)
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-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch
trunk/dports/x11/xorg-server/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch
trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch
trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/leopard-x86_64.patch
trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2012-05-07 21:30:18 UTC (rev 92824)
+++ trunk/dports/x11/xorg-server/Portfile 2012-05-08 00:19:25 UTC (rev 92825)
@@ -81,10 +81,12 @@
RAWCPP=${configure.cpp}
patchfiles \
+ 0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch \
+ 0002-XQuartz-Tiger-build-fix.patch \
+ 0003-XQuartz-Provide-fls-implementation-for-Tiger.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 \
- leopard-x86_64.patch
+ 5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
patch.pre_args -p1
Added: trunk/dports/x11/xorg-server/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,30 @@
+From 5657c075c3662fc6965250ccee50e305598f0e2c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 16:16:20 -0700
+Subject: [PATCH 1/3] XQuartz: Workaround an SDK bug on Leopard/x86_64
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/quartz.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
+index ebaa567..62a2852 100644
+--- a/hw/xquartz/quartz.c
++++ b/hw/xquartz/quartz.c
+@@ -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;
+--
+1.7.10.1
+
Added: trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,42 @@
+From 8c5fb186a7fd6b4d185b22af468790e9906449da Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 16:31:38 -0700
+Subject: [PATCH 2/3] XQuartz: Tiger build fix
+
+http://trac.macports.org/ticket/34364
+
+Regression-from: 662d41acdde1dcb9774fbe4054e251c708acaffe
+
+Reported-by: Peter Dyballa <Peter_Dyballa at Freenet.DE>
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/X11Application.m | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
+index 0c3283e..9f4c9b7 100644
+--- a/hw/xquartz/X11Application.m
++++ b/hw/xquartz/X11Application.m
+@@ -1641,6 +1641,11 @@ handle_mouse:
+
+ case NSScrollWheel:
+ {
++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
++ float deltaX = [e deltaX];
++ float deltaY = [e deltaY];
++ BOOL isContinuous = NO;
++#else
+ CGFloat deltaX = [e deltaX];
+ CGFloat deltaY = [e deltaY];
+ CGEventRef cge = [e CGEvent];
+@@ -1662,6 +1667,7 @@ handle_mouse:
+ deltaY *= lineHeight / 5.0;
+ }
+ #endif
++#endif
+
+ #if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
+ /* If we're in the background, we need to send a MotionNotify event
+--
+1.7.10.1
+
Added: trunk/dports/x11/xorg-server/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,39 @@
+From 1de82bbe86bfdc1717dc4e04ab5125af1f24d51a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 17:07:27 -0700
+Subject: [PATCH 3/3] XQuartz: Provide fls implementation for Tiger
+
+Regression-from: 30623d6ff7bca223f9e1a825e86bd317eef8bf16
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/console_redirect.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/hw/xquartz/console_redirect.c b/hw/xquartz/console_redirect.c
+index 1e0e56b..91d693b 100644
+--- a/hw/xquartz/console_redirect.c
++++ b/hw/xquartz/console_redirect.c
+@@ -310,6 +310,20 @@ xq_asl_init(void)
+ atexit(redirect_atexit);
+ }
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
++#define fls(v) xq_fls(v)
++
++static inline int fls(int value) {
++ unsigned int b, v;
++
++ v = *((unsigned int *)&value);
++
++ for(b=0 ; v ; v >>= 1 , b++);
++
++ return b;
++}
++#endif
++
+ int
+ xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
+ {
+--
+1.7.10.1
+
Deleted: trunk/dports/x11/xorg-server/files/leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/leopard-x86_64.patch 2012-05-07 21:30:18 UTC (rev 92824)
+++ trunk/dports/x11/xorg-server/files/leopard-x86_64.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -1,15 +0,0 @@
---- 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;
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2012-05-07 21:30:18 UTC (rev 92824)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2012-05-08 00:19:25 UTC (rev 92825)
@@ -73,10 +73,12 @@
RAWCPP=${configure.cpp}
patchfiles \
+ 0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch \
+ 0002-XQuartz-Tiger-build-fix.patch \
+ 0003-XQuartz-Provide-fls-implementation-for-Tiger.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 \
- leopard-x86_64.patch
+ 5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
patch.pre_args -p1
Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,30 @@
+From 5657c075c3662fc6965250ccee50e305598f0e2c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 16:16:20 -0700
+Subject: [PATCH 1/3] XQuartz: Workaround an SDK bug on Leopard/x86_64
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/quartz.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
+index ebaa567..62a2852 100644
+--- a/hw/xquartz/quartz.c
++++ b/hw/xquartz/quartz.c
+@@ -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;
+--
+1.7.10.1
+
Added: trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,42 @@
+From 8c5fb186a7fd6b4d185b22af468790e9906449da Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 16:31:38 -0700
+Subject: [PATCH 2/3] XQuartz: Tiger build fix
+
+http://trac.macports.org/ticket/34364
+
+Regression-from: 662d41acdde1dcb9774fbe4054e251c708acaffe
+
+Reported-by: Peter Dyballa <Peter_Dyballa at Freenet.DE>
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/X11Application.m | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
+index 0c3283e..9f4c9b7 100644
+--- a/hw/xquartz/X11Application.m
++++ b/hw/xquartz/X11Application.m
+@@ -1641,6 +1641,11 @@ handle_mouse:
+
+ case NSScrollWheel:
+ {
++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
++ float deltaX = [e deltaX];
++ float deltaY = [e deltaY];
++ BOOL isContinuous = NO;
++#else
+ CGFloat deltaX = [e deltaX];
+ CGFloat deltaY = [e deltaY];
+ CGEventRef cge = [e CGEvent];
+@@ -1662,6 +1667,7 @@ handle_mouse:
+ deltaY *= lineHeight / 5.0;
+ }
+ #endif
++#endif
+
+ #if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
+ /* If we're in the background, we need to send a MotionNotify event
+--
+1.7.10.1
+
Added: trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -0,0 +1,39 @@
+From 1de82bbe86bfdc1717dc4e04ab5125af1f24d51a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Mon, 7 May 2012 17:07:27 -0700
+Subject: [PATCH 3/3] XQuartz: Provide fls implementation for Tiger
+
+Regression-from: 30623d6ff7bca223f9e1a825e86bd317eef8bf16
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ hw/xquartz/console_redirect.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/hw/xquartz/console_redirect.c b/hw/xquartz/console_redirect.c
+index 1e0e56b..91d693b 100644
+--- a/hw/xquartz/console_redirect.c
++++ b/hw/xquartz/console_redirect.c
+@@ -310,6 +310,20 @@ xq_asl_init(void)
+ atexit(redirect_atexit);
+ }
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
++#define fls(v) xq_fls(v)
++
++static inline int fls(int value) {
++ unsigned int b, v;
++
++ v = *((unsigned int *)&value);
++
++ for(b=0 ; v ; v >>= 1 , b++);
++
++ return b;
++}
++#endif
++
+ int
+ xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
+ {
+--
+1.7.10.1
+
Deleted: trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch 2012-05-07 21:30:18 UTC (rev 92824)
+++ trunk/dports/x11/xorg-server-devel/files/leopard-x86_64.patch 2012-05-08 00:19:25 UTC (rev 92825)
@@ -1,15 +0,0 @@
---- 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/20120507/bfd48623/attachment-0001.html>
More information about the macports-changes
mailing list