[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-6-3-gc021216

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c021216c3d017d4e32b6c49177685dbe4132c840
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Apr 15 20:31:22 2016 -0300

    Properly detect x32 in Atomics.h.
---
 debian/changelog                           |  1 +
 debian/patches/fix_x32_cpu_detection.patch | 15 +++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e63363..8d53d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit (2.3.4.dfsg-7) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add fix_number_of_cpus_in_kfreebsd.diff to bound the number of CPUs used
     to compile webkit on KFreeBSD (Closes: #819868). Thanks Jon Boden!
+  * Properly detect x32 in Atomics.h (Closes: #821013). Thanks James Clarke.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Apr 2016 20:33:19 -0300
 
diff --git a/debian/patches/fix_x32_cpu_detection.patch b/debian/patches/fix_x32_cpu_detection.patch
new file mode 100644
index 0000000..bf7a55f
--- /dev/null
+++ b/debian/patches/fix_x32_cpu_detection.patch
@@ -0,0 +1,15 @@
+Description: properly detect x32 on Atomics.h.
+Author: James Clarke <jrtc27 at jrtc27.com>
+Forwarded: not-needed
+
+--- a/Source/WTF/wtf/Atomics.h
++++ b/Source/WTF/wtf/Atomics.h
+@@ -170,7 +170,7 @@
+ inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
+ {
+ #if ENABLE(COMPARE_AND_SWAP)
+-#if CPU(X86_64)
++#if CPU(X86_64) && !CPU(X32)
+     bool result;
+     asm volatile(
+         "lock; cmpxchgq %3, %2
	"
diff --git a/debian/patches/series b/debian/patches/series
index 5b09448..12c9fca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ reduce_memory_usage.patch
 explicit_template_instantiation.patch
 redeclare_uint32_t_for_sparc64.patch
 fix_number_of_cpus_in_kfreebsd.diff
+fix_x32_cpu_detection.patch

-- 
QtWebKit packaging