From 11d97848200b6de959a1692989763644dae8e76f Mon Sep 17 00:00:00 2001
From: rgaudin <rgaudin@gmail.com>
Date: Tue, 6 May 2014 08:16:18 +0000
Subject: [PATCH] changed osx bundle/.app layout to reflect XR29/tbird

---
 src/macosx/Info.plist        | 32 ++++++++++++++++++++++++++------
 src/macosx/InfoPlist.strings |  3 +++
 src/macosx/PkgInfo           |  1 +
 src/macosx/cleanup_rpath.py  |  9 ++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 src/macosx/InfoPlist.strings
 create mode 100644 src/macosx/PkgInfo

diff --git a/src/macosx/Info.plist b/src/macosx/Info.plist
index 6be9e38..17e5547 100644
--- a/src/macosx/Info.plist
+++ b/src/macosx/Info.plist
@@ -3,7 +3,9 @@
 <plist version="1.0">
 	<dict>
 		<key>CFBundleExecutable</key>
-		<string>xulrunner</string>
+		<string>kiwix</string>
+		<key>CFBundleDisplayName</key>
+		<string>Kiwix</string>
 		<key>CFBundleGetInfoString</key>
 		<string>0.9 rc3</string>
 		<key>CFBundleIconFile</key>
@@ -11,16 +13,18 @@
 		<key>CFBundleIdentifier</key>
 		<string>org.kiwix.kiwix</string>
 		<key>CFBundleInfoDictionaryVersion</key>
-		<string>0.1</string>
+		<string>6.0</string>
 		<key>CFBundleName</key>
 		<string>Kiwix</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.9</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
+		<string>0.9 rc3</string>
 		<key>CFBundleURLTypes</key>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleSignature</key>
+		<string>KIWI</string>
 		<array>
 			<dict>
 				<key>CFBundleURLIconFile</key>
@@ -34,7 +38,7 @@
 			</dict>
 		</array>
 		<key>CFBundleVersion</key>
-		<string>1.0</string>
+		<string>1.0.1</string>
 		<key>CFBundleDocumentTypes</key>
 		<array>
 			<dict>
@@ -53,5 +57,21 @@
 				<string>Viewer</string>
 			</dict>
 		</array>
+		<key>LSApplicationCategoryType</key>
+		<string>public.app-category.productivity</string>
+	        <key>LSMinimumSystemVersion</key>
+	        <string>10.6.0</string>
+		<key>LSMinimumSystemVersionByArchitecture</key>
+		<dict>
+			<key>i386</key>
+			<string>10.6.0</string>
+			<key>x86_64</key>
+			<string>10.6.0</string>
+	        </dict>
+	        <key>NSSupportsAutomaticGraphicsSwitching</key>
+	        <true/>
+	        <key>NSPrincipalClass</key>
+	        <string>GeckoNSApplication</string>
+		<key>UTExportedTypeDeclarations</key>
 	</dict>
 </plist>
diff --git a/src/macosx/InfoPlist.strings b/src/macosx/InfoPlist.strings
new file mode 100644
index 0000000..2375798
--- /dev/null
+++ b/src/macosx/InfoPlist.strings
@@ -0,0 +1,3 @@
+
+CFBundleName = "Kiwix";
+NSHumanReadableCopyright = "Copyright © 2006-2014 Contributors.";
diff --git a/src/macosx/PkgInfo b/src/macosx/PkgInfo
new file mode 100644
index 0000000..255ca26
--- /dev/null
+++ b/src/macosx/PkgInfo
@@ -0,0 +1 @@
+APPLMOZM
\ No newline at end of file
diff --git a/src/macosx/cleanup_rpath.py b/src/macosx/cleanup_rpath.py
index 5c167eb..477a810 100755
--- a/src/macosx/cleanup_rpath.py
+++ b/src/macosx/cleanup_rpath.py
@@ -63,7 +63,7 @@ libname = u'lib%s%s.0.dylib' % (name[0].upper(), name[1:])
 
 # change ID if component to match new name/path
 if is_component:
-	os.system('install_name_tool -id %s %s' % (basename, component))	
+	os.system('install_name_tool -id %s %s' % (basename, component))
 
 # run otool to get a list of deps.
 otool = subprocess.Popen(['otool', '-L', component], stdout=subprocess.PIPE)
@@ -73,6 +73,7 @@ for line in otool_out.split('\n'):
 	if ('executable_path' in line
 		or 'libSystem' in line
 		or 'libstdc++' in line
+        or 'libgcc' in line
 		or ':' in line
 		or not len(line)
 		or 'aria2c' in basename):
@@ -90,9 +91,11 @@ for line in otool_out.split('\n'):
 	if match:
 		print("match: %s" % match.groups()[0])
 		if is_component:
-			newpath = u'@executable_path/../Frameworks/lib%s.dylib' % match.groups()[0]
+            # newpath = u'@executable_path/../Frameworks/lib%s.dylib' % match.groups()[0]
+			newpath = u'@executable_path/lib%s.dylib' % match.groups()[0]
 		elif is_binary:
-			newpath = u'@executable_path/../../Frameworks/lib%s.dylib' % match.groups()[0]
+            # newpath = u'@executable_path/../../Frameworks/lib%s.dylib' % match.groups()[0]
+			newpath = u'@executable_path/../lib%s.dylib' % match.groups()[0]
 		else:
 			newpath = u'@loader_path/lib%s.dylib' % match.groups()[0]