[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.9.0-beta3-2-158-g47d6008

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=2c6ac03

The following commit has been merged in the ubuntu+1 branch:
commit 2c6ac03c75ea12bc1080f624cae52981cab1a496
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Jun 15 15:59:41 2017 -0500

    Drop skip_failing_i386_test.patch because we need to fix that in Debian.
---
 debian/changelog                            |   1 +
 debian/patches/series                       |   5 --
 debian/patches/skip_failing_i386_test.patch | 115 ----------------------------
 3 files changed, 1 insertion(+), 120 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4edbe2..0faaf98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtdeclarative-opensource-src (5.9.0-1ubuntu1) UNRELEASED; urgency=medium
     - Fix-visibility-of-properties-in-value-types.patch
     - QML-Compilation-unit-caching-and-JIT-changes.patch
     - fix_tst_qqmlapplicationengine.diff
+    - skip_failing_i386_test.patch
   * Refresh the following patches:
     - disableopengltests.patch
     - fix_test_remove_qlibraryinfo.patch
diff --git a/debian/patches/series b/debian/patches/series
index 21ed59b..71cb1c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,4 @@
-# Backported patches
-
 # Debian patches
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch
 Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
-
-# Ubuntu patches
-skip_failing_i386_test.patch
diff --git a/debian/patches/skip_failing_i386_test.patch b/debian/patches/skip_failing_i386_test.patch
deleted file mode 100644
index 9df4df2..0000000
--- a/debian/patches/skip_failing_i386_test.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
-+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
-@@ -35,6 +35,7 @@
- #include <qgraphicsitem.h>
- #include <qstandarditemmodel.h>
- #include <QtCore/qnumeric.h>
-+#include <QtCore/QSysInfo>
- #include <qqmlengine.h>
- #include <qqmlcomponent.h>
- #include <stdlib.h>
-@@ -4008,6 +4009,10 @@ void tst_QJSEngine::intConversion_QTBUG4
- // QTBUG-44039 and QTBUG-43885:
- void tst_QJSEngine::toFixed()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-     QJSEngine engine;
-     QJSValue result = engine.evaluate(QStringLiteral("(12.5).toFixed()"));
-     QVERIFY(result.isString());
---- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
-+++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
-@@ -36,6 +36,7 @@
- #include <QDesktopServices>
- #include <QDir>
- #include <QCryptographicHash>
-+#include <QtCore/QSysInfo>
- #include <QtQuick/QQuickItem>
- #include <QSignalSpy>
- #include <QVector2D>
-@@ -330,6 +331,11 @@ void tst_qqmlqt::colorEqual()
- 
- void tst_qqmlqt::rect()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("rect.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.rect(): Invalid arguments";
-@@ -351,6 +357,11 @@ void tst_qqmlqt::rect()
- 
- void tst_qqmlqt::point()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("point.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.point(): Invalid arguments";
-@@ -371,6 +382,11 @@ void tst_qqmlqt::point()
- 
- void tst_qqmlqt::size()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("size.qml"));
- 
-     QString warning1 = component.url().toString() + ":7: Error: Qt.size(): Invalid arguments";
-@@ -392,6 +408,11 @@ void tst_qqmlqt::size()
- 
- void tst_qqmlqt::vector2d()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("vector2.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.vector2d(): Invalid arguments";
-@@ -412,6 +433,11 @@ void tst_qqmlqt::vector2d()
- 
- void tst_qqmlqt::vector3d()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("vector.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.vector3d(): Invalid arguments";
-@@ -432,6 +458,11 @@ void tst_qqmlqt::vector3d()
- 
- void tst_qqmlqt::vector4d()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("vector4.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.vector4d(): Invalid arguments";
-@@ -452,6 +483,11 @@ void tst_qqmlqt::vector4d()
- 
- void tst_qqmlqt::quaternion()
- {
-+    // Fails on i386 at the moment LP: #1634063
-+    if (QSysInfo::buildCpuArchitecture() == "i386") {
-+        QSKIP("Skipping test on i386 LP: #1634063");
-+    }
-+
-     QQmlComponent component(&engine, testFileUrl("quaternion.qml"));
- 
-     QString warning1 = component.url().toString() + ":6: Error: Qt.quaternion(): Invalid arguments";

-- 
qtdeclarative packaging