xserver: Branch 'server-1.10-branch' - 3 commits

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Fri Feb 24 11:42:59 PST 2012


 hw/xquartz/X11Application.m    |    6 +++++-
 hw/xquartz/bundle/mk_bundke.sh |    2 +-
 os/log.c                       |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit a43eb7357328fbd6666cbab459dcf074f99c6136
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Feb 17 13:44:12 2012 -0800

    XQuartz: Short-circuit activateX:
    
    This also avoids a deadlock when calling activateX: before the server
    thread has initialized
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit cb6a32da27f09261c4d561c19d1877c750d98cc3)
    
    Conflicts:
    
    	hw/xquartz/X11Application.m

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index b64ca1d..213618a 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -190,7 +190,11 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 
 - (void) activateX:(OSX_BOOL)state {
     size_t i;
-    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
+
+    if (_x_active == state)
+        return;
+
+    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
     if (state) {
         if(bgMouseLocationUpdated) {
             DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
commit 62159b3a31defe150ab1ff108a306d32df47aa02
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Feb 17 13:54:57 2012 -0800

    XQuartz: Actually install the new locales
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit 1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453)

diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 58d5f6a..288c6a9 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -6,7 +6,7 @@ SRCDIR=$1
 BUILDDIR=$2
 BUNDLE_ROOT=$3
 
-localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
+localities="Dutch English French German Italian Japanese Spanish ar ca cs da el fi he hr hu ko no pl pt pt_PT ro ru sk sv th tr uk zh_CN zh_TW"
 for lang in ${localities} ; do
     [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj
     mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
commit 35d14476e4c2ed5adf0f3684ab080cef2496c019
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Thu May 5 09:04:41 2011 -0700

    XQuartz: Make a copy of args for our crash reporter vsnprintf
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit b47d2e43eb2cb3817c995d1f7e58500fb40efa2b)

diff --git a/os/log.c b/os/log.c
index 9579e58..4a310e6 100644
--- a/os/log.c
+++ b/os/log.c
@@ -528,7 +528,12 @@ FatalError(const char *f, ...)
 
     va_start(args, f);
 #ifdef __APPLE__
-    (void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args);
+    {
+        va_list args2;
+        va_copy(args2, args);
+        (void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args2);
+        va_end(args2);
+    }
 #endif
     VErrorF(f, args);
     va_end(args);


More information about the xorg-commit mailing list