[SCM] qt3d packaging branch, master, updated. debian/5.6.1+dfsg-1-2-g8b5c4a5

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8b5c4a5aadcaddc7f50f46c935ec9616aaafd7ac
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Dec 2 17:41:31 2016 -0300

    remove patch for tests in big endian.
    
    It is already present upstream.
---
 debian/changelog                     |  2 -
 debian/patches/series                |  1 -
 debian/patches/tests_big_endian.diff | 89 ------------------------------------
 3 files changed, 92 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fa1da1..63b4727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,6 @@ qt3d-opensource-src (5.7.1~20161122+dfsg-1) experimental; urgency=medium
   * Update debian/copyright.
 
   [ Dmitry Shachnev ]
-  * Add a patch to make the tests pass on big endian systems too.
-    - Check the tests exit status on all architectures.
   * Exclude audio-visualizer-qml example from the tarball because it contains
     a non-free MP3 file (CC BY-ND 2.0).
     - Add qtmultimedia5-dev to Build-Conflicts to make sure that example is
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c174094..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-tests_big_endian.diff
diff --git a/debian/patches/tests_big_endian.diff b/debian/patches/tests_big_endian.diff
deleted file mode 100644
index 1b4d4b5..0000000
--- a/debian/patches/tests_big_endian.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: make QHandle tests pass on big endian systems
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2016-06-15
-
---- a/tests/auto/core/handle/tst_handle.cpp
-+++ b/tests/auto/core/handle/tst_handle.cpp
-@@ -41,6 +41,12 @@
- #define private public
- #include <Qt3DCore/private/qhandle_p.h>
- 
-+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-+#define GET_EXPECTED_HANDLE(qHandle) ((qHandle.index() << (qHandle.CounterBits + 2)) + (qHandle.counter() << 2))
-+#else /* Q_LITTLE_ENDIAN */
-+#define GET_EXPECTED_HANDLE(qHandle) (qHandle.index() + (qHandle.counter() << qHandle.IndexBits))
-+#endif
-+
- class tst_Handle : public QObject
- {
-     Q_OBJECT
-@@ -88,14 +94,14 @@
-     QVERIFY(h.index() == 0);
-     QVERIFY(h.counter() == 1);
-     qDebug() << h;
--    QVERIFY(h.handle() == 65536);
-+    QVERIFY(h.handle() == GET_EXPECTED_HANDLE(h));
- 
-     Handle h2(1, 1);
-     QVERIFY(h2.isNull() == false);
-     QVERIFY(h2.index() == 1);
-     QVERIFY(h2.counter() == 1);
-     qDebug() << h2;
--    QVERIFY(h2.handle() == 65537);
-+    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
- }
- 
- void tst_Handle::copyConstruction()
-@@ -105,7 +111,7 @@
-     QVERIFY(h2.isNull() == false);
-     QVERIFY(h2.index() == 0);
-     QVERIFY(h2.counter() == 1);
--    QVERIFY(h2.handle() == 65536);
-+    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
- }
- 
- void tst_Handle::assignment()
-@@ -115,7 +121,7 @@
-     QVERIFY(h2.isNull() == false);
-     QVERIFY(h2.index() == 0);
-     QVERIFY(h2.counter() == 1);
--    QVERIFY(h2.handle() == 65536);
-+    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
- }
- 
- void tst_Handle::equality()
-@@ -125,7 +131,7 @@
-     QVERIFY(h1.isNull() == false);
-     QVERIFY(h1.index() == 2);
-     QVERIFY(h1.counter() == 1);
--    QVERIFY(h1.handle() == 65538);
-+    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
-     QVERIFY(h1 == h2);
- }
- 
-@@ -136,7 +142,7 @@
-     QVERIFY(h1.isNull() == false);
-     QVERIFY(h1.index() == 2);
-     QVERIFY(h1.counter() == 1);
--    QVERIFY(h1.handle() == 65538);
-+    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
-     QVERIFY(h1 != h2);
- 
-     Handle h3(2, 2);
-@@ -161,13 +167,13 @@
-     QVERIFY(h1.isNull() == false);
-     QVERIFY(h1.index() == 0);
-     QVERIFY(h1.counter() == 1);
--    QVERIFY(h1.handle() == 4194304);
-+    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
- 
-     BigHandle h2(1, 1);
-     QVERIFY(h2.isNull() == false);
-     QVERIFY(h2.index() == 1);
-     QVERIFY(h2.counter() == 1);
--    QVERIFY(h2.handle() == 4194305);
-+    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
- 
-     QVERIFY(BigHandle::maxIndex() == (1 << 22) - 1);
-     QVERIFY(BigHandle::maxCounter() == (1 << (32 - 22 - 2)) - 1);

-- 
qt3d packaging