[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-16-gcbf75a2
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Jun 17 11:18:30 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=cbf75a2
The following commit has been merged in the experimental branch:
commit cbf75a26574fa278bb37870d8f58d805a598a92c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Jun 17 14:16:59 2017 +0300
Add some new locations to fix_test_remove_qlibraryinfo.patch.
---
debian/changelog | 1 +
debian/patches/fix_test_remove_qlibraryinfo.patch | 55 ++++++++++++++++++-----
2 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 269c45b..ec99a40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.9.0-2) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Add a patch that should fix crashes on big endian systems.
+ * Add some new locations to fix_test_remove_qlibraryinfo.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 17 Jun 2017 13:54:29 +0300
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index 56e99a6..ba5d7ae 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -1,9 +1,20 @@
Description: Make sure that tests run with just compiled versions of tools
Author: Sandro Knauß <bugs at sandroknauss.de>
Origin: Debian
-Last-Update: 2016-09-16
+Last-Update: 2017-06-17
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/.qmake.conf
++++ b/.qmake.conf
+@@ -1,4 +1,7 @@
+ load(qt_build_config)
+ CONFIG += warning_clean
+
++QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
++QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
++
+ MODULE_VERSION = 5.9.0
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
@@ -64,7 +64,7 @@ tst_qmlmin::tst_qmlmin()
@@ -89,16 +100,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
// Make sure the animation timing is exact
m_process->addEnvironment(QLatin1String("QSG_RENDER_LOOP=basic"));
m_process->start(QStringList() << argument << testFile(qmlFile));
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -1,4 +1,7 @@
- load(qt_build_config)
- CONFIG += warning_clean
-
-+QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
-+QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
-+
- MODULE_VERSION = 5.9.0
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
@@ -106,7 +106,7 @@ void tst_QQmlEngineDebugInspectorIntegra
@@ -121,6 +122,28 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
QStringList arguments;
arguments << QString::fromLatin1("-qmljsdebugger=port:%1,%2%3%4")
.arg(STR_PORT_FROM).arg(STR_PORT_TO)
+--- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
++++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
+@@ -56,7 +56,7 @@
+ process.setProcessChannelMode(QProcess::ForwardedChannels);
+ process.setWorkingDirectory(QLatin1String(SRCDIR));
+ process.setProgram("python");
+- process.setArguments(QStringList() << "test262.py" << "--command=" + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmljs " + qmljsParameter << "--parallel" << "--with-test-expectations");
++ process.setArguments(QStringList() << "test262.py" << "--command=" + TESTBINDIR "/qmljs " + qmljsParameter << "--parallel" << "--with-test-expectations");
+
+ qDebug() << "Going to run" << process.program() << process.arguments() << "in" << process.workingDirectory();
+
+--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
++++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+@@ -71,7 +71,7 @@
+ {
+ QProcess proc;
+ proc.setProcessChannelMode(QProcess::ForwardedChannels);
+- proc.setProgram(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + QLatin1String("qmlcachegen"));
++ proc.setProgram(TESTBINDIR "/qmlcachegen");
+ proc.setArguments(QStringList() << (QLatin1String("--target-architecture=") + QSysInfo::buildCpuArchitecture()) << (QLatin1String("--target-abi=") + QSysInfo::buildAbi()) << qmlFileName);
+ proc.start();
+ if (!proc.waitForFinished())
--- a/tests/auto/qml/qmllint/main.cpp
+++ b/tests/auto/qml/qmllint/main.cpp
@@ -44,7 +44,7 @@ private:
@@ -168,3 +191,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
else
process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() +
QLatin1String("/qqmldebugjsserver"), this);
+@@ -1457,8 +1456,7 @@
+ void tst_QQmlDebugJS::evaluateInContext()
+ {
+ connection = new QQmlDebugConnection();
+- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
+- + "/qmlscene", this);
++ process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this);
+ client = new QJSDebugClient(connection);
+ QScopedPointer<QQmlEngineDebugClient> engineClient(new QQmlEngineDebugClient(connection));
+ process->start(QStringList() << QLatin1String(BLOCKMODE) << testFile(ONCOMPLETED_QMLFILE));
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list