summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-01-26 03:23:53 +0100
committerKali Kaneko <kali@leap.se>2018-01-26 14:59:26 +0100
commit90dcd5a406e2a489d598544136528d44534e22a4 (patch)
treedc6a52d8e34036f7fa454df6eb742c873efb5575 /pkg
parent92965c1bb5e2c1e624a8170accd56bab0b55f5b5 (diff)
[pkg] use bjones experimental branch of pyinstaller
this is a nice refactor that fixes many of the qt5 packaging problems. (although it brings a lot of new libs).
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/build_bundle_with_venv.sh4
-rw-r--r--pkg/docker_bundle/Dockerfile3
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 29479096..7e963ff6 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -21,12 +21,14 @@ source "$VENV"/bin/activate
echo "[+] Using venv in" $VIRTUAL_ENV
$VIRTUAL_ENV/bin/pip install appdirs packaging
+# CHANGE THIS TO SELECT A DIFFERENT PYINSTALLER VERSION ------------------------------------------
# qt-plugins instability in develop: see https://github.com/pyinstaller/pyinstaller/issues/1906
# $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 -U git+https://github.com/pyinstaller/pyinstaller.git@develop
# try bjones WIP Qt5 branch
$VIRTUAL_ENV/bin/pip install -U git+https://github.com/bjones1/pyinstaller.git@pyqt5_testing
+# ------------------------------------------------------------------------------------------------
$VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
# fix for #8789
diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile
index c27a0e6f..3a80e490 100644
--- a/pkg/docker_bundle/Dockerfile
+++ b/pkg/docker_bundle/Dockerfile
@@ -17,5 +17,6 @@ RUN apt install -y --no-install-recommends \
build-essential virtualenv libpython-dev \
libsqlcipher-dev libssl-dev libffi-dev \
python-pyqt5 python-pyqt5.qtwebengine \
+ qttranslations5-l10n \
libusb-0.1-4 patchelf wget \
- git
+ gnupg1 git