[Scummvm-cvs-logs] scummvm master -> f83b53ad6bdf58a90791c3c1123f427cf5b7ddb7

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a9d692a2b3 DISTS: Fix language codes in MacOS X Info.plist file
f83b53ad6b MACOSX: Remove -lSystemStubs from the link for scummvm-static


Commit: a9d692a2b3eec9004ad369f79a21c09c7c4ee90c
    https://github.com/scummvm/scummvm/commit/a9d692a2b3eec9004ad369f79a21c09c7c4ee90c
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2011-10-03T16:35:05-07:00

Commit Message:
DISTS: Fix language codes in MacOS X Info.plist file

It should either use ISO 639-1 or ISO 639-2  codes. Since we use
ISO 639-1 codes for the language part of the po file names I used
the same codes here.

Changed paths:
    dists/macosx/Info.plist
    dists/macosx/Info.plist.in



diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 83d9838..96238e4 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -7,16 +7,21 @@
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
+		<string>ca</string>
+		<string>cs</string>
 		<string>da</string>
 		<string>de</string>
 		<string>es</string>
 		<string>fr</string>
 		<string>hu</string>
 		<string>it</string>
-		<string>no</string>
+		<string>nb</string>
+		<string>nn</string>
 		<string>pl</string>
-		<string>se</string>
+		<string>pt</string>
 		<string>ru</string>
+		<string>se</string>
+		<string>uk</string>
 	</array>
 	<key>CFBundleDisplayName</key>
 	<string>ScummVM</string>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 0593aa2..b251f32 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -7,16 +7,21 @@
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
+		<string>ca</string>
+		<string>cs</string>
 		<string>da</string>
 		<string>de</string>
 		<string>es</string>
 		<string>fr</string>
 		<string>hu</string>
 		<string>it</string>
-		<string>no</string>
+		<string>nb</string>
+		<string>nn</string>
 		<string>pl</string>
-		<string>se</string>
+		<string>pt</string>
 		<string>ru</string>
+		<string>se</string>
+		<string>uk</string>
 	</array>
 	<key>CFBundleDisplayName</key>
 	<string>ScummVM</string>


Commit: f83b53ad6bdf58a90791c3c1123f427cf5b7ddb7
    https://github.com/scummvm/scummvm/commit/f83b53ad6bdf58a90791c3c1123f427cf5b7ddb7
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2011-10-03T16:35:05-07:00

Commit Message:
MACOSX: Remove -lSystemStubs from the link for scummvm-static

This should fix bug #3407662: SystemStubs library no longer available
on 10.7. I tested compilation on 10.6 and there is no link error after
removing it. Hopefully it will work on older systems as well.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 0031156..62a4803 100644
--- a/ports.mk
+++ b/ports.mk
@@ -129,8 +129,7 @@ scummvm-static: $(OBJS)
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB) \
-		$(OSX_ICONV) \
-		-lSystemStubs
+		$(OSX_ICONV)
 
 # Special target to create a static linked binary for the iPhone
 iphone: $(OBJS)