[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-6-g5d5b983

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 907057f4f3cccb52e83b4fe0ea2a7a1b71308981
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 30 23:53:31 2014 +0100

    replace mips_more_pre-mips32.diff with upstream version
    
    backport upstream commit 7ec14ae0b267780d6bfa5c7453c906caeee3bc00
---
 debian/changelog                                   |  3 ++
 debian/patches/mips_more_pre-mips32.diff           | 24 ----------------
 debian/patches/series                              |  2 +-
 ...PS-atomic-support-on-pre-MIPS32-architect.patch | 33 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48a802c..a9c5f0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Replace patch hurd_opengl_incldir.diff with
     upstream_small-improvements-to-the-hurd-g-mkspec.patch, backport of
     upstream commit 8f0e84bec513ad28c3ec479053fbc59add3959e1.
+  * Replace patch mips_more_pre-mips32.diff with
+    upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch,
+    backport of upstream commit 7ec14ae0b267780d6bfa5c7453c906caeee3bc00.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/patches/mips_more_pre-mips32.diff b/debian/patches/mips_more_pre-mips32.diff
deleted file mode 100644
index 5410422..0000000
--- a/debian/patches/mips_more_pre-mips32.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Support atomic on pre-MIPS32 archs, also in orderedMemoryFence
- Set pre-MIPS32 opcodes also in orderedMemoryFence.
-Last-Update: 2013-12-20
-Forwarded: https://codereview.qt-project.org/#/c/102657/
-
----
- src/corelib/arch/qatomic_mips.h |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/src/corelib/arch/qatomic_mips.h
-+++ b/src/corelib/arch/qatomic_mips.h
-@@ -120,7 +120,10 @@
- template <int size> template <typename T> inline
- void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
- {
--    asm volatile ("sync 0" ::: "memory");
-+    asm volatile (".set push
"
-+                  ".set mips32
"
-+                  "sync 0
"
-+                  ".set pop
" ::: "memory");
- }
- 
- template<> template<typename T> inline
diff --git a/debian/patches/series b/debian/patches/series
index 9a6ac1f..cdfcd6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
-mips_more_pre-mips32.diff
+upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
 bsd_statfs.diff
 bigendian_qimage_conversions.diff
diff --git a/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch b/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
new file mode 100644
index 0000000..02dc565
--- /dev/null
+++ b/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
@@ -0,0 +1,33 @@
+From 7ec14ae0b267780d6bfa5c7453c906caeee3bc00 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sat, 27 Dec 2014 17:54:47 +0100
+Subject: [PATCH] Complete MIPS atomic support on pre-MIPS32 architectures
+
+Extend the support for pre-MIPS32 architectures (done mostly in
+60b6b28c213a420ee40e254ff1823876098e0a04) also to orderedMemoryFence.
+
+Change-Id: I50b9091c16166b8434a07988053c1f901d528237
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+---
+ src/corelib/arch/qatomic_mips.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h
+index b8a9665..b99c70f 100644
+--- a/src/corelib/arch/qatomic_mips.h
++++ b/src/corelib/arch/qatomic_mips.h
+@@ -120,7 +120,10 @@ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0" ::: "memory");
++    asm volatile (".set push
"
++                  ".set mips32
"
++                  "sync 0
"
++                  ".set pop
" ::: "memory");
+ }
+ 
+ template<> template<typename T> inline
+-- 
+2.1.4
+

-- 
qtbase packaging