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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 27a8f621586167e7e9c9fa5de3c212dd9b309bc8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 2 19:16:33 2015 -0300

    Add redeclare_uint32_t_for_sparc64.patch.
---
 debian/changelog                                   |  2 ++
 .../patches/redeclare_uint32_t_for_sparc64.patch   | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c833bf0..9c4e25e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtwebkit (2.3.4.dfsg-6) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add alpha, m68k, ppc64, sh4 and sparc64 to the list of architectures where
     the JIT should be disabled (Closes: #806837).
+  * Add redeclare_uint32_t_for_sparc64.patch which redeclares uint32_t for
+    sparc64, also part of the above bug.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Dec 2015 10:19:22 -0300
 
diff --git a/debian/patches/redeclare_uint32_t_for_sparc64.patch b/debian/patches/redeclare_uint32_t_for_sparc64.patch
new file mode 100644
index 0000000..8473459
--- /dev/null
+++ b/debian/patches/redeclare_uint32_t_for_sparc64.patch
@@ -0,0 +1,35 @@
+Description: redefine uint32_t for sparc64
+ sparc64 needs a different definition for uint32_t.
+Author: David Matthew Mattli <dmm at mattli.us>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=806837
+Forwarded: not-needed
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Last-Update: 2015-12-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
++++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
+@@ -69,8 +69,12 @@
+ #endif
+ 
+ #if !USE(ICU_UNICODE)
++#ifdef __sparc_v9__
++typedef int32_t UChar32;
++#else
+ typedef uint32_t UChar32;
+ #endif
++#endif
+ 
+ namespace WTF {
+ namespace Unicode {
+--- a/Source/WTF/wtf/Atomics.h
++++ b/Source/WTF/wtf/Atomics.h
+@@ -98,7 +98,7 @@
+ inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
+ inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
+ 
+-#elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
++#elif COMPILER(GCC)
+ #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+ 
+ inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
diff --git a/debian/patches/series b/debian/patches/series
index 79f5097..9adc933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
 explicit_template_instantiation.patch
+redeclare_uint32_t_for_sparc64.patch

-- 
QtWebKit packaging