[SCM] qtbase packaging branch, experimental, updated. debian/5.3.2+dfsg-1-2-gc1f29e1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit c1f29e1948ebe7a247618c45d5d3f2631d05ff11
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 17 15:59:21 2014 -0300

    Add Adam Majer's fix_sparc_atomics.patch to let Sparc use C++11's atomics.
---
 debian/changelog                       |  3 +++
 debian/patches/fix_sparc_atomics.patch | 21 +++++++++++++++++++++
 debian/patches/series                  |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5e40912..19a5a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.3.2+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add Adam Majer's fix_sparc_atomics.patch to let Sparc use C++11's atomics.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Sep 2014 15:49:52 -0300
 
 qtbase-opensource-src (5.3.2+dfsg-1) experimental; urgency=medium
diff --git a/debian/patches/fix_sparc_atomics.patch b/debian/patches/fix_sparc_atomics.patch
new file mode 100644
index 0000000..8d0667a
--- /dev/null
+++ b/debian/patches/fix_sparc_atomics.patch
@@ -0,0 +1,21 @@
+Description: Do not use specific headers for Sparc atomics
+ By removing the unexistant sparc headers the C++11 ones will be used.
+Author: Adam Majer <adamm at debian.org>
+Forwarded: no
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+
+---
+ src/corelib/thread/qbasicatomic.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/src/corelib/thread/qbasicatomic.h
++++ b/src/corelib/thread/qbasicatomic.h
+@@ -62,8 +62,6 @@
+ #  include "QtCore/qatomic_ia64.h"
+ #elif defined(Q_PROCESSOR_MIPS)
+ #  include "QtCore/qatomic_mips.h"
+-#elif defined(Q_PROCESSOR_SPARC)
+-#  include "QtCore/qatomic_sparc.h"
+ #elif defined(Q_PROCESSOR_X86)
+ #  include <QtCore/qatomic_x86.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 48eafbe..67bb3b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,9 @@ hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 
+# Patches that need to be upstreamed
+fix_sparc_atomics.patch
+
 # Debian specific.
 remove_google_adsense.patch
 revert_upstream_bsymbolic_change.patch

-- 
qtbase packaging