[SCM] qtdeclarative packaging branch, ubuntu+1, updated. ubuntu/5.9.2-3ubuntu1-11-g2eebfaf

Simon Quigley tsimonq2-guest at moszumanska.debian.org
Fri Dec 1 03:56:24 UTC 2017 

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

The following commit has been merged in the ubuntu+1 branch:
commit 648950765ea54efea9e412fc68403b51de70a46d
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Nov 30 19:52:47 2017 -0600

    Refresh patches.
---
 debian/changelog                                           |  1 +
 .../Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch |  2 +-
 debian/patches/disable_jit_on_mips.patch                   |  2 +-
 debian/patches/disableopengltests.patch                    |  6 +++---
 debian/patches/fix_test_remove_qlibraryinfo.patch          | 14 +++++++-------
 debian/patches/revert_singletons_change.patch              | 10 +++++-----
 debian/patches/testcase_array_iteration.patch              |  4 ++--
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f34c650..5cdc6d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.9.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * 
   * Bump Standards-version to 4.1.2, no changes needed.
+  * Refresh patches.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 30 Nov 2017 18:57:01 -0600
 
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 a4ce846..73b7467 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
-@@ -159,6 +159,7 @@
+@@ -159,6 +159,7 @@ ExecutionEngine::ExecutionEngine(EvalISe
  
  #ifdef V4_ENABLE_JIT
          static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") ||
diff --git a/debian/patches/disable_jit_on_mips.patch b/debian/patches/disable_jit_on_mips.patch
index 6e9b0e9..b6bc621 100644
--- a/debian/patches/disable_jit_on_mips.patch
+++ b/debian/patches/disable_jit_on_mips.patch
@@ -7,7 +7,7 @@ Last-Update: 2017-07-31
 
 --- a/src/qml/jsruntime/qv4global_p.h
 +++ b/src/qml/jsruntime/qv4global_p.h
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ inline double trunc(double d) { return d
  #  if defined(Q_OS_LINUX)
  #    define V4_ENABLE_JIT
  #  endif
diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index 7052a12..501ac4c 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -27,7 +27,7 @@ Last-Update: 2017-04-24
      qqmlenginecontrol \
 --- a/tests/auto/qml/qml.pro
 +++ b/tests/auto/qml/qml.pro
-@@ -24,7 +24,6 @@
+@@ -24,7 +24,6 @@ PUBLICTESTS += \
      qqmlmoduleplugin \
      qqmlnotifier \
      qqmlqt \
@@ -35,7 +35,7 @@ Last-Update: 2017-04-24
      qtqmlmodules \
      qquickfolderlistmodel \
      qqmlapplicationengine \
-@@ -88,10 +87,6 @@
+@@ -88,10 +87,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/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index f0b03fd..ece3d47 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.2
+ MODULE_VERSION = 5.9.3
 --- 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
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ private slots:
  
  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
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ void tst_QQmlEngineDebugInspectorIntegra
              .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
-@@ -319,7 +319,7 @@
+@@ -319,7 +319,7 @@ private slots:
  void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool restrictServices)
  {
      // ### Still using qmlscene due to QTBUG-33377
@@ -124,7 +124,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                   .arg(STR_PORT_FROM).arg(STR_PORT_TO)
 --- a/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
 +++ b/tests/auto/qml/ecmascripttests/tst_ecmascripttests.cpp
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ void tst_EcmaScriptTests::runTests()
      process.setProcessChannelMode(QProcess::ForwardedChannels);
      process.setWorkingDirectory(QLatin1String(SRCDIR));
      process.setProgram("python");
@@ -135,7 +135,7 @@ 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
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ static bool generateCache(const QString
      QProcess proc;
      if (capturedStderr == nullptr)
          proc.setProcessChannelMode(QProcess::ForwardedChannels);
@@ -191,7 +191,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      else
          process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() +
                                         QLatin1String("/qqmldebugjsserver"), this);
-@@ -1457,8 +1456,7 @@
+@@ -1457,8 +1456,7 @@ void tst_QQmlDebugJS::evaluateInLocalSco
  void tst_QQmlDebugJS::evaluateInContext()
  {
      connection = new QQmlDebugConnection();
diff --git a/debian/patches/revert_singletons_change.patch b/debian/patches/revert_singletons_change.patch
index 9808ef6..1cb21c2 100644
--- a/debian/patches/revert_singletons_change.patch
+++ b/debian/patches/revert_singletons_change.patch
@@ -7,7 +7,7 @@ Last-Update: 2017-10-26
 
 --- a/src/qml/qml/qqmlimport.cpp
 +++ b/src/qml/qml/qqmlimport.cpp
-@@ -471,17 +471,6 @@
+@@ -472,17 +472,6 @@ void findCompositeSingletons(const QQmlI
                  resultList.append(ref);
              }
          }
@@ -27,7 +27,7 @@ Last-Update: 2017-10-26
  
 --- a/src/qml/qml/qqmlmetatype.cpp
 +++ b/src/qml/qml/qqmlmetatype.cpp
-@@ -1265,18 +1265,6 @@
+@@ -1265,18 +1265,6 @@ QQmlType QQmlTypeModule::type(const QV4:
      return QQmlType();
  }
  
@@ -48,7 +48,7 @@ Last-Update: 2017-10-26
  {
 --- a/src/qml/qml/qqmlmetatype_p.h
 +++ b/src/qml/qml/qqmlmetatype_p.h
-@@ -299,8 +299,6 @@
+@@ -300,8 +300,6 @@ public:
      QQmlType type(const QHashedStringRef &, int) const;
      QQmlType type(const QV4::String *, int) const;
  
@@ -59,7 +59,7 @@ Last-Update: 2017-10-26
      //Used by register functions and creates the QQmlTypeModule for them
 --- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
 +++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
-@@ -59,7 +59,6 @@
+@@ -59,7 +59,6 @@ private slots:
      void cacheResources();
      void stableOrderOfDependentCompositeTypes();
      void singletonDependency();
@@ -67,7 +67,7 @@ Last-Update: 2017-10-26
  };
  
  // A wrapper around QQmlComponent to ensure the temporary reference counts
-@@ -791,66 +790,6 @@
+@@ -791,66 +790,6 @@ void tst_qmldiskcache::singletonDependen
      }
  }
  
diff --git a/debian/patches/testcase_array_iteration.patch b/debian/patches/testcase_array_iteration.patch
index fdff568..057ff37 100644
--- a/debian/patches/testcase_array_iteration.patch
+++ b/debian/patches/testcase_array_iteration.patch
@@ -6,7 +6,7 @@ Last-Update: 2017-06-22
 
 --- a/src/imports/testlib/TestCase.qml
 +++ b/src/imports/testlib/TestCase.qml
-@@ -1759,7 +1759,7 @@
+@@ -1759,7 +1759,7 @@ Item {
              testList.sort()
          }
          var checkNames = (functionsToRun.length > 0)
@@ -15,7 +15,7 @@ Last-Update: 2017-06-22
              var prop = testList[index]
              var datafunc = prop + "_data"
              var isBenchmark = (prop.indexOf("benchmark_") == 0)
-@@ -1779,11 +1779,11 @@
+@@ -1779,11 +1779,11 @@ Item {
                      var table = qtest_testCaseResult
                      var haveData = false
                      qtest_results.initTestTable()

-- 
qtdeclarative packaging

More information about the pkg-kde-commits mailing list