From 0d9494b240b69ce65b65b74a5cb4ae7c5a117194 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 5 Jun 2017 11:03:21 +0200 Subject: [PATCH 1/3] Switch to Qt 5.9 --- tests/tests-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index a75fee5..9da0eb3 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -2,7 +2,7 @@ set -e -sudo add-apt-repository --yes ppa:beineri/opt-qt58-trusty +sudo add-apt-repository --yes ppa:beineri/opt-qt59-trusty sudo apt-get update -qq wget http://ftp.de.debian.org/debian/pool/main/p/patchelf/patchelf_0.8-2_amd64.deb From 9a8902399ac86eda3ec8eadfaacdf34733fb73bc Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 5 Jun 2017 11:13:04 +0200 Subject: [PATCH 2/3] Switch to Qt 5.9 --- tests/tests-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 9da0eb3..a410d7f 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -15,4 +15,4 @@ chmod +x appimagetool*AppImage sudo cp squashfs-root/usr/bin/* /usr/local/bin cd - -sudo apt-get -y install qt58base qt58declarative qt58webengine binutils xpra +sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra From 697b1262dc4a3683800fcbdfaa61802f37715563 Mon Sep 17 00:00:00 2001 From: Live-CD User Date: Mon, 5 Jun 2017 22:39:34 +0200 Subject: [PATCH 3/3] Attempt at fixing #128 --- shared/shared.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 0c35239..a1cbe25 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -54,7 +54,8 @@ bool alwaysOwerwriteEnabled = false; QStringList librarySearchPath; bool appstoreCompliant = false; int logLevel = 1; -int qtDetected = 0; +bool qtDetected = 0; +bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway bool deployLibrary = false; using std::cout; @@ -298,7 +299,7 @@ LddInfo findDependencyInfo(const QString &binaryPath) foreach (QString outputLine, outputLines) { // LogDebug() << "ldd outputLine:" << outputLine; - if (outputLine.contains("not found")){ + if ((outputLine.contains("not found")) && (qtDetectionComplete == 1)){ LogError() << "ldd outputLine:" << outputLine.replace("\t", ""); LogError() << "Please ensure that all libraries can be found by ldd. Aborting."; exit(1); @@ -1081,6 +1082,9 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a } } + /* From now on let ldd exit if it doesn't find something */ + qtDetectionComplete = 1; + if(fhsLikeMode == false){ changeIdentification("$ORIGIN/lib/" + bundleLibraryDirectory, QFileInfo(applicationBundle.binaryPath).canonicalFilePath()); } else {