[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3dff0b1292c6565c0fa095f3f86c1a583eaa2722
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Nov 11 11:20:14 2013 -0300

    Let qtbase build on MIPS.
---
 debian/changelog                           |  2 ++
 debian/patches/fix_power_atomic_code.patch | 39 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c67f1a6..84f01f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.2.0~beta1+dfsg-2) UNRELEASED; urgency=low
     - Create debian/qtbase5-dev.install-armhf.
     - Move debian/qtbase5-dev.install to debian/qtbase5-dev.install-common.
   * Update symbols files.
+  * Import upstream's fix_power_atomic_code.patch for fixing PowerPC's FTBFS
+    (Closes: #729265). Thanks Aurelien Jarno for the patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Nov 2013 13:48:48 -0300
 
diff --git a/debian/patches/fix_power_atomic_code.patch b/debian/patches/fix_power_atomic_code.patch
new file mode 100644
index 0000000..4437be5
--- /dev/null
+++ b/debian/patches/fix_power_atomic_code.patch
@@ -0,0 +1,39 @@
+From eaeb89dacb59875de5e16dad26258c12cf011b88 Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien at aurel32.net>
+Date: Sun, 10 Nov 2013 23:38:15 +0100
+Subject: [PATCH] Fix Power atomic code
+
+Commit 3f1a4be30263a676b7e188bf6cfa809c7788c87f changed loadAcquire
+to const in qbasicatomic.h. However it has not been done in
+qoldbasicatomic.h which is still used by Power atomic code.
+
+Change-Id: Ifa86d149a98ad52ec3f23a928199643f564e57f5
+---
+ src/corelib/thread/qoldbasicatomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h
+index b755256..473f1a5 100644
+--- a/src/corelib/thread/qoldbasicatomic.h
++++ b/src/corelib/thread/qoldbasicatomic.h
+@@ -63,7 +63,7 @@ public:
+     // Atomic API, implemented in qatomic_XXX.h
+ 
+     int load() const { return _q_value; }
+-    int loadAcquire() { return _q_value; }
++    int loadAcquire() const { return _q_value; }
+     void store(int newValue) { _q_value = newValue; }
+     void storeRelease(int newValue) { _q_value = newValue; }
+ 
+@@ -107,7 +107,7 @@ public:
+     // Atomic API, implemented in qatomic_XXX.h
+ 
+     T *load() const { return _q_value; }
+-    T *loadAcquire() { return _q_value; }
++    T *loadAcquire() const { return _q_value; }
+     void store(T *newValue) { _q_value = newValue; }
+     void storeRelease(T *newValue) { _q_value = newValue; }
+ 
+-- 
+1.8.4.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 35129ef..074df23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 sha3_64bit_BE.diff
 linux_no_perf.diff
 hurd_opengl_incldir.diff
+fix_power_atomic_code.patch
 
 # Debian specific.

-- 
qtbase packaging