[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 140e11eebbf3a2db8438fb55fd1852440bb9ea78
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 21 11:55:40 2016 +0000

    Skip a few longlong tests on i386.
---
 debian/changelog                  |  1 -
 debian/patches/enable-tests.patch | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3bb6383..ab075ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
 
-  [ Timo Jyrinki ]
   * New upstream release. 
   * Migrate symbols using the script to the Qt_5 versioning scheme.
   * Update symbols and bump symbols abi.
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index ab289c5..7212c7a 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23597,3 +23597,18 @@ Index: qtbase-opensource-src-5.6.0-rc/tests/auto/corelib/io/qtextstream/tst_qtex
      }
      {
          // Shift-JIS device
+diff -urN qtbase-opensource-src-5.6.0.old/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp qtbase-opensource-src-5.6.0/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+--- qtbase-opensource-src-5.6.0.old/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp	2016-03-03 11:35:22.000000000 +0000
++++ qtbase-opensource-src-5.6.0/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp	2016-03-18 13:25:42.621419518 +0000
+@@ -100,9 +100,11 @@
+ #  endif
+ #endif
+ #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
++#if !defined(__i386__)
+ #  define TYPE_SUPPORTED_qlonglong  1
+ #  define TYPE_SUPPORTED_qulonglong 1
+ #endif
++#endif
+ 
+ #ifdef Q_MOC_RUN
+ #  define QATOMIC_TYPE_SUPPORTED(type)      1

-- 
qtbase packaging