[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-19-g6ae129c

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6ae129c92fe4d3ff49b813030f8a593fc4650a66
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 11:26:57 2011 +0200

    05_sparc_unaligned_access.diff: refresh and reenable
---
 debian/changelog                              |    5 ++-
 debian/patches/05_sparc_unaligned_access.diff |   42 ++++++-------------------
 debian/patches/series                         |    2 +-
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be040c2..8911323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
 qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release:
-    - include 0001_fix_symbols_visibility_for_webcore.diff - stolen upstream.
     - provides support for s390/s390x. (Closes: #637004)
+  * Update patches:
+    - 0001_fix_symbols_visibility_for_webcore.diff: drop, stolen upstream.
+    - 05_sparc_unaligned_access.diff: refresh
 
   [ Pino Toscano ]
   * Use wildcard architectures: (Closes: #634388)
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
     - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
-  * Patch 05_sparc_unaligned_access.diff: reduce unneeded changes.
   * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
 
   [Fathi Boudra]
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 368387a..2418c5a 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -9,25 +9,25 @@ Author: Mike Hommey <glandium at debian.org>
 
 --- a/Source/JavaScriptCore/wtf/ListHashSet.h
 +++ b/Source/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
+@@ -145,7 +145,7 @@ namespace WTF {
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
-         {
+         { 
 -            memset(m_pool.pool, 0, sizeof(m_pool.pool));
 +            memset(m_pool, 0, sizeof(m_pool));
          }
-
+ 
          Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
+@@ -189,7 +189,7 @@ namespace WTF {
          }
-
+ 
      private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
+-        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool.pool); }
++        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool); }
          Node* pastPool() { return pool() + m_poolSize; }
-
+ 
          bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
+@@ -200,10 +200,7 @@ namespace WTF {
          Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;
@@ -37,27 +37,5 @@ Author: Mike Hommey <glandium at debian.org>
 -        } m_pool;
 +        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
      };
-
+ 
      template<typename ValueArg, size_t inlineCapacity> struct ListHashSetNode {
---- a/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-+++ b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -130,7 +130,7 @@ static inline bool equal(StringImpl* str
-
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- a/Source/JavaScriptCore/wtf/text/StringHash.h
-+++ b/Source/JavaScriptCore/wtf/text/StringHash.h
-@@ -56,7 +56,7 @@ namespace WebCore {
-
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
-             for (unsigned i = 0; i != aLength; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index 4c9ba1a..4f7427d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,7 @@
 02_add_nostrip_for_debug_packages.diff
 03_hide_std_symbols.diff
 04_enable_debug_information.diff
-#05_sparc_unaligned_access.diff
+05_sparc_unaligned_access.diff
 06_kfreebsd_strnstr.diff
 stabs_format_debug_info.diff
 #no_gc_sections.diff

-- 
QtWebKit packaging