Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve macdeployqt patch

Browse Source
This commit is contained in:
Jonas Kvinge 2021-03-31 01:00:51 +02:00
parent 85b59e79d3
commit beacea0482
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
3rdparty/macdeployqt/shared.cpp vendored
View File

@ -197,16 +197,25 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
} }
outputLines.removeFirst(); // remove line containing the binary path outputLines.removeFirst(); // remove line containing the binary path
if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) { if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) {
const auto match = regexp.match(outputLines.first()); const auto match = regexp.match(outputLines.first());
if (match.hasMatch()) { if (match.hasMatch()) {
info.installName = match.captured(1); QString installname = match.captured(1);
info.compatibilityVersion = QVersionNumber::fromString(match.captured(2)); if (QFileInfo(binaryPath).fileName() == QFileInfo(installname).fileName()) {
info.currentVersion = QVersionNumber::fromString(match.captured(3)); info.installName = installname;
} else { info.compatibilityVersion = QVersionNumber::fromString(match.captured(2));
LogError() << "Could not parse otool output line:" << outputLines.first(); info.currentVersion = QVersionNumber::fromString(match.captured(3));
outputLines.removeFirst();
}
else {
info.installName = binaryPath;
}
}
else {
LogError() << "Could not parse otool output line:" << outputLines.first();
outputLines.removeFirst();
} }
//outputLines.removeFirst();
} }
for (const QString &outputLine : outputLines) { for (const QString &outputLine : outputLines) {