[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-3-16-g1168e3b

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 1e05070fd10037f706b1494f32b811dd345f1074
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 2 10:29:26 2015 +0300

    Disable broken MIPS atomics code, fall back to C++11/GCC atomics.
---
 debian/changelog                   |  2 ++
 debian/patches/mips_no_atomic.diff | 25 +++++++++++++++++++++++++
 debian/patches/series              |  3 +++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 35ca258..1d7f80c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.5.1+dfsg-6) UNRELEASED; urgency=medium
   * Drop hurd-forkfd.diff, we do not need to have two patches for the same
     thing (the second one is hurd_forkfd.diff).
   * Mark bsd_volumeinfo.diff and hurd_forkfd.diff as applied upstream.
+  * Disable broken MIPS atomics code, let Qt fall back to C++11/GCC atomics
+    (mips_no_atomic.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Nov 2015 21:08:40 +0300
 
diff --git a/debian/patches/mips_no_atomic.diff b/debian/patches/mips_no_atomic.diff
new file mode 100644
index 0000000..e3d0855
--- /dev/null
+++ b/debian/patches/mips_no_atomic.diff
@@ -0,0 +1,25 @@
+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.
+ .
+ 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>
+Bug: https://bugreports.qt.io/browse/QTBUG-49168
+Forwarded: not-needed
+Last-Update: 2015-11-02
+
+--- a/src/corelib/thread/qbasicatomic.h
++++ b/src/corelib/thread/qbasicatomic.h
+@@ -60,8 +60,6 @@
+ # include "QtCore/qatomic_armv5.h"
+ #elif defined(Q_PROCESSOR_IA64)
+ #  include "QtCore/qatomic_ia64.h"
+-#elif defined(Q_PROCESSOR_MIPS)
+-#  include "QtCore/qatomic_mips.h"
+ #elif defined(Q_PROCESSOR_X86)
+ #  include <QtCore/qatomic_x86.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 12e79e3..48c6d1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,9 @@ set_WA_OutsideWSRange_for_native_widgets.patch
 bsd_volumeinfo.diff
 hurd_forkfd.diff
 
+# Will be no longer needed with Qt 5.7
+mips_no_atomic.diff
+
 # Debian specific.
 gnukfreebsd.diff
 no_htmlinfo_example.diff

-- 
qtbase packaging