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

[Lisandro Damián Nicanor Pérez]

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

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

    Remove fix_power_atomic_code.patch
    
    The code it patches has been removed.
---
 debian/changelog                           |  1 +
 debian/patches/fix_power_atomic_code.patch | 39 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c9dd1d..e7208b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
     listing the license, but it's really not licensed under the RFC license.
   * Update symbols files with buildds' logs.
   * Refresh hurd_opengl_incldir.diff.
+  * 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/fix_power_atomic_code.patch b/debian/patches/fix_power_atomic_code.patch
deleted file mode 100644
index 4437be5..0000000
--- a/debian/patches/fix_power_atomic_code.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 677d040..4b77cce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 hurd_opengl_incldir.diff
-fix_power_atomic_code.patch
 support_mips_atomic_on_pre-mips32_archs.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff

-- 
qtbase packaging