[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.7.0-2-114-gd6d2f13
Timo Jyrinki
timo at moszumanska.debian.org
Wed Sep 7 13:25:34 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=d6d2f13
The following commit has been merged in the ubuntu+1 branch:
commit d6d2f13ad9ffca660cda1a0faa2e14b333248b25
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Sep 7 13:25:30 2016 +0000
Rebase patches to apply to 5.7:
* Rebase patches to apply to 5.7:
- debian/patches/Fix-visibility-of-properties-in-value-types.patch
- debian/patches/disable_failing_tests.patch
- debian/patches/fix_binary_location_for_tests.patch
---
debian/changelog | 4 +++
...x-visibility-of-properties-in-value-types.patch | 2 +-
debian/patches/disable_failing_tests.patch | 2 +-
debian/patches/fix_binary_location_for_tests.patch | 36 +++++++++++-----------
debian/patches/series | 6 ++--
5 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7f0803a..54ca910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtdeclarative-opensource-src (5.7.0-2ubuntu1) UNRELEASED; urgency=medium
[ Timo Jyrinki ]
* New upstream release.
* Drop patches now in upstream.
+ * Rebase patches to apply to 5.7:
+ - debian/patches/Fix-visibility-of-properties-in-value-types.patch
+ - debian/patches/disable_failing_tests.patch
+ - debian/patches/fix_binary_location_for_tests.patch
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 07 Sep 2016 13:12:08 +0000
diff --git a/debian/patches/Fix-visibility-of-properties-in-value-types.patch b/debian/patches/Fix-visibility-of-properties-in-value-types.patch
index 7e505c7..19bbd45 100644
--- a/debian/patches/Fix-visibility-of-properties-in-value-types.patch
+++ b/debian/patches/Fix-visibility-of-properties-in-value-types.patch
@@ -23,9 +23,9 @@ index 96bca90..fdac41a 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -50,6 +50,7 @@
- #include <private/qv4functionobject_p.h>
#include <private/qv4variantobject_p.h>
#include <private/qv4alloca_p.h>
+ #include <private/qv4qobjectwrapper_p.h>
+#include <private/qv4objectiterator_p.h>
QT_BEGIN_NAMESPACE
diff --git a/debian/patches/disable_failing_tests.patch b/debian/patches/disable_failing_tests.patch
index 684f766..91aafce 100644
--- a/debian/patches/disable_failing_tests.patch
+++ b/debian/patches/disable_failing_tests.patch
@@ -24,9 +24,9 @@ diff -urN qtdeclarative-opensource-src-5.5.0.old/tests/auto/qml/debugger/debugge
--- qtdeclarative-opensource-src-5.5.0.old/tests/auto/qml/debugger/debugger.pro 2015-06-29 20:12:19.000000000 +0000
+++ qtdeclarative-opensource-src-5.5.0/tests/auto/qml/debugger/debugger.pro 2015-07-08 07:35:10.794933489 +0000
@@ -1,9 +1,9 @@
- TEMPLATE = subdirs
PUBLICTESTS += \
+ qdebugmessageservice \
- qqmlenginedebugservice \
+# qqmlenginedebugservice \
qqmldebugjs \
diff --git a/debian/patches/fix_binary_location_for_tests.patch b/debian/patches/fix_binary_location_for_tests.patch
index 36ccee2..39f0e30 100644
--- a/debian/patches/fix_binary_location_for_tests.patch
+++ b/debian/patches/fix_binary_location_for_tests.patch
@@ -26,28 +26,28 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/qmlplugindump/tst_qm
qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
===================================================================
---- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
-+++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
++++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -829,7 +829,7 @@ void tst_QQmlDebugJS::cleanupTestCase()
- void tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode, bool restrictServices)
{
connection = new QQmlDebugConnection();
-- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
-+ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
- client = new QJSDebugClient(connection);
-
- const char *args = 0;
+ if (qmlscene)
+- process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) +
++ process = new QQmlDebugProcess(QLatin1String("../../../../../bin") +
+ "/qmlscene", this);
+ else
+ process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() +
Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
===================================================================
--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
@@ -102,7 +102,7 @@ void tst_QQmlEngineDebugInspectorIntegra
+ .arg(restrictServices ? QStringLiteral(",services:QmlDebugger,QmlInspector") :
QString());
- // ### Still using qmlscene because of QTBUG-33376
-- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
-+ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin")
- + "/qmlscene", this);
+- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml",
++ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin" + "/qml",
+ this);
m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
QVERIFY2(m_process->waitForSessionStart(),
Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
@@ -55,14 +55,14 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlinspect
--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+++ qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
@@ -84,7 +84,7 @@ void tst_QQmlInspector::startQmlscenePro
+ .arg(STR_PORT_FROM).arg(STR_PORT_TO)
.arg(restrictServices ? QStringLiteral(",services:QmlInspector") : QString());
- // ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
-- m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
-+ m_process = new QQmlDebugProcess(QLatin1String("../../../../../bin") + "/qmlscene", this);
- m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
- QVERIFY2(m_process->waitForSessionStart(),
- "Could not launch application, or did not get 'Waiting for connection'.");
+- m_process.reset(new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) +
++ m_process.reset(new QQmlDebugProcess(QLatin1String("../../../../../bin") +
+ "/qml"));
+ // Make sure the animation timing is exact
+ m_process->addEnvironment(QLatin1String("QSG_RENDER_LOOP=basic"));
Index: qtdeclarative-opensource-src-5.6.0-rc/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
===================================================================
--- qtdeclarative-opensource-src-5.6.0-rc.orig/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
diff --git a/debian/patches/series b/debian/patches/series
index d2f5cb7..b159fdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
# Backported patches
fix_engine_64bits_big_endian.diff
no_lifetime_dse.diff
-#Fix-visibility-of-properties-in-value-types.patch
+Fix-visibility-of-properties-in-value-types.patch
# Debian patches
# Ubuntu patches
-#fix_binary_location_for_tests.patch
-#disable_failing_tests.patch
+fix_binary_location_for_tests.patch
+disable_failing_tests.patch
#QML-Compilation-unit-caching-and-JIT-changes.patch
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list