From b769bd32e887d72a77cfdca163ee576b9b562e27 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Aug 2021 15:30:10 +0200
Subject: [PATCH] Reorder keys in Info.plist files used by configure

Just put the keys in the same order as the one used in Xcode template
and samples/minimal/Info_cocoa.plist based on it (which is almost
alphabetical order, except for LSMinimumSystemVersion which comes after
NSPrincipalClass at the very end for whatever reason).

No real changes.
---
 samples/docview/Info.plist.in | 42 +++++++++++++++++------------------
 src/osx/carbon/Info.plist.in  | 32 +++++++++++++-------------
 src/osx/iphone/Info.plist.in  | 36 +++++++++++++++---------------
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/samples/docview/Info.plist.in b/samples/docview/Info.plist.in
index 1a8f2e4a6e..e3a8beb51e 100644
--- a/samples/docview/Info.plist.in
+++ b/samples/docview/Info.plist.in
@@ -2,19 +2,8 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>de</string>
-		<string>en</string>
-		<string>fr</string>
-		<string>it</string>
-	</array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -61,27 +50,38 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>EXECUTABLE</string>
+	<key>CFBundleGetInfoString</key>
+	<string>EXECUTABLE version VERSION, (c) 2002-2008 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wxwindows.IDENTIFIER</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>de</string>
+		<string>en</string>
+		<string>fr</string>
+		<string>it</string>
+	</array>
+	<key>CFBundleLongVersionString</key>
+	<string>VERSION, (c) 2002-2008 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>EXECUTABLE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>WXMA</string>
 	<key>CFBundleVersion</key>
 	<string>VERSION</string>
-	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
-	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2008 wxWidgets</string>
-	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2008 wxWidgets</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2008 wxWidgets</string>
-	<key>LSRequiresCarbon</key>
-	<true/>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2002-2008 wxWidgets</string>
 </dict>
 </plist>
diff --git a/src/osx/carbon/Info.plist.in b/src/osx/carbon/Info.plist.in
index 5f9c8f0338..a3b899c350 100644
--- a/src/osx/carbon/Info.plist.in
+++ b/src/osx/carbon/Info.plist.in
@@ -2,14 +2,18 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
-	<key>NSPrincipalClass</key>
-	<string>wxNSApplication</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>EXECUTABLE</string>
+	<key>CFBundleGetInfoString</key>
+	<string>EXECUTABLE version VERSION, (c) 2002-2018 wxWidgets</string>
+	<key>CFBundleIconFile</key>
+	<string>wxmac.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wxwindows.IDENTIFIER</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>de</string>
@@ -17,24 +21,18 @@
 		<string>fr</string>
 		<string>it</string>
 	</array>
-	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
+	<key>CFBundleLongVersionString</key>
+	<string>VERSION, (c) 2002-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>EXECUTABLE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>VERSION</string>
-	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
-	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2018 wxWidgets</string>
-	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2018 wxWidgets</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2002-2018 wxWidgets</string>
 	<key>LSRequiresCarbon</key>
@@ -43,5 +41,7 @@
 	<true/>
 	<key>ATSApplicationFontsPath</key>
 	<string>Fonts</string>
+	<key>NSPrincipalClass</key>
+	<string>wxNSApplication</string>
 </dict>
 </plist>
diff --git a/src/osx/iphone/Info.plist.in b/src/osx/iphone/Info.plist.in
index 7701d5fa40..5f4f3dfee9 100644
--- a/src/osx/iphone/Info.plist.in
+++ b/src/osx/iphone/Info.plist.in
@@ -2,12 +2,16 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>EXECUTABLE</string>
+	<key>CFBundleGetInfoString</key>
+	<string>EXECUTABLE version VERSION, (c) 2002-2019 wxWidgets</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wxwindows.IDENTIFIER</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>de</string>
@@ -15,24 +19,12 @@
 		<string>fr</string>
 		<string>it</string>
 	</array>
-	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
+	<key>CFBundleLongVersionString</key>
+	<string>VERSION, (c) 2002-2019 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>EXECUTABLE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>VERSION</string>
-	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
-	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2019 wxWidgets</string>
-	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2019 wxWidgets</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2019 wxWidgets</string>
 	<key>CFBundlePrimaryIcon</key>
 	<dict>
 		<key>CFBundleIconFiles</key>
@@ -42,5 +34,13 @@
 		<key>CFBundleIconName</key>
 		<string>AppIcon</string>
 	</dict>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleShortVersionString</key>
+	<string>VERSION</string>
+	<key>CFBundleVersion</key>
+	<string>VERSION</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2002-2019 wxWidgets</string>
 </dict>
 </plist>