[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.1-6-3-gc76c722

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c76c722a179de04211a0f500155f90c726644ccb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 10 19:46:56 2017 +0300

    Refresh and rebase other patches.
---
 debian/changelog                                           |  1 +
 .../Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch |  2 +-
 debian/patches/fix_test_remove_qlibraryinfo.patch          | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 258ce21..4adac1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtdeclarative-opensource-src (5.9.2-1) UNRELEASED; urgency=medium
   * Drop patches, applied upstream:
     - fix_image_source_memory_leak.patch
     - rebuild-QmlDatapropertyCache-if-deleted.patch
+  * Refresh and rebase other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Oct 2017 19:34:09 +0300
 
diff --git a/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch b/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
index ab72c85..a4ce846 100644
--- a/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
+++ b/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
@@ -72,7 +72,7 @@ Bug-Debian: https://bugs.debian.org/792594
          protected IR::IRDecoder,
 --- a/src/qml/jsruntime/qv4engine.cpp
 +++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -163,6 +163,7 @@
+@@ -159,6 +159,7 @@
  
  #ifdef V4_ENABLE_JIT
          static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") ||
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index 6d61388..f0b03fd 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
 +QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
 +
- MODULE_VERSION = 5.9.1
+ MODULE_VERSION = 5.9.2
 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
 +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
 @@ -64,7 +64,7 @@ tst_qmlmin::tst_qmlmin()
@@ -79,7 +79,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
 +++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
-@@ -94,7 +94,7 @@ private slots:
+@@ -95,7 +95,7 @@
  
  void tst_QQmlEngineControl::connect(const QString &testFile, bool restrictServices)
  {
@@ -102,7 +102,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      m_process->start(QStringList() << argument << testFile(qmlFile));
 --- 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
+@@ -107,7 +107,7 @@
              .arg(restrictServices ? QStringLiteral(",services:QmlDebugger,QmlInspector") :
                                      QString());
  
@@ -113,7 +113,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      QVERIFY2(m_process->waitForSessionStart(),
 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
 +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
-@@ -318,7 +318,7 @@ private slots:
+@@ -319,7 +319,7 @@
  void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool restrictServices)
  {
      // ### Still using qmlscene due to QTBUG-33377
@@ -135,10 +135,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
 +++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
-@@ -71,7 +71,7 @@
- {
+@@ -73,7 +73,7 @@
      QProcess proc;
-     proc.setProcessChannelMode(QProcess::ForwardedChannels);
+     if (capturedStderr == nullptr)
+         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);

-- 
qtdeclarative packaging