From 117b1762150b84d01c22db26d66bc1041ed947ce Mon Sep 17 00:00:00 2001 From: probonopd Date: Fri, 9 Sep 2016 02:10:33 +0200 Subject: [PATCH] Bundle libicu* --- shared/shared.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 80bf026..5bf7667 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -199,8 +199,13 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, // Don't deploy low-level libraries in /usr or /lib because these tend to break if moved to a system with a different glibc. // TODO: Could make bundling these low-level libraries optional but then the bundles might need to // use something like patchelf --set-interpreter or http://bitwagon.com/rtldi/rtldi.html - if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) - return info; + // With the Qt provided by qt.io the libicu libraries come bundled, but that is not the case with e.g., + // Qt from ppas. Hence we make sure libicu is always bundled since it cannot be assumed to be on target sytems + if not (trimmed.contains("libicu")) { + if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) { + return info; + } + } enum State {QtPath, LibraryName, Version, End}; State state = QtPath;