[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-3-20-ge474fbb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit c1ff3115c03a1a319c6204b76fbc33947ad6c942
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 20 01:03:46 2014 -0300

    Refersh patches.
---
 debian/changelog                         | 1 +
 debian/patches/mips_more_pre-mips32.diff | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 48c69e9..2e228d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
   * Refresh patches:
     - hurd_opengl_incldir.diff
     - support_mips_atomic_on_pre-mips32_archs.patch
+    - qatomic_mips.h
   * Remove fix_power_atomic_code.patch, the code it patches has been removed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Mar 2014 10:10:09 -0300
diff --git a/debian/patches/mips_more_pre-mips32.diff b/debian/patches/mips_more_pre-mips32.diff
index 9d4838e..5a95196 100644
--- a/debian/patches/mips_more_pre-mips32.diff
+++ b/debian/patches/mips_more_pre-mips32.diff
@@ -4,9 +4,13 @@ Description: Support atomic on pre-MIPS32 archs, also in orderedMemoryFence
 Last-Update: 2013-12-20
 Forwarded: no
 
+---
+ 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
-@@ -137,7 +137,10 @@ void QBasicAtomicOps<size>::releaseMemor
+@@ -128,7 +128,10 @@ void QBasicAtomicOps<size>::releaseMemor
  template <int size> template <typename T> inline
  void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
  {

-- 
qtbase packaging