[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-6-4-gce42288

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 861f61ebbc2b85cae363a270feb940b03e2d71bc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 16 21:05:54 2015 +0300

    Mark mips_no_atomic.diff as applied upstream.
---
 debian/changelog                   |  1 +
 debian/patches/mips_no_atomic.diff | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58f11de..10000d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.5.1+dfsg-7) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Backport upstream change (detect_64bit_atomic.diff) to auto-detect
     whether 64-bit std::atomic really works.
+  * Mark mips_no_atomic.diff as applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Nov 2015 20:54:27 +0300
 
diff --git a/debian/patches/mips_no_atomic.diff b/debian/patches/mips_no_atomic.diff
index e3d0855..59cf559 100644
--- a/debian/patches/mips_no_atomic.diff
+++ b/debian/patches/mips_no_atomic.diff
@@ -1,16 +1,13 @@
 Description: let Qt fall back to C++11/GCC atomics for MIPS
- MIPS assembly code for testAndSetRelaxed is currently broken, and
- Thiago Macieira suggested that we should just let Qt fall back to
- C++11/GCC atomics.
+ The "previous" value is always 1 when the compare-and-swap succeeded,
+ instead of the previous value.
  .
- In Qt 5.7, all the processor-specific atomics will be removed, so
- we will be able to drop this patch.
- .
- See https://codereview.qt-project.org/121144 for details.
-Author: Dmitry Shachnev <mitya57 at debian.org>
+ Instead of fixing this, let's just remove this file a bit earlier than
+ the rest. All of them will be removed in Qt 5.7 anyway, so let's leave
+ MIPS atomics to the compiler.
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=110a8c339fa078a4
 Bug: https://bugreports.qt.io/browse/QTBUG-49168
-Forwarded: not-needed
-Last-Update: 2015-11-02
+Last-Update: 2015-11-16
 
 --- a/src/corelib/thread/qbasicatomic.h
 +++ b/src/corelib/thread/qbasicatomic.h

-- 
qtbase packaging