bd30e0e119
Merge branch 'master' into master
2017-06-01 23:14:12 +02:00
21214ee27a
Disable patchQtCore
2017-05-30 23:05:14 +02:00
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
0f2dba46ff
Translations deployment, thanks Ribtoks
...
https://github.com/probonopd/linuxdeployqt/compare/16f2176...Ribtoks:18efafdea7cd77fb9e201ecfbf522b5d5c68a165?expand=1
2017-05-26 07:34:56 +02:00
e8ea2c94a5
Fix for PrivateWidgets not being deployed, closes #113
...
https://github.com/Ribtoks/linuxdeployqt/commit/16f2176b15e4ade8b35f67ddc392aca1fbc9c5cc
2017-05-26 07:25:23 +02:00
01056fa3ac
Merge branch 'master' into master
2017-05-26 07:00:06 +02:00
195b793686
Do not exit if qmlimportscanner is not found
2017-05-26 01:50:34 +02:00
1c852a19ae
Skip QML imports if no Qt detected
2017-05-25 22:53:42 +02:00
08d091725c
Update shared.cpp
2017-05-25 13:41:35 +02:00
731c08ad89
Modify qt.conf
2017-05-25 13:28:29 +02:00
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
f6664faaf9
Update shared.cpp
2017-05-20 14:58:51 +02:00
a3a6376573
Allow the qmake executable to be passed on CLI
...
This change adds a new command line option `qmake` to the tool which
allows the user to specify the qmake executable to be used. By default,
if that option is omitted, the behavior is unchanged (i.e. the tool first
searches for the `qmake` executable and - if this is not successful -
then for either `qmake-qt5` or `qmake-qt4`. If the new option is used,
no search takes place and instead the executable provided is used as-is.
This implements a part of the functionality as discussed in issue #94 .
2017-05-17 21:30:22 +02:00
ea673893db
Stop on ldd not found errors; use qmake-qt5 if needed
...
Closes #101
2017-04-06 22:12:08 +02:00
bace185665
See whether this makes any difference for setting the rpath of plugins
2017-04-03 21:13:18 +02:00
b71bd4d587
Deploy libraries in QML imports
2017-04-03 18:23:07 +02:00
8f87719a32
Revert move, not sure if it makes a difference
2017-04-02 14:56:30 +02:00
8e95f095dc
Remove non-working code
2017-03-27 18:41:11 +02:00
6926e89d15
Workaround for OBS builds
2017-03-27 18:01:53 +02:00
2897666c50
Add verbosity concerning non-properly deployed libs
2017-03-26 22:33:25 +02:00
60725dec9a
Fix string patching
2017-03-26 21:16:29 +02:00
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
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
af8d32bb8f
Also exclude libnssutil3.so
...
As per https://github.com/lirios/browser/issues/44#issuecomment-287635212
2017-03-19 19:13:09 +01:00
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
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
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
fc571daf7b
Always use qtToBeBundledInfo.value("QT_INSTALL_QML ")
2017-03-12 18:38:17 +01:00
9359693d9f
Do not exit because this could be a script that patchelf can't work on
2017-03-02 21:21:20 +01:00
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
5b68f3af59
Warn about systm Qt when encountering Qt in /usr
2017-02-27 09:35:39 +01:00
eae604d254
Set qt_plugpath=plugins
...
As per https://github.com/probonopd/linuxdeployqt/issues/75#issuecomment-280962215
2017-02-20 01:25:09 +01:00
b32682ba8e
Set qt_plugpath to ../plugins in an effort to solve #75
2017-02-20 00:38:06 +01:00
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
7adb7cc292
Add explicit {}
2017-02-19 14:01:46 +01:00
2e5cfae904
Do not hardcode usr/
2017-02-19 13:59:01 +01:00
86ce8f84e2
Workaround to deploy Qt diretory to qt/ in FHS-like mode
2017-02-19 13:13:58 +01:00
a0a3e54851
Fix rpath, set to $ORIGIN/lib/ in non-FHS mode
2017-02-19 11:58:54 +01:00
5df50f332b
No longer generate qt.conf since we use qt_prfxpath now
2017-02-19 11:42:44 +01:00
2e6835bc64
Set "qt_prfxpath=." or "qt_prfxpath=..", closes #12
2017-02-19 11:36:48 +01:00
792c5cc9d5
Set "qt_prfxpath=." or "qt_prfxpath=../../", closes #12
2017-02-19 10:46:23 +01:00
342524d2d1
Update shared.cpp
2017-02-18 15:05:59 +01:00
8eef3f66be
For now, use -n option for appimagetool, closes #71
2017-02-18 11:50:33 +01:00
acf38544a8
Fix failure when creating qt.conf
...
The creation of the qt.conf file has failed with following error:
QIODevice::write (QFile, "app.AppDir/opt/bin/app/../qt.conf"): device not open
This was caused by an invalid file path (appending "/../" to a file to
get its parent directory is not allowed). Fixed it by cleaning the path
with QDir::cleanPath().
2017-02-16 19:46:07 +01:00
c01275a7f6
Strip without -x
2017-02-14 23:30:53 +01:00
cb8cb3053b
Merge branch 'master' into feature/fhs
2017-02-14 23:09:23 +01:00
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
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
453fbfd163
Fix compile error when using Qt5.2
...
Error message: 'QJsonValue::QJsonValue(const void*)' is private
2017-02-12 23:09:51 +01:00
334930bfaa
Merge pull request #62 from atehxx/patch-2
...
Improve bundling of Qt libs
2017-02-05 21:49:59 +01:00
probonopd
Martin Höher
Àlex Fiestas
Uwe Hermann
U. Bruhin