[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.6.1-10-27-g4bba44c

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Oct 1 15:51:49 UTC 2016


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

The following commit has been merged in the experimental branch:
commit 4bba44c63e44d343af5d90f7983a666d160cbf32
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Oct 1 18:51:07 2016 +0300

    Refresh the patches.
---
 debian/changelog                                  |  1 +
 debian/patches/disableopengltests.patch           |  6 +-
 debian/patches/fix-V4-on-big-endian.patch         | 11 ++-
 debian/patches/fix_engine_64bits_big_endian.diff  | 32 ++-------
 debian/patches/fix_test_remove_qlibraryinfo.patch | 82 +++++++++++++----------
 debian/patches/series                             |  2 +-
 6 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8c9e44..a683ad8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtdeclarative-opensource-src (5.7.0-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Merge 5.6.1-10 from unstable.
   * Run make check with -k flag to get as much output as possible.
+  * Refresh the patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2016 21:49:25 +0300
 
diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index 1d13ac4..8092d0a 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -19,9 +19,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  installed_cmake.depends = cmake
 --- a/tests/auto/qml/debugger/debugger.pro
 +++ b/tests/auto/qml/debugger/debugger.pro
-@@ -2,9 +2,7 @@ TEMPLATE = subdirs
- 
+@@ -3,9 +3,7 @@
  PUBLICTESTS += \
+     qdebugmessageservice \
      qqmlenginedebugservice \
 -    qqmldebugjs \
      qqmlinspector \
@@ -39,7 +39,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      qtqmlmodules \
      qquickfolderlistmodel \
      qqmlapplicationengine \
-@@ -70,8 +69,7 @@ qtHaveModule(widgets) {
+@@ -69,8 +68,7 @@
          qjsvalue
  }
  
diff --git a/debian/patches/fix-V4-on-big-endian.patch b/debian/patches/fix-V4-on-big-endian.patch
index 915d479..44ddbeb 100644
--- a/debian/patches/fix-V4-on-big-endian.patch
+++ b/debian/patches/fix-V4-on-big-endian.patch
@@ -22,14 +22,19 @@ Backport-Info: Upstream has developed this patch for 5.7
 
 --- a/src/qml/jsruntime/qv4value_p.h
 +++ b/src/qml/jsruntime/qv4value_p.h
-@@ -98,16 +98,13 @@ struct Q_QML_PRIVATE_EXPORT Value
- #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+@@ -101,19 +101,16 @@
+     Q_ALWAYS_INLINE void setValue(quint32 v) { memcpy(&_val, &v, 4); }
+     Q_ALWAYS_INLINE void setTag(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
+ 
+-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN || defined(QV4_USE_64_BIT_VALUE_ENCODING)
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
      static inline int valueOffset() { return 0; }
      static inline int tagOffset() { return 4; }
 -    Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(tag) << 32 | value; }
 -    Q_ALWAYS_INLINE quint32 value() const { return _val & quint64(~quint32(0)); }
 -    Q_ALWAYS_INLINE quint32 tag() const { return _val >> 32; }
- #else // !Q_LITTLE_ENDIAN
+-#else // !Q_LITTLE_ENDIAN && !defined(QV4_USE_64_BIT_VALUE_ENCODING)
++#else // !Q_LITTLE_ENDIAN
      static inline int valueOffset() { return 4; }
      static inline int tagOffset() { return 0; }
 -    Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(value) << 32 | tag; }
diff --git a/debian/patches/fix_engine_64bits_big_endian.diff b/debian/patches/fix_engine_64bits_big_endian.diff
index 1e96458..fb0ee00 100644
--- a/debian/patches/fix_engine_64bits_big_endian.diff
+++ b/debian/patches/fix_engine_64bits_big_endian.diff
@@ -1,29 +1,12 @@
-From d6ac86f59250e05eb5e7db5bb8a45a85db1f0f25 Mon Sep 17 00:00:00 2001
-From: Maximiliano Curia <maxy at debian.org>
-Date: Tue, 19 Jul 2016 15:49:48 +0200
-Subject: [PATCH] Fix QQmlEngine crash on big endian 64 bit architectures
- (s390x)
+Description: fix QQmlEngine crash on big endian 64 bit architectures (s390x)
+Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=d6ac86f59250e05e
+Last-Update: 2016-07-20
 
-This change disables the BIG_ENDIAN 32 bits words mangling in 64 bits
-machines (where the words are 64 bits long); this would otherwise result
-in a segfault.
-
-Task-number: QTBUG-54717
-Change-Id: I6b5ab6f213880b030795185c05e609d290168901
-Reviewed-by: Simon Hausmann <simon.hausmann at qt.io>
-Reviewed-by: Timo Jyrinki <timo.jyrinki at iki.fi>
-Reviewed-by: Erik Verbruggen <erik.verbruggen at qt.io>
----
- src/qml/jsruntime/qv4value_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
-index 7c2bb31..5abf5ad 100644
 --- a/src/qml/jsruntime/qv4value_p.h
 +++ b/src/qml/jsruntime/qv4value_p.h
-@@ -96,13 +96,13 @@ public:
-     Q_ALWAYS_INLINE quint64 rawValue() const { return _val; }
-     Q_ALWAYS_INLINE void setRawValue(quint64 raw) { _val = raw; }
+@@ -101,13 +101,13 @@
+     Q_ALWAYS_INLINE void setValue(quint32 v) { memcpy(&_val, &v, 4); }
+     Q_ALWAYS_INLINE void setTag(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
  
 -#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
 +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN || defined(QV4_USE_64_BIT_VALUE_ENCODING)
@@ -37,6 +20,3 @@ index 7c2bb31..5abf5ad 100644
      static inline int valueOffset() { return 4; }
      static inline int tagOffset() { return 0; }
      Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(value) << 32 | tag; }
--- 
-2.9.3
-
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index eab28f6..0d9f48f 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -4,20 +4,9 @@ Origin: Debian
 Last-Update: 2016-09-16
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
-+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
-@@ -829,7 +829,7 @@ void tst_QQmlDebugJS::cleanupTestCase()
- void tst_QQmlDebugJS::init(const QString &qmlFile, bool blockMode, bool restrictServices)
- {
-     connection = new QQmlDebugConnection();
--    process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
-+    process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this);
-     client = new QJSDebugClient(connection);
- 
-     const char *args = 0;
 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
 +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
-@@ -67,7 +67,7 @@ tst_qmlmin::tst_qmlmin()
+@@ -62,7 +62,7 @@
  
  void tst_qmlmin::initTestCase()
  {
@@ -28,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #endif
 --- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
 +++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
-@@ -171,7 +171,7 @@ void tst_QDebugMessageService::cleanupTe
+@@ -177,7 +177,7 @@
  void tst_QDebugMessageService::init()
  {
      m_connection = new QQmlDebugConnection();
@@ -39,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      m_process->start(QStringList() << QLatin1String(NORMALMODE) << QQmlDataTest::instance()->testFile(QMLFILE));
 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
 +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
-@@ -89,7 +89,7 @@ bool tst_QQmlDebuggingEnabler::init(bool
+@@ -87,7 +87,7 @@
      connection = new QQmlDebugConnection();
  
      if (qmlscene) {
@@ -48,9 +37,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          process->setMaximumBindErrors(1);
      } else {
          process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() + QLatin1String("/qqmldebuggingenablerserver"), this);
+@@ -174,7 +174,7 @@
+ 
+     connection = new QQmlDebugConnection();
+     QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
+-    process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene",
++    process = new QQmlDebugProcess(TESTBINDIR "/qmlscene",
+                                    this);
+     process->setMaximumBindErrors(1);
+     process->start(QStringList()
 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
 +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
-@@ -99,7 +99,7 @@ void tst_QQmlDebugService::initTestCase(
+@@ -106,7 +106,7 @@
  void tst_QQmlDebugService::checkPortRange()
  {
      QQmlDebugConnection *connection1 = new QQmlDebugConnection();
@@ -59,7 +57,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
      process1->start(QStringList() << QLatin1String("-qmljsdebugger=port:3782,3792") << testFile("test.qml"));
  
-@@ -113,7 +113,7 @@ void tst_QQmlDebugService::checkPortRang
+@@ -120,7 +120,7 @@
  
      // Second instance
      QQmlDebugConnection *connection2 = new QQmlDebugConnection();
@@ -70,7 +68,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
-@@ -153,7 +153,7 @@ void QQmlEngineControlClient::messageRec
+@@ -94,7 +94,7 @@
  
  void tst_QQmlEngineControl::connect(const QString &testFile, bool restrictServices)
  {
@@ -81,40 +79,40 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                   .arg(STR_PORT_FROM).arg(STR_PORT_TO)
 --- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
 +++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
-@@ -84,7 +84,7 @@ void tst_QQmlInspector::startQmlscenePro
+@@ -73,8 +73,7 @@
+             .arg(STR_PORT_FROM).arg(STR_PORT_TO)
              .arg(restrictServices ? QStringLiteral(",services:QmlInspector") : QString());
  
-     // ### This should be using qml instead of qmlscene, but can't because of QTBUG-33376 (same as the XFAIL testcase)
--    m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", this);
-+    m_process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this);
-     m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
-     QVERIFY2(m_process->waitForSessionStart(),
-              "Could not launch application, or did not get 'Waiting for connection'.");
+-    m_process.reset(new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) +
+-                                         "/qml"));
++    m_process.reset(new QQmlDebugProcess(TESTBINDIR "/qml"));
+     // Make sure the animation timing is exact
+     m_process->addEnvironment(QLatin1String("QSG_RENDER_LOOP=basic"));
+     m_process->start(QStringList() << argument << testFile(qmlFile));
 --- a/.qmake.conf
 +++ b/.qmake.conf
-@@ -2,4 +2,7 @@ load(qt_build_config)
+@@ -2,4 +2,7 @@
  CONFIG += qt_example_installs
  CONFIG += warning_clean
  
 +QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
 +QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
 +
- MODULE_VERSION = 5.6.1
+ MODULE_VERSION = 5.7.0
 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
 +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
-@@ -102,8 +102,7 @@ void tst_QQmlEngineDebugInspectorIntegra
+@@ -106,7 +106,7 @@
+             .arg(restrictServices ? QStringLiteral(",services:QmlDebugger,QmlInspector") :
                                      QString());
  
-     // ### Still using qmlscene because of QTBUG-33376
--    m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
--                                     + "/qmlscene", this);
-+    m_process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this);
+-    m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qml",
++    m_process = new QQmlDebugProcess(TESTBINDIR "/qml",
+                                      this);
      m_process->start(QStringList() << argument << testFile("qtquick2.qml"));
      QVERIFY2(m_process->waitForSessionStart(),
-              "Could not launch application, or did not get 'Waiting for connection'.");
 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
 +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
-@@ -359,7 +359,7 @@ void QQmlProfilerClient::messageReceived
+@@ -297,7 +297,7 @@
  void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool restrictServices)
  {
      // ### Still using qmlscene due to QTBUG-33377
@@ -125,7 +123,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/qmllint/main.cpp
 +++ b/tests/auto/qml/qmllint/main.cpp
-@@ -49,7 +49,7 @@ private:
+@@ -44,7 +44,7 @@
  
  void TestQmllint::initTestCase()
  {
@@ -136,7 +134,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #endif
 --- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
 +++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
-@@ -59,7 +59,7 @@ tst_qmlplugindump::tst_qmlplugindump()
+@@ -54,7 +54,7 @@
  
  void tst_qmlplugindump::initTestCase()
  {
@@ -147,7 +145,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
 --- a/tests/auto/quick/examples/tst_examples.cpp
 +++ b/tests/auto/quick/examples/tst_examples.cpp
-@@ -174,8 +174,8 @@ void tst_examples::namingConvention(cons
+@@ -169,8 +169,8 @@
  void tst_examples::namingConvention()
  {
      QStringList examplesLocations;
@@ -158,3 +156,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
      foreach(const QString &examples, examplesLocations) {
          QDir d(examples);
+--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
++++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
+@@ -780,8 +780,7 @@
+ {
+     connection = new QQmlDebugConnection();
+     if (qmlscene)
+-        process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) +
+-                                       "/qmlscene", this);
++        process = new QQmlDebugProcess(TESTBINDIR "/qmlscene", this);
+     else
+         process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() +
+                                        QLatin1String("/qqmldebugjsserver"), this);
diff --git a/debian/patches/series b/debian/patches/series
index e027e9f..dc703e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
 # Backported patches
 no_lifetime_dse.diff
+fix_engine_64bits_big_endian.diff
 fix-V4-on-big-endian.patch
 
 # Debian patches
-fix_engine_64bits_big_endian.diff
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list