[95427] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jul 12 09:03:21 PDT 2012
Revision: 95427
https://trac.macports.org/changeset/95427
Author: jeremyhu at macports.org
Date: 2012-07-12 09:03:21 -0700 (Thu, 12 Jul 2012)
Log Message:
-----------
xorg-server: Bump to 1.12.3
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed 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/files/PR-579.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2012-07-12 16:02:42 UTC (rev 95426)
+++ trunk/dports/x11/xorg-server/Portfile 2012-07-12 16:03:21 UTC (rev 95427)
@@ -5,7 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.12.2
+version 1.12.3
categories x11 devel
license X11 BSD
maintainers jeremyhu openmaintainer
@@ -20,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 \
- rmd160 47530836ebe44e8823848fb87ef979c7dd805f66 \
- sha256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
+checksums sha1 f3f3d59f3c5e15459152987ffc644f06a0d1374f \
+ rmd160 06d0ab8c6be2d0fc0d8510a5cdaf718ae39a72d6 \
+ sha256 3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe
use_bzip2 yes
use_parallel_build yes
@@ -81,17 +81,13 @@
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 \
4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch \
4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch \
4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch \
4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.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 \
- PR-579.patch
+ 5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
patch.pre_args -p1
Deleted: 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 2012-07-12 16:02:42 UTC (rev 95426)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch 2012-07-12 16:03:21 UTC (rev 95427)
@@ -1,30 +0,0 @@
-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
-
Deleted: trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch 2012-07-12 16:02:42 UTC (rev 95426)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Tiger-build-fix.patch 2012-07-12 16:03:21 UTC (rev 95427)
@@ -1,42 +0,0 @@
-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
-
Deleted: 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 2012-07-12 16:02:42 UTC (rev 95426)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch 2012-07-12 16:03:21 UTC (rev 95427)
@@ -1,39 +0,0 @@
-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/PR-579.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/PR-579.patch 2012-07-12 16:02:42 UTC (rev 95426)
+++ trunk/dports/x11/xorg-server/files/PR-579.patch 2012-07-12 16:03:21 UTC (rev 95427)
@@ -1,50 +0,0 @@
-commit acdc4f54ee5784d26c251ff8c941b4360ae80e9b
-Author: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Thu May 17 10:08:02 2012 -0700
-
- XQuartz: Avoid a race in initialization of darwinPointer
-
- http://xquartz.macosforge.org/trac/ticket/579
-
- Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index 9f4c9b7..1f9b05d 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -1329,6 +1329,11 @@ untrusted_str(NSEvent *e)
- }
- #endif
-
-+extern void
-+darwinEvents_lock(void);
-+extern void
-+darwinEvents_unlock(void);
-+
- - (void) sendX11NSEvent:(NSEvent *)e
- {
- NSPoint location = NSZeroPoint;
-@@ -1341,18 +1346,15 @@ untrusted_str(NSEvent *e)
- int modifierFlags;
- BOOL isMouseOrTabletEvent, isTabletEvent;
-
--#ifdef HAVE_LIBDISPATCH
-- static dispatch_once_t once_pred;
-- dispatch_once(&once_pred, ^{
-- tilt = NSZeroPoint;
-- darwinTabletCurrent = darwinTabletStylus;
-- });
--#else
- if (!darwinTabletCurrent) {
-+ /* Ensure that the event system is initialized */
-+ darwinEvents_lock();
-+ darwinEvents_unlock();
-+ assert(darwinTabletStylus);
-+
- tilt = NSZeroPoint;
- darwinTabletCurrent = darwinTabletStylus;
- }
--#endif
-
- isMouseOrTabletEvent = [e type] == NSLeftMouseDown ||
- [e type] == NSOtherMouseDown ||
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120712/c1d03bab/attachment.html>
More information about the macports-changes
mailing list