[93754] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Tue May 29 16:03:57 PDT 2012
Revision: 93754
https://trac.macports.org/changeset/93754
Author: jeremyhu at macports.org
Date: 2012-05-29 16:03:57 -0700 (Tue, 29 May 2012)
Log Message:
-----------
xorg-server: Bump to 1.12.2
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
Added Paths:
-----------
trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch
trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch
trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch
trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch
trunk/dports/x11/xorg-server/files/PR-579.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2012-05-29 22:17:30 UTC (rev 93753)
+++ trunk/dports/x11/xorg-server/Portfile 2012-05-29 23:03:57 UTC (rev 93754)
@@ -5,7 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.12.1.901
+version 1.12.2
categories x11 devel
license X11 BSD
maintainers jeremyhu openmaintainer
@@ -20,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 bb9985bae271aa896de7fa12e49a0dbd8e244d2c \
- rmd160 84f8c7c1923670aadc0d5c7f634467ee87a67602 \
- sha256 e00525cd683da1a7bb9d99c16e2572706863cbb141c428129bf5166a47aefa9b
+checksums sha1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 \
+ rmd160 47530836ebe44e8823848fb87ef979c7dd805f66 \
+ sha256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
use_bzip2 yes
use_parallel_build yes
@@ -81,12 +81,17 @@
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
+ 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
patch.pre_args -p1
Added: trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -0,0 +1,202 @@
+From 6eef64baedb616592a8dc5221d753b5388b9b969 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 17 Feb 2012 12:35:02 -0800
+Subject: [PATCH 4000/4003] os: Pass the FatalError message to
+ OsVendorFatalError
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+(cherry picked from commit a818b305989bbcde4e585112a7ee70cbc0b14a92)
+---
+ hw/dmx/dmxinit.c | 2 +-
+ hw/dmx/dmxlog.c | 3 ---
+ hw/kdrive/src/kdrive.c | 2 +-
+ hw/vfb/InitOutput.c | 2 +-
+ hw/xfree86/common/xf86Init.c | 2 +-
+ hw/xnest/Init.c | 2 +-
+ hw/xquartz/darwin.c | 2 +-
+ hw/xwin/winerror.c | 2 +-
+ include/os.h | 2 +-
+ os/log.c | 18 +++++++++++-------
+ test/ddxstubs.c | 2 +-
+ 11 files changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
+index 09e3d74..5804353 100644
+--- a/hw/dmx/dmxinit.c
++++ b/hw/dmx/dmxinit.c
+@@ -905,7 +905,7 @@ OsVendorInit(void)
+ * two routines mentioned here, as well as by others) to use the
+ * referenced routine instead of \a vfprintf().) */
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ }
+
+diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
+index b56bb93..33aee59 100644
+--- a/hw/dmx/dmxlog.c
++++ b/hw/dmx/dmxlog.c
+@@ -110,9 +110,6 @@ VFatalError(const char *format, va_list args)
+ {
+ VErrorF(format, args);
+ ErrorF("\n");
+-#ifdef DDXOSFATALERROR
+- OsVendorFatalError();
+-#endif
+ AbortServer();
+ /*NOTREACHED*/}
+ #endif
+diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
+index f65ab96..ecdae19 100644
+--- a/hw/kdrive/src/kdrive.c
++++ b/hw/kdrive/src/kdrive.c
+@@ -1104,7 +1104,7 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+ }
+
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ }
+
+diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
+index 2d679a5..e2cd96c 100644
+--- a/hw/vfb/InitOutput.c
++++ b/hw/vfb/InitOutput.c
+@@ -219,7 +219,7 @@ OsVendorInit(void)
+ }
+
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ }
+
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 0974893..2a7d0a3 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -1053,7 +1053,7 @@ AbortDDX(enum ExitCode error)
+ }
+
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ #ifdef VENDORSUPPORT
+ ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
+diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
+index 0909826..330b8ca 100644
+--- a/hw/xnest/Init.c
++++ b/hw/xnest/Init.c
+@@ -142,7 +142,7 @@ OsVendorInit(void)
+ }
+
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ return;
+ }
+diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
+index 74e11fe..e2ab057 100644
+--- a/hw/xquartz/darwin.c
++++ b/hw/xquartz/darwin.c
+@@ -670,7 +670,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+ * OsVendorFatalError
+ */
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ ErrorF(" OsVendorFatalError\n");
+ }
+diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
+index 4049e97..a25307c 100644
+--- a/hw/xwin/winerror.c
++++ b/hw/xwin/winerror.c
+@@ -70,7 +70,7 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args)
+ * Attempt to do last-ditch, safe, important cleanup here.
+ */
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ /* Don't give duplicate warning if UseMsg was called */
+ if (g_fSilentFatalError)
+diff --git a/include/os.h b/include/os.h
+index 4b5b440..970ff02 100644
+--- a/include/os.h
++++ b/include/os.h
+@@ -321,7 +321,7 @@ extern _X_EXPORT void
+ OsCleanup(Bool);
+
+ extern _X_EXPORT void
+-OsVendorFatalError(void);
++OsVendorFatalError(const char *f, va_list args);
+
+ extern _X_EXPORT void
+ OsVendorInit(void);
+diff --git a/os/log.c b/os/log.c
+index 0ccd126..d913449 100644
+--- a/os/log.c
++++ b/os/log.c
+@@ -588,6 +588,7 @@ void
+ FatalError(const char *f, ...)
+ {
+ va_list args;
++ va_list args2;
+ static Bool beenhere = FALSE;
+
+ if (beenhere)
+@@ -595,22 +596,25 @@ FatalError(const char *f, ...)
+ else
+ ErrorF("\nFatal server error:\n");
+
+- va_start(args, f);
++ /* Make a copy for OsVendorFatalError */
++ va_copy(args2, args);
++
+ #ifdef __APPLE__
+ {
+- va_list args2;
++ va_list apple_args;
+
+- va_copy(args2, args);
+- (void) vsnprintf(__crashreporter_info_buff__,
+- sizeof(__crashreporter_info_buff__), f, args2);
+- va_end(args2);
++ va_copy(apple_args, args);
++ (void)vsnprintf(__crashreporter_info_buff__,
++ sizeof(__crashreporter_info_buff__), f, apple_args);
++ va_end(apple_args);
+ }
+ #endif
+ VErrorF(f, args);
+ va_end(args);
+ ErrorF("\n");
+ if (!beenhere)
+- OsVendorFatalError();
++ OsVendorFatalError(f, args2);
++ va_end(args2);
+ if (!beenhere) {
+ beenhere = TRUE;
+ AbortServer();
+diff --git a/test/ddxstubs.c b/test/ddxstubs.c
+index a214b96..3647dc5 100644
+--- a/test/ddxstubs.c
++++ b/test/ddxstubs.c
+@@ -50,7 +50,7 @@ OsVendorInit(void)
+ }
+
+ void
+-OsVendorFatalError(void)
++OsVendorFatalError(const char *f, va_list args)
+ {
+ }
+
+--
+1.7.10
+
Added: trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -0,0 +1,31 @@
+From 43e2760f536737cbd50dd3d8eb7faf39633b9e8c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 28 Mar 2012 15:07:51 -0700
+Subject: [PATCH 4001/4003] os: Fix regression with FatalError not calling
+ va_start
+
+Regression From: a818b305989bbcde4e585112a7ee70cbc0b14a92
+
+Found-by: Colin Harrison <colin.harrison at virgin.net>
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 817cec8ffd6cdb1abbcc00decd43569d44801764)
+---
+ os/log.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/os/log.c b/os/log.c
+index d913449..501fd45 100644
+--- a/os/log.c
++++ b/os/log.c
+@@ -596,6 +596,8 @@ FatalError(const char *f, ...)
+ else
+ ErrorF("\nFatal server error:\n");
+
++ va_start(args, f);
++
+ /* Make a copy for OsVendorFatalError */
+ va_copy(args2, args);
+
+--
+1.7.10
+
Added: trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -0,0 +1,30 @@
+From ef28cd2d7da9e1ea8399f1072a9c60a5af6b7fc0 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Thu, 19 Apr 2012 16:39:23 -0700
+Subject: [PATCH 4002/4003] os: Annotate OsVendorFatalError as
+ _X_ATTRIBUTE_PRINTF
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+Tested-By: Michal Suchanek <hramrach at gmail.com>
+(cherry picked from commit d97868d934fd1a00f9e9ef23a1154a70c7bc0464)
+---
+ include/os.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/os.h b/include/os.h
+index 970ff02..8b58d7a 100644
+--- a/include/os.h
++++ b/include/os.h
+@@ -321,7 +321,8 @@ extern _X_EXPORT void
+ OsCleanup(Bool);
+
+ extern _X_EXPORT void
+-OsVendorFatalError(const char *f, va_list args);
++OsVendorFatalError(const char *f, va_list args)
++_X_ATTRIBUTE_PRINTF(1, 0);
+
+ extern _X_EXPORT void
+ OsVendorInit(void);
+--
+1.7.10
+
Added: trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -0,0 +1,146 @@
+From 6826d7bbf0d25194c5a1660403a3aed873fc6d7d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 17 Feb 2012 13:15:12 -0800
+Subject: [PATCH 4003/4003] XQuartz: Detect FatalErrors on startup to prevent
+ tight crash loops
+
+If a FatalError occurs before the server finishes launching, it will
+not have drained the launchd-owned DISPLAY socket, so launchd will
+just relaunch it. This can cause the server to crash in a tight loop
+which will spam the user with CrashReporter windows that claim focus on
+appearance.
+
+This allows users stuck in this loop to "deal" with the problem without
+popping up a crash report every 10 seconds.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 3505e1faadddeeec85a0d3f823c877ea33f86e00)
+
+Conflicts:
+
+ hw/xquartz/X11Application.h
+---
+ hw/xquartz/X11Application.h | 3 ++
+ hw/xquartz/X11Application.m | 45 ++++++++++++++++++++
+ .../Resources/English.lproj/Localizable.strings | Bin 4410 -> 5454 bytes
+ hw/xquartz/darwin.c | 4 +-
+ 4 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
+index 740a807..5ea6129 100644
+--- a/hw/xquartz/X11Application.h
++++ b/hw/xquartz/X11Application.h
+@@ -89,6 +89,9 @@ X11ApplicationCanEnterRandR(void);
+ void
+ X11ApplicationMain(int argc, char **argv, char **envp);
+
++void
++X11ApplicationFatalError(const char *f, va_list args) __printflike(1, 0);
++
+ #define PREFS_APPSMENU "apps_menu"
+ #define PREFS_FAKEBUTTONS "enable_fake_buttons"
+ #define PREFS_KEYEQUIVS "enable_key_equivalents"
+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
+index b686b00..c77b724 100644
+--- a/hw/xquartz/X11Application.m
++++ b/hw/xquartz/X11Application.m
+@@ -72,6 +72,7 @@ static dispatch_queue_t eventTranslationQueue;
+
+ extern Bool noTestExtensions;
+ extern Bool noRenderExtension;
++extern BOOL serverRunning;
+
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ static TISInputSourceRef last_key_layout;
+@@ -1073,6 +1074,50 @@ X11ApplicationCanEnterRandR(void)
+ }
+ }
+
++void
++X11ApplicationFatalError(const char *f, va_list args)
++{
++#ifdef HAVE_LIBDISPATCH
++ NSString *title, *msg;
++ char *error_msg;
++
++ /* This is called by FatalError() in the server thread just before
++ * we would abort. If the server never got off the ground, We should
++ * inform the user of the error rather than letting the ever-so-friendly
++ * CrashReporter do it for us.
++ *
++ * This also has the benefit of forcing user interaction rather than
++ * allowing an infinite throttled-restart if the crash occurs before
++ * we can drain the launchd socket.
++ */
++
++ if (serverRunning) {
++ return;
++ }
++
++ title = NSLocalizedString(@"The application X11 could not be opened.",
++ @"Dialog title when encountering a fatal error");
++ msg = NSLocalizedString(@"An error occurred while starting the X11 server: \"%s\"\n\nClick Quit to quit X11. Click Report to see more details or send a report to Apple.",
++ @"Dialog when encountering a fatal error");
++
++ vasprintf(&error_msg, f, args);
++ msg = [NSString stringWithFormat:msg, error_msg];
++
++ /* We want the AppKit thread to actually service the alert or we will race [NSApp run] and create an
++ * 'NSInternalInconsistencyException', reason: 'NSApp with wrong _running count'
++ */
++ dispatch_sync(dispatch_get_main_queue(), ^{
++ if (NSAlertDefaultReturn == NSRunAlertPanel(title, msg, NSLocalizedString(@"Quit", @""),
++ NSLocalizedString (@"Report...", @""), nil)) {
++ exit(EXIT_FAILURE);
++ }
++ });
++
++ /* fall back to caller to do the abort() in the DIX */
++#endif
++}
++
++
+ static void
+ check_xinitrc(void)
+ {
+diff --git a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
+index bf2089ca1399c895dc701dfc23fa9bd44a1d8b8f..36ae0ffb3d2ed207a1a73be03bdc898c3306466f 100644
+GIT binary patch
+delta 934
+zcmd5*%}T>S5dKIBl!E9{DdLjS9s*7AsuT%=m!A9s54~s`O);h+iT{T at gYFaf21;+<
+zd;uRx{dSvR)RXoi%j|rcnVp^aX7X&k+Q$2vyfy5n_L6C$*;s5$dgiV%g|cVfOqQz;
+z)e2fdzARkJE2Hgt2r<AI=hP`Y#268sK;V#a%sr(9#L5=aGbXmtK at Ar6;NQ>JHv|r_
+z$|dqp0fxjOom1)~UKPX<bx0Y);Z=byr3lgaWe6D=E3#XuWwYh)GNG at PjakBgY^YjQ
+zssfkr$w{D#NHiNU_nf6ILSLH-1`?iPT<Cp`*ZZuoiA3u at pHs5Qa3el*O8Yh+8{IwD
+zGlz$=VTU0i&9@>kB at ztdaS5F1?+OihRvl6qCOl93qx?dhz3QT><a;ESUm{&q-i(Zn
+s7G@^o&wR}ND?-*$+vkLLIOziAPB<K1)v4kS_-Xqb?Xs;UEHEfO0Pm@$p8x;=
+
+delta 49
+zcmX at 7wM&WV-~Y+hg4!E(Bw1ONRh1<eHhZxKGeMY>y;!R@%Wy2 at U{+9Ln0!E>5&&!Y
+B4M6|^
+
+diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
+index e2ab057..41db72a 100644
+--- a/hw/xquartz/darwin.c
++++ b/hw/xquartz/darwin.c
+@@ -78,6 +78,8 @@
+ #include "quartzKeyboard.h"
+ #include "quartz.h"
+
++#include "X11Application.h"
++
+ aslclient aslc;
+
+ void
+@@ -672,7 +674,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+ void
+ OsVendorFatalError(const char *f, va_list args)
+ {
+- ErrorF(" OsVendorFatalError\n");
++ X11ApplicationFatalError(f, args);
+ }
+
+ /*
+--
+1.7.10
+
Modified: trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2012-05-29 22:17:30 UTC (rev 93753)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -1,4 +1,4 @@
-From cbacf89b6b1a72384f431fa4a759ac995158953d Mon Sep 17 00:00:00 2001
+From 0045dfa87231a42e65b3619730d363f117c05bbc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri, 13 Jan 2012 12:00:57 -0800
Subject: [PATCH 5000/5002] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -9,6 +9,7 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit 290d366d4c6b6e051f0e337a1a6ee76f42d28003)
---
hw/xfree86/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2012-05-29 22:17:30 UTC (rev 93753)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -1,10 +1,11 @@
-From bf524082a923c9d7591deeb7b4b3f7e6e987f94d Mon Sep 17 00:00:00 2001
+From 7fc9247b415ec000ef3dacede9eadef0d9fa92f4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri, 30 Apr 2010 13:08:25 -0700
Subject: [PATCH 5001/5002] Workaround the GC clipping problem in
miPaintWindow and add some debugging output.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit d7e56959401ce32120af67b01632442c52f2cf85)
---
mi/miexpose.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 94 insertions(+), 10 deletions(-)
Modified: trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2012-05-29 22:17:30 UTC (rev 93753)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -1,4 +1,4 @@
-From d78dc154176056b8ba23d2f7fd9205ef08fa6a6f Mon Sep 17 00:00:00 2001
+From a38ffa7e4343a958e04ff7855a0177e3d6eeb206 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri, 12 Feb 2010 19:48:52 -0800
Subject: [PATCH 5002/5002] fb: Revert fb changes that broke XQuartz
@@ -14,6 +14,7 @@
This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit e6fa592a74104aa9d0081387823314833526f306)
---
fb/fb.h | 3 +--
fb/fbpict.c | 82 +++++++++++++++++------------------------------------------
Added: trunk/dports/x11/xorg-server/files/PR-579.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/PR-579.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/PR-579.patch 2012-05-29 23:03:57 UTC (rev 93754)
@@ -0,0 +1,50 @@
+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/20120529/eb47e2d2/attachment.html>
More information about the macports-changes
mailing list