Commit Graph

124 Commits

Author SHA1 Message Date
probonopd cb8cb3053b Merge branch 'master' into feature/fhs 2017-02-14 23:09:23 +01:00
probonopd c643d6a509 Do not run strip on files that contain rpath starting with $
Workaround for NixOS/patchelf#10?
2017-02-14 22:55:45 +01:00
probonopd ff61e88162 Do not run strip on files that contain rpath starting with $
Workaround for https://github.com/NixOS/patchelf/issues/10?
2017-02-14 22:31:38 +01:00
U. Bruhin 453fbfd163 Fix compile error when using Qt5.2
Error message: 'QJsonValue::QJsonValue(const void*)' is private
2017-02-12 23:09:51 +01:00
probonopd 334930bfaa Merge pull request #62 from atehxx/patch-2
Improve bundling of Qt libs
2017-02-05 21:49:59 +01:00
Manio a680de5b2b Improve bundling of Qt libs
Workaround for not bundling Qt libs when Qt is installed in /usr/local/Qt...
2017-01-30 18:06:57 +01:00
Manio 959ef98726 Update shared.cpp
Final improvement to Qt WebEngine resources location
2017-01-30 17:50:28 +01:00
Manio 92e02657d9 Update shared.h
Add new function
2017-01-30 17:47:38 +01:00
atehxx 97b8ba862b Update shared.cpp
Fixed few paths to Web Engine resources as where they seem to be in 5.7.1
2016-12-30 14:06:20 +01:00
probonopd d062245251 Deploy imageformats 2016-12-04 11:27:31 +01:00
probonopd 4951fd133b Deploy imageformats 2016-12-04 11:26:45 +01:00
probonopd 50c73383e4 Place qt.conf next to executable 2016-11-19 14:09:50 +01:00
probonopd 05f2f03a88 Continue FHS-like mode 2016-11-19 13:37:52 +01:00
probonopd 6fad088ed3 Started FHS-like mode; not quite working yet 2016-11-19 13:19:01 +01:00
Mikkel Krautz f95bb9c1ca shared/shared.cpp: improve Linux VDSO detection.
This commit improves the the VDSO lookup mechanism
by supporting the shared object names of the VDSO
object for other architectures.
2016-11-12 22:15:51 +01:00
Mikkel Krautz d57f180179 shared/shared.cpp: remove a few minor C++11-isms.
These are the only issues preventing linuxdeployqt
from building on non-C++11 compilers.

Uses of the range-based for loop are replaced with
Qt's foreach macro.

Uses of auto are replaced with appropriate types.
2016-11-12 11:04:06 +01:00
probonopd 5c79e30f19 Also deploy plugins/iconengines/libqsvgicon.so whenever libQt5Svg.so.* is about to be deployed, closes #36 2016-11-04 16:18:18 +01:00
Thorbjørn Lindeijer f45c7e3156 Improved the way Qt files are located
Using 'qmake -query' to get all information explicitly instead of parsing
the output of 'qmake -v' and deriving binary path, plugin path and QML
path from there.

Fixes #28
Fixes #37
2016-11-04 09:44:39 +01:00
probonopd 64178d00d5 Update shared.cpp 2016-10-23 14:06:44 +02:00
probonopd 120e6764bc Update shared.cpp 2016-10-22 23:24:44 +02:00
probonopd de00b3afb7 Fix missing "'" 2016-10-22 22:28:09 +02:00
probonopd 0730cacb6b Use appimagetool rather than AppImageAssistant 2016-10-22 21:58:17 +02:00
probonopd 82f99776e2 Return correct exit code 2016-10-22 15:54:37 +02:00
probonopd 3415b30006 Trying to close #34 by taking care of libQt5WebEngineCore 2016-10-22 15:40:24 +02:00
probonopd 2a19bc32b5 Blacklist libnss3.so
Workaround for:

```
[1022/150138:ERROR:nss_util.cc(740)] Error initializing NSS with a persistent database (sql:/home/me/.pki/nssdb): libsoftokn3.so: cannot open shared object file: No such file or directory
[1022/150138:ERROR:nss_util.cc(211)] Error initializing NSS without a persistent database: NSS error code: -5925
[1022/150138:FATAL:nss_util.cc(213)] nss_error=-5925, os_error=0
```
2016-10-22 15:03:31 +02:00
probonopd b1f3506c36 Exit with error code if AppImage generation fails 2016-10-10 19:05:34 +02:00
probonopd 3a464ba922 Stream output of AppImage generation while it happens 2016-10-10 19:00:56 +02:00
probonopd 80aca76f19 Fix bundling of QtQuick/PrivateWidgets 2016-10-10 18:19:40 +02:00
probonopd 71e301f91a Remove 2 compiler warnings 2016-10-10 17:41:58 +02:00
probonopd 7c2590e387 Add comment about qml location 2016-10-08 16:52:40 +02:00
probonopd 69e57be9aa Increase verbosity 2016-10-08 16:51:05 +02:00
probonopd 331353df02 Try to determine the Qt to be deployed from qmake on the $PATH 2016-10-08 16:40:41 +02:00
probonopd d6c72c2edf Generated by linuxdeployqt 2016-10-08 15:06:31 +02:00
probonopd a4217a1ad0 Attempt to close #30 by deploying the xcbglintegrations plugins together with libQt5OpenGL 2016-10-07 21:42:40 +02:00
probonopd 42cbdb1a86 Increase verbosity 2016-10-07 19:50:02 +02:00
probonopd da5e33b94f Fix libQt5XcbQpa.so.5 => not found; #5
https://github.com/probonopd/linuxdeployqt/issues/5#issuecomment-245474269 thanks @skinnysuricate
2016-09-26 02:10:43 +02:00
probonopd cb490c0302 LogError() if AppImage is already there 2016-09-14 03:40:38 +02:00
probonopd 3ed9b1c99b -bundle-non-qt-libs 2016-09-14 03:35:30 +02:00
probonopd 08eddb5562 -bundle-non-qt-libs
[ci skip]
2016-09-14 03:35:11 +02:00
probonopd 755e9643af fix Type=Application in .desktop file 2016-09-14 01:16:22 +02:00
probonopd 18b57437f5 Fix #19 2016-09-14 01:00:01 +02:00
probonopd ec3230952e Attempt to fix #18 2016-09-14 00:28:24 +02:00
probonopd 1bb3d1caae Update shared.cpp 2016-09-09 02:14:28 +02:00
probonopd 117b176215 Bundle libicu* 2016-09-09 02:10:33 +02:00
probonopd 24e880156e Bundle plugins and imageformats only if the corresponding .so libraries are bundled 2016-09-08 20:34:34 +02:00
probonopd 684c702fee Simplify findAppBinary 2016-09-08 18:54:19 +02:00
probonopd 0b91936ca9 Tell users about the workaround for #2 until it is fixed 2016-09-08 16:28:19 +02:00
probonopd 43e8640d90 Increase verbosity and leave the first line in a try to solve #5 2016-09-08 15:59:19 +02:00
probonopd dc665c69e3 Do not bundle libraries from /usr 2016-09-08 15:29:37 +02:00
probonopd 438fc5d1b8 Use more descriptive names 2016-09-08 15:29:03 +02:00