summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-31 10:38:11 -0400
committerKali Kaneko <kali@leap.se>2016-03-31 10:38:11 -0400
commit746d76c8e6f02ba417b7fb9d47630c4e83b40126 (patch)
tree34d32abca4d318fede200f7004b14d4526b20b1a
parentea9a9f09c33f4f5e6faf0a8297200f44688eb86f (diff)
[bug] workaround for incompatible qt library in ubuntu
- Resolves: #7990
-rw-r--r--Makefile49
-rwxr-xr-xpkg/linux/bitmask-launcher15
2 files changed, 44 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 30e67962..c3f0e0d2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ PYRCC = pyside-rcc
PYLUP = pyside-lupdate
LRELE = lrelease
+# pyinst dist dir
+DIST = dist/bitmask/
+
#################################
# DO NOT EDIT FOLLOWING
@@ -165,33 +168,41 @@ sumo_tarball_latest: checkout_leapdeps_develop pull_leapdeps setup_without_names
git checkout -- setup.py
pyinst:
+ echo "MAKE SURE OF FREEZING VERSION FIRST!"
pyinstaller -y pkg/pyinst/bitmask.spec
pyinst-hacks:
- cp ../leap_common/src/leap/common/cacert.pem dist/bitmask/
- mkdir -p dist/bitmask/pysqlcipher
- cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysqlcipher/_sqlite.so dist/bitmask/pysqlcipher
- cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated_www dist/bitmask/
+ cp ../leap_common/src/leap/common/cacert.pem $(DIST)
+ mkdir -p $(DIST)pysqlcipher
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysqlcipher/_sqlite.so $(DIST)pysqlcipher
+ cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated_www $(DIST)
+
+pyinst-trim:
+ rm -f $(DIST)libQtOpenGL.so.4
+ rm -f $(DIST)libQtSql.so.4
+ rm -f $(DIST)libQt3Support.so.4
+ rm -f $(DIST)libaudio.so.2
+ rm -f $(DIST)libnvidia-*
+ #rm -f dist/bitmask/libgstvideo-1.0.so.0
+ #rm -f dist/bitmask/libgstaudio0.0.so.0
+ #rm -f dist/bitmask/libgstreamer-1.0.so.0
pyinst-wrapper:
- mv dist/bitmask/bitmask dist/bitmask/bitmask-app
- cp pkg/linux/bitmask-launcher dist/bitmask/bitmask
- cp pkg/PixelatedWebmail.README dist/bitmask
+ mv $(DIST)libQtCore.so.4 $(DIST)libQtCore.so.4.orig
+ mv $(DIST)libQtGui.so.4 $(DIST)libQtGui.so.4.orig
+ mv $(DIST)libQtNetwork.so.4 $(DIST)libQtNetwork.so.4.orig
+ mv $(DIST)libQtSvg.so.4 $(DIST)libQtSvg.so.4.orig
+ mv $(DIST)libQtWebKit.so.4 $(DIST)libQtWebKit.so.4.orig
+ mv $(DIST)libQtXmlPatterns.so.4 $(DIST)libQtXmlPatterns.so.4.orig
+ mv $(DIST)libQtXml.so.4 $(DIST)libQtXml.so.4.orig
+ mv $(DIST)bitmask $(DIST)bitmask-app
+ cp pkg/linux/bitmask-launcher $(DIST)bitmask
+ cp pkg/PixelatedWebmail.README $(DIST)
-pyinst-trim:
- rm dist/bitmask/libQtOpenGL.so.4
- rm dist/bitmask/libQtSql.so.4
- rm dist/bitmask/libQt3Support.so.4
- rm dist/bitmask/libnvidia-glcore.so.352.79
- rm dist/bitmask/libgstvideo-1.0.so.0
- rm dist/bitmask/libgstaudio-1.0.so.0
- rm dist/bitmask/libgstreamer-1.0.so.0
- rm dist/bitmask/libnvidia-tls.so.352.79
- rm dist/bitmask/libaudio.so.2
pyinst-dist:
- rm -rf dist/bitmask/config
- cd dist/ && tar cvzf Bitmask.0.9.2.alpha1.tar.gz bitmask
+ rm -rf $(DIST)config
+ cd dist/ && tar cvzf Bitmask.0.9.2.alpha2.tar.gz bitmask
clean_pkg:
rm -rf build dist
diff --git a/pkg/linux/bitmask-launcher b/pkg/linux/bitmask-launcher
index 90ced511..3eae57c0 100755
--- a/pkg/linux/bitmask-launcher
+++ b/pkg/linux/bitmask-launcher
@@ -4,6 +4,19 @@
[ -f libQtCore.so.4 ] || ln -s libQtCore.so.4.orig libQtCore.so.4
[ -f libQtGui.so.4 ] || ln -s libQtGui.so.4.orig libQtGui.so.4
-cat /etc/os-release | grep ID | grep -i ubuntu && unlink libQtCore.so.4 && unlink libQtGui.so.4
+[ -f libQtNetwork.so.4 ] || ln -s libQtNetwork.so.4.orig libQtNetwork.so.4
+[ -f libQtSvg.so.4 ] || ln -s libQtSvg.so.4.orig libQtSvg.so.4
+[ -f libQtWebKit.so.4 ] || ln -s libQtWebKit.so.4.orig libQtWebKit.so.4
+[ -f libQtXmlPatterns.so.4 ] || ln -s libQtXmlPatterns.so.4.orig libQtXmlPatterns.so.4
+[ -f libQtXml.so.4 ] || ln -s libQtXml.so.4.orig libQtXml.so.4
+
+cat /etc/os-release | grep ID | grep -i ubuntu && \
+ unlink libQtCore.so.4 && \
+ unlink libQtGui.so.4 && \
+ unlink libQtNetwork.so.4 && \
+ unlink libQtSvg.so.4 && \
+ unlink libQtWebKit.so.4 && \
+ unlink libQtXmlPatterns.so.4 && \
+ unlink libQtXml.so.4
./bitmask-app --standalone "$@"