From 22d766797fc911c51f789c8e3ddcb0b4f2a2c84d Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 10 Feb 2018 10:33:31 +0000 Subject: [PATCH] Do not bundle dependencies of platformthemes, should fix #236 --- tools/linuxdeployqt/shared.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp index cbc5fed..38aa9c4 100644 --- a/tools/linuxdeployqt/shared.cpp +++ b/tools/linuxdeployqt/shared.cpp @@ -356,6 +356,11 @@ LddInfo findDependencyInfo(const QString &binaryPath) QProcess ldd; ldd.start("ldd", QStringList() << binaryPath); ldd.waitForFinished(); + + if (binaryPath.contains("platformthemes")) { + LogDebug() << "Skipping" << binaryPath << "because we do not bundle dependencies of platformthemes"; + return info; + } if (ldd.exitStatus() != QProcess::NormalExit || ldd.exitCode() != 0) { LogError() << "findDependencyInfo:" << ldd.readAllStandardError(); @@ -391,7 +396,7 @@ LddInfo findDependencyInfo(const QString &binaryPath) } } - if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output)) && (!binaryPath.contains("platformthemes"))) { + if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output))) { const QRegularExpressionMatch match = regexp.match(outputLines.first()); if (match.hasMatch()) { info.installName = match.captured(1);