From b53736167a3bb15a6fc9dc72394134790a44c704 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 23 Oct 2010 14:01:08 +0900
Subject: [PATCH] fix osx build on python2.7/qt4.7

will roll this back if there are problems with the cocoa port
---
 mac/make_local.sh         |   2 +-
 mac/set-dmg-settings.scpt | Bin 4178 -> 4154 bytes
 mac/setup.py              |  10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mac/make_local.sh b/mac/make_local.sh
index 32131dd4b..02245e87e 100755
--- a/mac/make_local.sh
+++ b/mac/make_local.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PYTHON=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6
+PYTHON=/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7
 
 if [ "x$debug" = "x" ]; then
     echo "cleaning up..."
diff --git a/mac/set-dmg-settings.scpt b/mac/set-dmg-settings.scpt
index 1d1fe4cd6931f84aa6584a7cf8f886894d3f8bbe..83a43e39084a52afbeb1e70b16816e8c368db000 100644
GIT binary patch
delta 147
zcmcbluuEZs6F1Wij>&=Cu9FkEc_&Zf7UYUzU}9io@lDLk0}6|apIEj2wud$Y5HKck
zxn<_1q!#HV78C&G%-Q;wj&C%bH(7?qNbAHZLvNrOK?V*6hT|Ky^MTYe@PIS{u`CeF
l0FBiKo7%wR%FV^V!r;r0$dJj9xA_5&H!~Ca;>o%KssL?HBn$um

delta 190
zcmdm`a7kf<6F1WZj>&=Cu9FkEc_&Zf7PKg0U}9k8@l8z5%qz(+&QS1hVL%0kAHUz_
zp$!yEie1a)mYJ85TBMg)PyjT<j6Lb4@Ua;;8Yj!}7#SUY9Lfb$CCI?Rz;JAa_d_6?
zk%0%K3y8CTI1^}-F|tLID|lR`rGRRD84?+i88R927)luO8HyP)7!(*h7+f}=;PGZ=
L;`=jMR6rE~SB^3`

diff --git a/mac/setup.py b/mac/setup.py
index 1cf60a9f2..69fdfb42b 100644
--- a/mac/setup.py
+++ b/mac/setup.py
@@ -28,11 +28,11 @@ class bdist_dmg(Command):
 	def run(self):
                 self.run_command('py2app')
                 os.system("\
-mkdir -p dist/Anki.app/Contents/Resources/include/python2.6")
+mkdir -p dist/Anki.app/Contents/Resources/include/python2.7")
                 os.system("\
-cp /Library/Frameworks/Python.framework/Versions/2.6/include/\
-python2.6/pyconfig.h dist/Anki.app/Contents/Resources/include/\
-python2.6/pyconfig.h")
+cp /Library/Frameworks/Python.framework/Versions/2.7/include/\
+python2.7/pyconfig.h dist/Anki.app/Contents/Resources/include/\
+python2.7/pyconfig.h")
                 os.system("\
 chmod a+x dist/Anki.app/Contents/Resources/audio/mplayer")
                 if 'debug' in os.environ:
@@ -61,7 +61,7 @@ PLIST = dict(
 	CFBundleLocalizations = ['en'],
         )
 OPTIONS = {
-	'argv_emulation': True,
+	'argv_emulation': False,
     'optimize': 0,
         'alias': 'debug' in os.environ and os.environ['debug'] == "2",
 	'plist': PLIST,