[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.9.0-beta3-2-154-g92a0f2a
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Thu Jun 15 20:39:44 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=92a0f2a
The following commit has been merged in the ubuntu+1 branch:
commit 92a0f2a8b655e59b07e84980b55b3822b78387f7
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Thu Jun 15 15:39:19 2017 -0500
Refresh patches.
---
debian/changelog | 1 -
debian/patches/disableopengltests.patch | 4 ++--
debian/patches/series | 2 +-
debian/patches/skip_failing_i386_test.patch | 30 ++++++++++++++---------------
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 641cfa0..c4edbe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ qtdeclarative-opensource-src (5.9.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge from Debian Experimental in Git repo.
* Disable or remove the following patches:
- - Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
- Fix-SignalSpy-with-QQmlPropertyMap-signals.patch
- Fix-visibility-of-properties-in-value-types.patch
- QML-Compilation-unit-caching-and-JIT-changes.patch
diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index c4ca16e..3b799f9 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -35,7 +35,7 @@ Last-Update: 2017-04-24
qtqmlmodules \
qquickfolderlistmodel \
qqmlapplicationengine \
-@@ -87,10 +86,6 @@
+@@ -87,10 +86,6 @@ qtConfig(process):!boot2qt {
SUBDIRS += qmllint qmlplugindump
}
@@ -48,7 +48,7 @@ Last-Update: 2017-04-24
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
-@@ -6,9 +6,7 @@
+@@ -6,9 +6,7 @@ PUBLICTESTS += \
qtConfig(opengl(es1|es2)?) {
PUBLICTESTS += \
diff --git a/debian/patches/series b/debian/patches/series
index bfd2683..21ed59b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@
# Debian patches
disableopengltests.patch
fix_test_remove_qlibraryinfo.patch
-#Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.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
index ed4294c..9df4df2 100644
--- a/debian/patches/skip_failing_i386_test.patch
+++ b/debian/patches/skip_failing_i386_test.patch
@@ -1,7 +1,6 @@
-diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qjsengine.cpp qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qjsengine/tst_qjsengine.cpp
---- qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qjsengine.cpp 2016-05-20 20:56:32.000000000 +0000
-+++ qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qjsengine/tst_qjsengine.cpp 2016-10-17 09:19:57.062688737 +0000
-@@ -39,6 +39,7 @@
+--- 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>
@@ -9,7 +8,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qj
#include <qqmlengine.h>
#include <qqmlcomponent.h>
#include <stdlib.h>
-@@ -3788,6 +3789,10 @@
+@@ -4008,6 +4009,10 @@ void tst_QJSEngine::intConversion_QTBUG4
// QTBUG-44039 and QTBUG-43885:
void tst_QJSEngine::toFixed()
{
@@ -20,10 +19,9 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qjsengine/tst_qj
QJSEngine engine;
QJSValue result = engine.evaluate(QStringLiteral("(12.5).toFixed()"));
QVERIFY(result.isString());
-diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
---- qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp 2016-05-20 20:56:32.000000000 +0000
-+++ qtdeclarative-opensource-src-5.6.1/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp 2016-10-17 09:47:11.766889527 +0000
-@@ -41,6 +41,7 @@
+--- 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>
@@ -31,7 +29,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
#include <QtQuick/QQuickItem>
#include <QSignalSpy>
#include <QVector2D>
-@@ -263,6 +264,11 @@
+@@ -330,6 +331,11 @@ void tst_qqmlqt::colorEqual()
void tst_qqmlqt::rect()
{
@@ -43,7 +41,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("rect.qml"));
QString warning1 = component.url().toString() + ":6: Error: Qt.rect(): Invalid arguments";
-@@ -284,6 +290,11 @@
+@@ -351,6 +357,11 @@ void tst_qqmlqt::rect()
void tst_qqmlqt::point()
{
@@ -55,7 +53,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("point.qml"));
QString warning1 = component.url().toString() + ":6: Error: Qt.point(): Invalid arguments";
-@@ -304,6 +315,11 @@
+@@ -371,6 +382,11 @@ void tst_qqmlqt::point()
void tst_qqmlqt::size()
{
@@ -67,7 +65,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("size.qml"));
QString warning1 = component.url().toString() + ":7: Error: Qt.size(): Invalid arguments";
-@@ -325,6 +341,11 @@
+@@ -392,6 +408,11 @@ void tst_qqmlqt::size()
void tst_qqmlqt::vector2d()
{
@@ -79,7 +77,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("vector2.qml"));
QString warning1 = component.url().toString() + ":6: Error: Qt.vector2d(): Invalid arguments";
-@@ -345,6 +366,11 @@
+@@ -412,6 +433,11 @@ void tst_qqmlqt::vector2d()
void tst_qqmlqt::vector3d()
{
@@ -91,7 +89,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("vector.qml"));
QString warning1 = component.url().toString() + ":6: Error: Qt.vector3d(): Invalid arguments";
-@@ -365,6 +391,11 @@
+@@ -432,6 +458,11 @@ void tst_qqmlqt::vector3d()
void tst_qqmlqt::vector4d()
{
@@ -103,7 +101,7 @@ diff -urN qtdeclarative-opensource-src-5.6.1.old/tests/auto/qml/qqmlqt/tst_qqmlq
QQmlComponent component(&engine, testFileUrl("vector4.qml"));
QString warning1 = component.url().toString() + ":6: Error: Qt.vector4d(): Invalid arguments";
-@@ -385,6 +416,11 @@
+@@ -452,6 +483,11 @@ void tst_qqmlqt::vector4d()
void tst_qqmlqt::quaternion()
{
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list