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 ++++--
 src/leap/bitmask/mua/pixelizer.py | 18 +++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

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,
diff --git a/src/leap/bitmask/mua/pixelizer.py b/src/leap/bitmask/mua/pixelizer.py
index d0bb410c..297a4f60 100644
--- a/src/leap/bitmask/mua/pixelizer.py
+++ b/src/leap/bitmask/mua/pixelizer.py
@@ -42,15 +42,15 @@ from leap.common.config import get_path_prefix
 from leap.bitmask.keymanager import KeyNotFound
 
 try:
-    from pixelated.adapter.mailstore import LeapMailStore
-    from pixelated.application import SingleUserServicesFactory
-    from pixelated.application import UserAgentMode
-    from pixelated.application import start_site
-    from pixelated.bitmask_libraries.smtp import LeapSMTPConfig
-    from pixelated.config.sessions import SessionCache
-    from pixelated.config import services
-    from pixelated.resources import set_static_folder
-    from pixelated.resources.root_resource import RootResource
+    from leap.pixelated.adapter.mailstore import LeapMailStore
+    from leap.pixelated.application import SingleUserServicesFactory
+    from leap.pixelated.application import UserAgentMode
+    from leap.pixelated.application import start_site
+    from leap.pixelated.bitmask_libraries.smtp import LeapSMTPConfig
+    from leap.pixelated.config.sessions import SessionCache
+    from leap.pixelated.config import services
+    from leap.pixelated.resources import set_static_folder
+    from leap.pixelated.resources.root_resource import RootResource
     import leap.pixelated_www
     HAS_PIXELATED = True
 
-- 
cgit v1.2.3