summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/build_bundle_with_venv.sh4
-rw-r--r--pkg/bundles/build.mk3
-rw-r--r--pkg/pyinst/app.spec5
3 files changed, 9 insertions, 3 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index d284f3f0..3b6c55af 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -22,7 +22,9 @@ echo "[+] Using venv in" $VIRTUAL_ENV
$VIRTUAL_ENV/bin/pip install appdirs packaging
# qt-plugins instability in develop: see https://github.com/pyinstaller/pyinstaller/issues/1906
-$VIRTUAL_ENV/bin/pip install -U pyinstaller==3.2.1
+# $VIRTUAL_ENV/bin/pip install -U pyinstaller==3.2.1
+# dev version
+$VIRTUAL_ENV/bin/pip install -U git+https://github.com/pyinstaller/pyinstaller.git
$VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
# fix for #8789
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index 305b16f5..6d79103f 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -49,6 +49,9 @@ bundle_linux_helpers:
cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(DIST_VERSION)/apps/helpers/
cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(DIST_VERSION)/apps/helpers/
cp /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0 $(DIST_VERSION)/lib/libGL.so.1 || echo "libGL version not found"
+ # workaround for https://github.com/pyinstaller/pyinstaller/issues/2737
+ cp /usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so $(DIST_VERSION)/lib/ || echo "libsoftokn3 not found"
+ cp /usr/lib/x86_64-linux-gnu/nss/libfreeblpriv3.so $(DIST_VERSION)/lib/ || echo "libfreeblpriv3 not found"
bundle_osx_helpers:
diff --git a/pkg/pyinst/app.spec b/pkg/pyinst/app.spec
index db0a1212..d00d540f 100644
--- a/pkg/pyinst/app.spec
+++ b/pkg/pyinst/app.spec
@@ -50,9 +50,10 @@ elif IS_MAC:
excludes = ['IPython', 'PySide']
else:
hiddenimports.extend(
- ['PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWebEngine',
+ ['PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWebEngineWidgets',
'leap.bitmask.gui.icons_rc'])
- excludes = ['IPython', 'PySide']
+ excludes = ['IPython', 'PySide',
+ 'PyQt5.QtPrintSupport', 'PyQt5.QtNetwork.py']
VENV = os.environ.get('VIRTUAL_ENV', '')