Do not run ldd on platformthemes, don't bundle their dependencies (#217)

probonopd · web-flow · commit fd33511ce7a8 · 2018-01-20T13:07:37.000Z
Do not run ldd on platformthemes, don't bundle their dependencies flameshot-org/flameshot#86 (comment)
diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp
@@ -391,7 +391,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)
         }
     }
 
-    if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output))) {
+    if ((binaryPath.contains(".so.") || binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output)) && (!binaryPath.contains("platformthemes"))) {
         const QRegularExpressionMatch match = regexp.match(outputLines.first());
         if (match.hasMatch())  {
             info.installName = match.captured(1);

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)`
`391`	`391`	`}`
`392`	`392`	`}`
`393`	`393`
`394`		`- if ((binaryPath.contains(".so.") \|\| binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output))) {`
	`394`	`+ if ((binaryPath.contains(".so.") \|\| binaryPath.endsWith(".so")) && (!lddOutputContainsLinuxVDSO(output)) && (!binaryPath.contains("platformthemes"))) {`
`395`	`395`	`const QRegularExpressionMatch match = regexp.match(outputLines.first());`
`396`	`396`	`if (match.hasMatch()) {`
`397`	`397`	`info.installName = match.captured(1);`