[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.1-2-4-g34dd756

[Simon Quigley]

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

The following commit has been merged in the experimental branch:
commit 34dd7560ddcb7cc0a47c589779a6f625a1f41e59
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Mon Apr 17 18:13:51 2017 -0500

    Remove fix_tst_qqmlapplicationengine.diff as it's reverse-applicable.
---
 debian/changelog                                  |  1 +
 debian/patches/fix_tst_qqmlapplicationengine.diff | 17 -----------------
 debian/patches/series                             |  3 ---
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cff5e6..95b5843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtdeclarative-opensource-src (5.9.0~beta-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump dpkg-dev build-dependency to 1.17.14, for build profiles.
   * Do not build the documentation packages when the nodoc profile is enabled.
+  * Drop fix_tst_qqmlapplicationengine.diff as it's reverse-applicable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Apr 2017 06:43:41 -0500
 
diff --git a/debian/patches/fix_tst_qqmlapplicationengine.diff b/debian/patches/fix_tst_qqmlapplicationengine.diff
deleted file mode 100644
index c79bc6f..0000000
--- a/debian/patches/fix_tst_qqmlapplicationengine.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: make tst_qqmlapplicationengine pass when JIT is not available
- When the platform does not have JIT, a warning about this is printed
- into the process stderr, so the test fails.
-Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=650b5db06b057abe
-Last-Update: 2016-10-14
-
---- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
-+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
-@@ -111,7 +111,7 @@
-     test_stderr_target.replace('
', QByteArray("
"));
- #endif
-     QCOMPARE(test_stdout, QByteArray(""));
--    QCOMPARE(QString(test_stderr), QString(test_stderr_target));
-+    QVERIFY(QString(test_stderr).endsWith(QString(test_stderr_target)));
-     delete testProcess;
-     QDir::setCurrent(srcDir);
- #else // !QT_NO_PROCESS
diff --git a/debian/patches/series b/debian/patches/series
index a818374..71cb1c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-# Backported patches
-fix_tst_qqmlapplicationengine.diff
-
 # Debian patches
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch

-- 
qtdeclarative packaging