From ce351c5c1c29adb18f2afed701dba8bbfaeb65ac Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 11 Dec 2017 00:04:20 -0800
Subject: [pkg] import changes for qt5 to work
---
pkg/build_osx_bundle_with_venv.sh | 2 ++
pkg/pyinst/app.spec | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'pkg')
diff --git a/pkg/build_osx_bundle_with_venv.sh b/pkg/build_osx_bundle_with_venv.sh
index 370f6cca..18e4d98f 100755
--- a/pkg/build_osx_bundle_with_venv.sh
+++ b/pkg/build_osx_bundle_with_venv.sh
@@ -37,6 +37,8 @@ $VIRTUAL_ENV/bin/pip install -r pkg/requirements-osx.pip
make dev-gui
make dev-mail
+# TODO -- pixelated check for gpg needs to be patched.
+
# $VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask
# $VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index c40fe9d3..db0a1212 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -44,8 +44,9 @@ if IS_WIN:
elif IS_MAC:
hiddenimports.extend(['pywebview', 'pyobjc'])
hiddenimports.extend(
- ['PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWidgets',
+ ['PyQt5.QtWidgets', 'PyQt5.QtCore',
'leap.bitmask.gui.icons_rc'])
+ print "Added PyQt5 to the venv"
excludes = ['IPython', 'PySide']
else:
hiddenimports.extend(
@@ -64,7 +65,8 @@ else:
a = Analysis(ENTRYPOINT,
pathex=[
- '/usr/lib/python2.7/dist-packages/'],
+ '/usr/lib/python2.7/dist-packages/',
+ '/usr/local/lib/python2.7/site-packages/'],
binaries=None,
datas=None,
hiddenimports=hiddenimports,
--
cgit v1.2.3