[Xquartz-changes] xserver: Branch 'server-1.16-branch' - 7 commits

Jeremy Huddleston jeremyhu at freedesktop.org
Tue Oct 13 14:20:38 PDT 2015 

Rebased ref, commits from common ancestor:
commit 29a418b15edd448ae66e2cd318dc456929ce0bfc
Author: Ken Thomases <ken at codeweavers.com>
Date:   Mon Oct 12 16:45:41 2015 -0700

    XQuartz: Fix how we calculate the height of the OSX menu bar
    
    +[NSScreen mainScreen] does not mean the primary display.  It used to mean the
    one with the key window.  When "Displays have separate spaces" is enabled, it
    means the active screen, the one whose menu bar is mostly opaque.  As such, it
    may not be the screen whose lower-left corner is located at (0, 0).  That's
    why its max-Y is not necessarily comparable to its height.  That only works
    for the primary display.
    
    This code could use [[NSScreen screens] firstObject].  This is always the
    primary display, the one whose lower-left corner is at (0, 0).
    
    Once that's done, the above change should be reverted.  The height of the
    visible frame would be the full height of the screen minus the menu bar _and
    the Dock_ if the Dock is along the bottom of the screen.
    
    Actually, there's a theoretically-simpler approach: use
    -[NSMenu menuBarHeight].  That replaces a long-deprecated method
    +[NSMenuView menuBarHeight].  However, there was a bug in Tiger that led to
    the former not working while the latter still worked. I haven't actually
    checked recently.
    
    CrossOver's still-kicking X server code uses this code, which tries all of
    the above:
    
           NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
           aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight];
           if (!aquaMenuBarHeight) aquaMenuBarHeight = [NSMenuView menuBarHeight];
           if (!aquaMenuBarHeight) aquaMenuBarHeight =
               NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]);
    
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Signed-off-by: Ken Thomases <ken at codeweavers.com>
    (cherry picked from commit 4513f924a7065edbd267cf96837af94ce5a58a6f)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 8a928ba..d2c5d30 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1238,8 +1238,16 @@ X11ApplicationMain(int argc, char **argv, char **envp)
     QuartzModeBundleInit();
 
     /* Calculate the height of the menubar so we can avoid it. */
-    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-                        NSMaxY([[NSScreen mainScreen] visibleFrame]);
+    aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight];
+#if ! __LP64__
+    if (!aquaMenuBarHeight) {
+        aquaMenuBarHeight = [NSMenuView menuBarHeight];
+    }
+#endif
+    if (!aquaMenuBarHeight) {
+        NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
+        aquaMenuBarHeight = NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]);
+    }
 
 #ifdef HAVE_LIBDISPATCH
     eventTranslationQueue = dispatch_queue_create(
commit fbefe5e78c9b7ad83a7a4adc39c972ba3b000750
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Oct 12 02:06:10 2015 -0700

    XQuartz: Remove InfoPlist.strings
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 6e6827aac33eddeacfb37ef3d7b0397b1446bf66)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 87392b4..0740752 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -30,153 +30,123 @@ EXTRA_DIST = \
 	Info.plist.cpp \
 	PkgInfo \
 	$(resource_DATA) \
-	Resources/ar.lproj/InfoPlist.strings \
 	Resources/ar.lproj/Localizable.strings \
 	Resources/ar.lproj/locversion.plist \
 	Resources/ar.lproj/main.nib/designable.nib \
 	Resources/ar.lproj/main.nib/keyedobjects.nib \
-	Resources/ca.lproj/InfoPlist.strings \
 	Resources/ca.lproj/Localizable.strings \
 	Resources/ca.lproj/locversion.plist \
 	Resources/ca.lproj/main.nib/designable.nib \
 	Resources/ca.lproj/main.nib/keyedobjects.nib \
-	Resources/cs.lproj/InfoPlist.strings \
 	Resources/cs.lproj/Localizable.strings \
 	Resources/cs.lproj/locversion.plist \
 	Resources/cs.lproj/main.nib/designable.nib \
 	Resources/cs.lproj/main.nib/keyedobjects.nib \
-	Resources/da.lproj/InfoPlist.strings \
 	Resources/da.lproj/Localizable.strings \
 	Resources/da.lproj/locversion.plist \
 	Resources/da.lproj/main.nib/designable.nib \
 	Resources/da.lproj/main.nib/keyedobjects.nib \
-	Resources/Dutch.lproj/InfoPlist.strings \
 	Resources/Dutch.lproj/Localizable.strings \
 	Resources/Dutch.lproj/locversion.plist \
 	Resources/Dutch.lproj/main.nib/designable.nib \
 	Resources/Dutch.lproj/main.nib/keyedobjects.nib \
-	Resources/el.lproj/InfoPlist.strings \
 	Resources/el.lproj/Localizable.strings \
 	Resources/el.lproj/locversion.plist \
 	Resources/el.lproj/main.nib/designable.nib \
 	Resources/el.lproj/main.nib/keyedobjects.nib \
-	Resources/English.lproj/InfoPlist.strings \
 	Resources/English.lproj/Localizable.strings \
 	Resources/English.lproj/locversion.plist \
 	Resources/English.lproj/main.nib/designable.nib \
 	Resources/English.lproj/main.nib/keyedobjects.nib \
-	Resources/fi.lproj/InfoPlist.strings \
 	Resources/fi.lproj/Localizable.strings \
 	Resources/fi.lproj/locversion.plist \
 	Resources/fi.lproj/main.nib/designable.nib \
 	Resources/fi.lproj/main.nib/keyedobjects.nib \
-	Resources/French.lproj/InfoPlist.strings \
 	Resources/French.lproj/Localizable.strings \
 	Resources/French.lproj/locversion.plist \
 	Resources/French.lproj/main.nib/designable.nib \
 	Resources/French.lproj/main.nib/keyedobjects.nib \
-	Resources/German.lproj/InfoPlist.strings \
 	Resources/German.lproj/Localizable.strings \
 	Resources/German.lproj/locversion.plist \
 	Resources/German.lproj/main.nib/designable.nib \
 	Resources/German.lproj/main.nib/keyedobjects.nib \
-	Resources/he.lproj/InfoPlist.strings \
 	Resources/he.lproj/Localizable.strings \
 	Resources/he.lproj/locversion.plist \
 	Resources/he.lproj/main.nib/designable.nib \
 	Resources/he.lproj/main.nib/keyedobjects.nib \
-	Resources/hr.lproj/InfoPlist.strings \
 	Resources/hr.lproj/Localizable.strings \
 	Resources/hr.lproj/locversion.plist \
 	Resources/hr.lproj/main.nib/designable.nib \
 	Resources/hr.lproj/main.nib/keyedobjects.nib \
-	Resources/hu.lproj/InfoPlist.strings \
 	Resources/hu.lproj/Localizable.strings \
 	Resources/hu.lproj/locversion.plist \
 	Resources/hu.lproj/main.nib/designable.nib \
 	Resources/hu.lproj/main.nib/keyedobjects.nib \
-	Resources/Italian.lproj/InfoPlist.strings \
 	Resources/Italian.lproj/Localizable.strings \
 	Resources/Italian.lproj/locversion.plist \
 	Resources/Italian.lproj/main.nib/designable.nib \
 	Resources/Italian.lproj/main.nib/keyedobjects.nib \
-	Resources/Japanese.lproj/InfoPlist.strings \
 	Resources/Japanese.lproj/Localizable.strings \
 	Resources/Japanese.lproj/locversion.plist \
 	Resources/Japanese.lproj/main.nib/designable.nib \
 	Resources/Japanese.lproj/main.nib/keyedobjects.nib \
-	Resources/ko.lproj/InfoPlist.strings \
 	Resources/ko.lproj/Localizable.strings \
 	Resources/ko.lproj/locversion.plist \
 	Resources/ko.lproj/main.nib/designable.nib \
 	Resources/ko.lproj/main.nib/keyedobjects.nib \
-	Resources/no.lproj/InfoPlist.strings \
 	Resources/no.lproj/Localizable.strings \
 	Resources/no.lproj/locversion.plist \
 	Resources/no.lproj/main.nib/designable.nib \
 	Resources/no.lproj/main.nib/keyedobjects.nib \
-	Resources/pl.lproj/InfoPlist.strings \
 	Resources/pl.lproj/Localizable.strings \
 	Resources/pl.lproj/locversion.plist \
 	Resources/pl.lproj/main.nib/designable.nib \
 	Resources/pl.lproj/main.nib/keyedobjects.nib \
-	Resources/pt.lproj/InfoPlist.strings \
 	Resources/pt.lproj/Localizable.strings \
 	Resources/pt.lproj/locversion.plist \
 	Resources/pt.lproj/main.nib/designable.nib \
 	Resources/pt.lproj/main.nib/keyedobjects.nib \
-	Resources/pt_PT.lproj/InfoPlist.strings \
 	Resources/pt_PT.lproj/Localizable.strings \
 	Resources/pt_PT.lproj/locversion.plist \
 	Resources/pt_PT.lproj/main.nib/designable.nib \
 	Resources/pt_PT.lproj/main.nib/keyedobjects.nib \
-	Resources/ro.lproj/InfoPlist.strings \
 	Resources/ro.lproj/Localizable.strings \
 	Resources/ro.lproj/locversion.plist \
 	Resources/ro.lproj/main.nib/designable.nib \
 	Resources/ro.lproj/main.nib/keyedobjects.nib \
-	Resources/ru.lproj/InfoPlist.strings \
 	Resources/ru.lproj/Localizable.strings \
 	Resources/ru.lproj/locversion.plist \
 	Resources/ru.lproj/main.nib/designable.nib \
 	Resources/ru.lproj/main.nib/keyedobjects.nib \
-	Resources/sk.lproj/InfoPlist.strings \
 	Resources/sk.lproj/Localizable.strings \
 	Resources/sk.lproj/locversion.plist \
 	Resources/sk.lproj/main.nib/designable.nib \
 	Resources/sk.lproj/main.nib/keyedobjects.nib \
-	Resources/Spanish.lproj/InfoPlist.strings \
 	Resources/Spanish.lproj/Localizable.strings \
 	Resources/Spanish.lproj/locversion.plist \
 	Resources/Spanish.lproj/main.nib/designable.nib \
 	Resources/Spanish.lproj/main.nib/keyedobjects.nib \
-	Resources/sv.lproj/InfoPlist.strings \
 	Resources/sv.lproj/Localizable.strings \
 	Resources/sv.lproj/locversion.plist \
 	Resources/sv.lproj/main.nib/designable.nib \
 	Resources/sv.lproj/main.nib/keyedobjects.nib \
-	Resources/th.lproj/InfoPlist.strings \
 	Resources/th.lproj/Localizable.strings \
 	Resources/th.lproj/locversion.plist \
 	Resources/th.lproj/main.nib/designable.nib \
 	Resources/th.lproj/main.nib/keyedobjects.nib \
-	Resources/tr.lproj/InfoPlist.strings \
 	Resources/tr.lproj/Localizable.strings \
 	Resources/tr.lproj/locversion.plist \
 	Resources/tr.lproj/main.nib/designable.nib \
 	Resources/tr.lproj/main.nib/keyedobjects.nib \
-	Resources/uk.lproj/InfoPlist.strings \
 	Resources/uk.lproj/Localizable.strings \
 	Resources/uk.lproj/locversion.plist \
 	Resources/uk.lproj/main.nib/designable.nib \
 	Resources/uk.lproj/main.nib/keyedobjects.nib \
 	Resources/X11.icns \
-	Resources/zh_CN.lproj/InfoPlist.strings \
 	Resources/zh_CN.lproj/Localizable.strings \
 	Resources/zh_CN.lproj/locversion.plist \
 	Resources/zh_CN.lproj/main.nib/designable.nib \
 	Resources/zh_CN.lproj/main.nib/keyedobjects.nib \
-	Resources/zh_TW.lproj/InfoPlist.strings \
 	Resources/zh_TW.lproj/Localizable.strings \
 	Resources/zh_TW.lproj/locversion.plist \
 	Resources/zh_TW.lproj/main.nib/designable.nib \
diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
deleted file mode 100644
index 8f978d6..0000000
Binary files a/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
deleted file mode 100644
index 88e1f04..0000000
Binary files a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
deleted file mode 100644
index 88e1f04..0000000
Binary files a/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
deleted file mode 100644
index aa37e75..0000000
Binary files a/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
deleted file mode 100644
index 4121698..0000000
Binary files a/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
deleted file mode 100644
index 2d6330f..0000000
Binary files a/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
deleted file mode 100644
index 0e4287d..0000000
Binary files a/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings
deleted file mode 100644
index 88e1f04..0000000
Binary files a/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings
deleted file mode 100644
index 95214ff..0000000
Binary files a/hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings
deleted file mode 100644
index 0f74e7c..0000000
Binary files a/hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
deleted file mode 100644
index 88e1f04..0000000
Binary files a/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings
deleted file mode 100644
index 72eb2b1..0000000
Binary files a/hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
deleted file mode 100644
index 8e4f647..0000000
Binary files a/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings
deleted file mode 100644
index 3dd6946..0000000
Binary files a/hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings
deleted file mode 100644
index 7baab08..0000000
Binary files a/hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings
deleted file mode 100644
index 842ef04..0000000
Binary files a/hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
deleted file mode 100644
index 4c738f8..0000000
Binary files a/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings
deleted file mode 100644
index eb1cfb0..0000000
Binary files a/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings
deleted file mode 100644
index b9c9502..0000000
Binary files a/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings
deleted file mode 100644
index 33c6374..0000000
Binary files a/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings
deleted file mode 100644
index 33c6374..0000000
Binary files a/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings
deleted file mode 100644
index dba225f..0000000
Binary files a/hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings
deleted file mode 100644
index 7f722e4..0000000
Binary files a/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings
deleted file mode 100644
index 53b3005..0000000
Binary files a/hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings
deleted file mode 100644
index 1522655..0000000
Binary files a/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings
deleted file mode 100644
index 51d294b..0000000
Binary files a/hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings
deleted file mode 100644
index 2e003a7..0000000
Binary files a/hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings
deleted file mode 100644
index 1153eaf..0000000
Binary files a/hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings
deleted file mode 100644
index b5df368..0000000
Binary files a/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings
deleted file mode 100644
index d56e1de..0000000
Binary files a/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings and /dev/null differ
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 288c6a9..632e5f7 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -12,7 +12,7 @@ for lang in ${localities} ; do
     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
+    for f in Localizable.strings main.nib/keyedobjects.nib ; do
         install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
     done
 done
commit fa848c31ba3e74d05b9408506f553d5612031de8
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Oct 12 02:04:11 2015 -0700

    XQuartz: Relax App Transport Security for communicating with the update server
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit df80e2649aa47957986554928e6bf41b86c15240)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index a0d9050..06e33f8 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -35,6 +35,19 @@
 		<string>sparkle.pem</string>
         <key>SUFeedURL</key>
                 <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>macosforge.org</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 #endif
 	<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>
commit 5788401a9acba603d86161e716cc3e1f83ac8e44
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Jun 9 23:41:12 2015 -0700

    XQuartz: Silence -Wformat-security for NSRunAlertPanel
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 9003a3e5c55903ce4e371b2d5cb5030b5f97ae0e)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 2efbd65..8a928ba 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1069,12 +1069,12 @@ X11ApplicationCanEnterRandR(void)
     if (!XQuartzIsRootless)
         QuartzShowFullscreen(FALSE);
 
-    switch (NSRunAlertPanel(title, msg,
+    switch (NSRunAlertPanel(title, @"%@",
                             NSLocalizedString(@"Allow",
                                               @""),
                             NSLocalizedString(@"Cancel",
                                               @""),
-                            NSLocalizedString(@"Always Allow", @""))) {
+                            NSLocalizedString(@"Always Allow", @""), msg)) {
     case NSAlertOtherReturn:
         [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];
         [X11App prefs_synchronize];
@@ -1122,10 +1122,10 @@ X11ApplicationFatalError(const char *f, va_list args)
      */
     dispatch_sync(dispatch_get_main_queue(), ^{
                       if (NSAlertDefaultReturn ==
-                          NSRunAlertPanel (title, msg,
+                          NSRunAlertPanel (title, @"%@",
                                            NSLocalizedString (@"Quit", @""),
-                                           NSLocalizedString (
-                                               @"Report...", @""), nil)) {
+                                           NSLocalizedString (@"Report...", @""),
+                                           nil, msg)) {
                           exit (EXIT_FAILURE);
                       }
                   });
@@ -1160,9 +1160,8 @@ check_xinitrc(void)
             @"Startup xinitrc dialog");
 
     if (NSAlertDefaultReturn ==
-        NSRunAlertPanel(nil, msg, NSLocalizedString(@"Yes", @""),
-                        NSLocalizedString(@"No",
-                                          @""), nil)) {
+        NSRunAlertPanel(nil, @"%@", NSLocalizedString(@"Yes", @""),
+                        NSLocalizedString(@"No", @""), nil, msg)) {
         char buf2[1024];
         int i = -1;
 
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index a5c5138..c75493c 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -929,9 +929,9 @@ extern char *bundle_id_prefix;
      *        and then run the alert on a timer? It seems to work here, so..
      */
 
-    return (NSRunAlertPanel(title, msg, NSLocalizedString(@"Quit", @""),
-                            NSLocalizedString(@"Cancel", @""), nil)
-            == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
+    NSInteger result = NSRunAlertPanel(title, @"%@", NSLocalizedString(@"Quit", @""),
+                                       NSLocalizedString(@"Cancel", @""), nil, msg);
+    return (result == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
 }
 
 - (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
commit e39ffe687bd12fb8ff278073060f7d48769bccc0
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Jun 9 23:34:50 2015 -0700

    XQuartz: Silence -Wunused-function
    
    quartzKeyboard.c:741:1: warning: unused function 'macroman2ucs' [-Wunused-function,Unused Entity Issue]
    macroman2ucs(unsigned char c)
    ^
    1 warning generated.
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 3a6fa115759c787ec34483437021ad1e55c52423)

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 84e34d9..2fed593 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -737,6 +737,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
     return 1;
 }
 
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
 static inline UniChar
 macroman2ucs(unsigned char c)
 {
@@ -782,6 +783,7 @@ macroman2ucs(unsigned char c)
     if (c < 128) return c;
     else return table[c - 128];
 }
+#endif
 
 static KeySym
 make_dead_key(KeySym in)
commit 9aebf5f8bf8317e63b26719a5d6fd55a29a7d829
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Jun 9 23:30:50 2015 -0700

    XQuartz: Silence -Wunused-variable
    
    X11Controller.m:939:9: warning: unused variable 'remain' [-Wunused-variable,Unused Entity Issue]
        int remain;
            ^
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 9fe7f5ccada37e2d2a2fa92064b92a0334a3fcdd)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index c3c6976..a5c5138 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -936,7 +936,6 @@ extern char *bundle_id_prefix;
 
 - (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
 {
-    int remain;
     [X11App prefs_synchronize];
 
     /* shutdown the X server, it will exit () for us. */
commit f28810c4ca90b397cd3e9856b51350804162596f
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Jun 9 23:29:40 2015 -0700

    XQuartz: Silence -Wpointer-bool-conversion
    
    X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true'
          [-Werror,-Wpointer-bool-conversion,Value Conversion Issue]
                if (asl_log_descriptor) {
                ~~  ^~~~~~~~~~~~~~~~~~
    X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue]
                if (asl_log_descriptor) {
                    ^
                    &
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit 0b9c32489131a5723bd78decf5d2557b94207cf4)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 022e832..c3c6976 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -364,7 +364,7 @@ extern char *bundle_id_prefix;
     }
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-    if (asl_log_descriptor) {
+    if (&asl_log_descriptor) {
         char *asl_sender;
         aslmsg amsg = asl_new(ASL_TYPE_MSG);
         assert(amsg);
@@ -414,7 +414,7 @@ extern char *bundle_id_prefix;
 
         case 0:                                     /* child2 */
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-            if (asl_log_descriptor) {
+            if (&asl_log_descriptor) {
                 /* Replace our stdout/stderr */
                 dup2(stdout_pipe[1], STDOUT_FILENO);
                 dup2(stderr_pipe[1], STDERR_FILENO);
@@ -443,7 +443,7 @@ extern char *bundle_id_prefix;
     }
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-    if (asl_log_descriptor) {
+    if (&asl_log_descriptor) {
         /* Close the write ends of the pipe */
         close(stdout_pipe[1]);
         close(stderr_pipe[1]);

More information about the Xquartz-changes mailing list