Commit Graph

126 Commits

Author SHA1 Message Date
Jakob Gahde 6340408518 Also set rpath for -executable=<path>, resolves #83 2017-06-11 14:28:55 +02:00
probonopd bd459f7869 Do not error when there are no translations 2017-06-10 22:07:42 +00:00
probonopd 9a93e030cf Attempt to obey pre-existing RPATHs, #52 2017-06-10 22:05:26 +00:00
probonopd 6d4c1d966b Attempt to obey pre-existing RPATHs, #52 2017-06-10 22:01:00 +00:00
probonopd 646201dcab Revert "Create shared.cpp"
This reverts commit fd8bd30534.
2017-06-10 15:43:07 +02:00
probonopd fd8bd30534 Create shared.cpp 2017-06-10 15:35:01 +02:00
probonopd b661b394fa Closes #138, the function 'getBinaryDependencies' was never used 2017-06-10 13:08:43 +02:00
Adrian Schröter 11e35ce7af Fix Qt version detection, qtDetected must not be a bool 2017-06-09 09:34:55 +02:00
Adrian Schröter 2bbb0844b5 Try to find version specific qmake first
Improve logging
2017-06-09 09:34:22 +02:00
Live-CD User 697b1262dc Attempt at fixing #128 2017-06-05 22:39:34 +02:00
probonopd 21214ee27a Disable patchQtCore 2017-05-30 23:05:14 +02:00
probonopd 3df78b975a Do not bundle libpangoft2-1.0.so.0, libpangocairo-1.0.so.0, libpango-1.0.so.0
https://github.com/probonopd/AppImages/issues/240
2017-05-27 16:35:17 +00:00
probonopd 0f2dba46ff Translations deployment, thanks Ribtoks
https://github.com/probonopd/linuxdeployqt/compare/16f2176...Ribtoks:18efafdea7cd77fb9e201ecfbf522b5d5c68a165?expand=1
2017-05-26 07:34:56 +02:00
probonopd e8ea2c94a5 Fix for PrivateWidgets not being deployed, closes #113
https://github.com/Ribtoks/linuxdeployqt/commit/16f2176b15e4ade8b35f67ddc392aca1fbc9c5cc
2017-05-26 07:25:23 +02:00
probonopd 195b793686 Do not exit if qmlimportscanner is not found 2017-05-26 01:50:34 +02:00
probonopd 1c852a19ae Skip QML imports if no Qt detected 2017-05-25 22:53:42 +02:00
probonopd 08d091725c Update shared.cpp 2017-05-25 13:41:35 +02:00
probonopd 731c08ad89 Modify qt.conf 2017-05-25 13:28:29 +02:00
probonopd b0cb33c9de Revert "No longer generate qt.conf since we use qt_prfxpath now"
Possible workaround for #98, #99, #122

This reverts commit 5df50f332b.
2017-05-25 12:51:53 +02:00
probonopd f6664faaf9 Update shared.cpp 2017-05-20 14:58:51 +02:00
probonopd ea673893db Stop on ldd not found errors; use qmake-qt5 if needed
Closes #101
2017-04-06 22:12:08 +02:00
probonopd bace185665 See whether this makes any difference for setting the rpath of plugins 2017-04-03 21:13:18 +02:00
probonopd b71bd4d587 Deploy libraries in QML imports 2017-04-03 18:23:07 +02:00
probonopd 8f87719a32 Revert move, not sure if it makes a difference 2017-04-02 14:56:30 +02:00
probonopd 8e95f095dc Remove non-working code 2017-03-27 18:41:11 +02:00
probonopd 6926e89d15 Workaround for OBS builds 2017-03-27 18:01:53 +02:00
probonopd 2897666c50 Add verbosity concerning non-properly deployed libs 2017-03-26 22:33:25 +02:00
probonopd 60725dec9a Fix string patching 2017-03-26 21:16:29 +02:00
probonopd 8acc1cb3d9 Patch hardcoded paths for Arch Linux Qt
Partially addresses https://github.com/probonopd/linuxdeployqt/issues/98
2017-03-26 20:38:32 +02:00
probonopd a8515d1bda Patch all qt_* strings in libQt5Core.so that exist (#97)
Closes https://github.com/probonopd/linuxdeployqt/issues/79
2017-03-26 16:59:38 +02:00
probonopd af8d32bb8f Also exclude libnssutil3.so
As per https://github.com/lirios/browser/issues/44#issuecomment-287635212
2017-03-19 19:13:09 +01:00
Àlex Fiestas 0fea9e03d2 Fix a typo in "QT_INSTALL_QML" key usage (removing extra space)
The key with a space at the end does not seem to exists neither in my
testing environment (container reproducing current travis.yml file) nor
on my main system.
2017-03-17 17:41:28 +01:00
Àlex Fiestas a1a4923ba3 Exclude /usr/local from being detected as "Distribution Qt"
/usr/local is the canonical place to put self built applications and
libraries so it should be exlucded from the logic to detect distribution
shipped Qt.
2017-03-16 12:04:09 +01:00
Àlex Fiestas ac9e9db2d0 Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo
It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
2017-03-16 11:56:08 +01:00
probonopd fc571daf7b Always use qtToBeBundledInfo.value("QT_INSTALL_QML ") 2017-03-12 18:38:17 +01:00
probonopd 9359693d9f Do not exit because this could be a script that patchelf can't work on 2017-03-02 21:21:20 +01:00
Uwe Hermann a6e35bc727 Fix two compiler warnings.
../shared/shared.cpp: In function ‘LibraryInfo parseLddLibraryLine(const QString&, const QString&, const QSet<QString>&)’:
../shared/shared.cpp:220:102: warning: unused parameter ‘rpaths’ [-Wunused-parameter]
 LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths)
                                                                                                      ^~~~~~
../shared/shared.cpp: In function ‘void stripAppBinary(const QString&)’:
../shared/shared.cpp:681:36: warning: unused parameter ‘bundlePath’ [-Wunused-parameter]
 void stripAppBinary(const QString &bundlePath)
                                    ^~~~~~~~~~
2017-03-01 19:48:11 +01:00
probonopd 5b68f3af59 Warn about systm Qt when encountering Qt in /usr 2017-02-27 09:35:39 +01:00
probonopd eae604d254 Set qt_plugpath=plugins
As per https://github.com/probonopd/linuxdeployqt/issues/75#issuecomment-280962215
2017-02-20 01:25:09 +01:00
probonopd b32682ba8e Set qt_plugpath to ../plugins in an effort to solve #75 2017-02-20 00:38:06 +01:00
probonopd 3aca9d5c9b Clear qt_plugpath which may exist and may be set to /usr/... in distro Qt packages 2017-02-19 23:43:06 +01:00
probonopd 7adb7cc292 Add explicit {} 2017-02-19 14:01:46 +01:00
probonopd 2e5cfae904 Do not hardcode usr/ 2017-02-19 13:59:01 +01:00
probonopd 86ce8f84e2 Workaround to deploy Qt diretory to qt/ in FHS-like mode 2017-02-19 13:13:58 +01:00
probonopd a0a3e54851 Fix rpath, set to $ORIGIN/lib/ in non-FHS mode 2017-02-19 11:58:54 +01:00
probonopd 5df50f332b No longer generate qt.conf since we use qt_prfxpath now 2017-02-19 11:42:44 +01:00
probonopd 2e6835bc64 Set "qt_prfxpath=." or "qt_prfxpath=..", closes #12 2017-02-19 11:36:48 +01:00
probonopd 792c5cc9d5 Set "qt_prfxpath=." or "qt_prfxpath=../../", closes #12 2017-02-19 10:46:23 +01:00
probonopd 342524d2d1 Update shared.cpp 2017-02-18 15:05:59 +01:00
probonopd 8eef3f66be For now, use -n option for appimagetool, closes #71 2017-02-18 11:50:33 +01:00