Merge remote-tracking branch 'origin/released'

2 files changed, 34 insertions, 31 deletions

diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 5b38eae32..048e7875b 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -191,6 +191,9 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) activateX:(OSX_BOOL)state {
+    if (_x_active == state)
+        return;
+
     DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
     if (state) {
         if(bgMouseLocationUpdated) {
diff --git a/xorg-server/hw/xquartz/bundle/mk_bundke.sh b/xorg-server/hw/xquartz/bundle/mk_bundke.sh
index 37e555f9e..288c6a9de 100644
--- a/xorg-server/hw/xquartz/bundle/mk_bundke.sh
+++ b/xorg-server/hw/xquartz/bundle/mk_bundke.sh
@@ -1,31 +1,31 @@
-#!/bin/sh

-#

-# 'Cause xcodebuild is hard to deal with

-

-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"

-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

-    [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1

-

-    for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do

-        install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}

-    done

-done

-

-install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib

-install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources

-

-install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents

-install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents

-

-mkdir -p ${BUNDLE_ROOT}/Contents/MacOS

-install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11

-

-if [[ $(id -u) == 0 ]] ; then

-	chown -R root:admin ${BUNDLE_ROOT}

-fi

+#!/bin/sh
+#
+# 'Cause xcodebuild is hard to deal with
+
+SRCDIR=$1
+BUILDDIR=$2
+BUNDLE_ROOT=$3
+
+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
+    [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
+
+    for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do
+        install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
+    done
+done
+
+install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
+install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
+
+install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents
+install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents
+
+mkdir -p ${BUNDLE_ROOT}/Contents/MacOS
+install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
+
+if [[ $(id -u) == 0 ]] ; then
+	chown -R root:admin ${BUNDLE_ROOT}
+fi