[pyzo] 61/68: Fix freezing on OS X

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository pyzo.

commit 0742d0636b742b1c20da7d10896ec669fab2c7be
Author: Almar Klein <almarklein at Almar-Kleins-Mac.local>
Date:   Tue Sep 27 01:28:09 2016 +0200

    Fix freezing on OS X
---
 freezeScript.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/freezeScript.py b/freezeScript.py
index b12e790..7ea574e 100755
--- a/freezeScript.py
+++ b/freezeScript.py
@@ -93,7 +93,7 @@ else:
 
 excludes.extend(PySideModules)
 excludes.extend(PyQt4Modules)
-excludes.extend(PySideModules)
+excludes.extend(PyQt5Modules)
 
 for mod in includes:
     if mod in excludes:
@@ -330,7 +330,7 @@ if applicationBundle:
     # Move PyQt4 libs into subdir
     # This gets us a similar dir structure as installed so
     # we dont have to fix paths ...
-    if True:  # IF FREEZING FROM CONDA
+    if False:  # IF FREEZING FROM CONDA
         os.makedirs(distDir+'source/more/' + QT_API)
         open(distDir+'source/more/' + QT_API + '/__init__.py', 'wb').close()
         for fname in os.listdir(distDir):
@@ -387,7 +387,13 @@ if applicationBundle:
     shutil.copy(baseDir+'Info.plist',contentsDir+'Info.plist')
     
     #Copy the qt_menu.nib directory (TODO: is this the place to look for it?)
-    shutil.copytree('/opt/local/Library/Frameworks/QtGui.framework/Versions/4/Resources/qt_menu.nib',resourcesDir+'qt_menu.nib')
+    potential_dirs = ['/opt/local/libexec/qt4/Library/Frameworks/QtGui.framework/Versions/4/Resources/', '/opt/local/Library/Frameworks/QtGui.framework/Versions/4/Resources/']
+    for d in potential_dirs:
+        if os.path.isdir(d + 'qt_menu.nib'):
+            shutil.copytree(d + 'qt_menu.nib', resourcesDir+'qt_menu.nib')
+            break
+    else:
+        raise RuntimeError('Could not find qt_menu.nib')
 
 
     #Package in a dmg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyzo.git