diff options
| author | Kali Kaneko <kali@leap.se> | 2018-01-26 13:51:06 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-01-26 15:01:21 +0100 |
| commit | 307389e1e43ca0e8a68fa6786ea1e0b43a0ad1b6 (patch) | |
| tree | bbb932ad89d8a6f15739d25c5abe9b90b67c55bd | |
| parent | 53ae89d9df7a1b977afe72c5d099e15c8c62fe04 (diff) | |
[pkg] add more missing libs and resources
| -rw-r--r-- | pkg/bundles/build.mk | 4 | ||||
| -rw-r--r-- | pkg/docker_bundle/Dockerfile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk index aa9a2a34..230e3ca9 100644 --- a/pkg/bundles/build.mk +++ b/pkg/bundles/build.mk @@ -48,10 +48,14 @@ bundle_linux_helpers: mkdir -p $(DIST_VERSION)/apps/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/ + # now we copy some missing qt stuff... this might be fixed by pyinstaller at some point 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" + cp /usr/lib/x86_64-linux-gnu/qt5/libexec/QtWebEngineProcess $(DIST_VERSION)/lib/ || echo "QtWebEngineProcess not found" + cp /usr/share/qt5/resources/icudtl.dat $(DIST_VERSION)/lib/ || echo "icudtl.dat not found" + cp /usr/share/qt5/resources/qtwebengine_resources.pak $(DIST_VERSION)/lib/ || echo "qtwebengine_resources.pak not found" bundle_osx_helpers: diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile index 2250c1ad..30a8f745 100644 --- a/pkg/docker_bundle/Dockerfile +++ b/pkg/docker_bundle/Dockerfile @@ -16,7 +16,7 @@ RUN apt update && apt upgrade -y RUN apt install -y --no-install-recommends \ build-essential virtualenv libpython-dev \ libsqlcipher-dev libssl-dev libffi-dev \ - python-pyqt5 python-pyqt5.qtwebengine python-pyqt5.qtwebchannel \ + python-pyqt5 python-pyqt5.qtwebengine python-pyqt5.qtwebchannel libqt5webengine-data \ qttranslations5-l10n \ libusb-0.1-4 patchelf wget \ gnupg1 git |