[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-2-g9c2d1f8

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit da1b2a96c60b29cc1716b66ab1dd70d56bd7800a
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat Jun 26 23:38:41 2010 -0400

    convert direct source changes into a patch

diff --git a/debian/changelog b/debian/changelog
index 3cffafb..b711931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webkit (1.2.1-3) UNRELEASED; urgency=high
+
+  * Turn direct source changes into a patch.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Thu, 27 May 2010 20:36:41 -0400
+
 webkit (1.2.1-2) unstable; urgency=high
 
   * debian/patches/01-fix-bashism-in-build.diff:
diff --git a/debian/patches/02-pool-fixup-and-sparc-support.patch b/debian/patches/02-pool-fixup-and-sparc-support.patch
new file mode 100644
index 0000000..3b1c5c4
--- /dev/null
+++ b/debian/patches/02-pool-fixup-and-sparc-support.patch
@@ -0,0 +1,65 @@
+Description: Fixup pool and add sparc support
+--- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
++++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
+@@ -127,7 +127,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 {
+         }
+ 
+     private:
+-        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
++        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
+         Node* pastPool() { return pool() + m_poolSize; }
+ 
+         bool inPool(Node* node)
+@@ -182,10 +182,7 @@ namespace WTF {
+         Node* m_freeList;
+         bool m_isDoneWithInitialFreeList;
+         static const size_t m_poolSize = 256;
+-        union {
+-            char pool[sizeof(Node) * m_poolSize];
+-            double forAlignment;
+-        } m_pool;
++        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
+     };
+ 
+     template<typename ValueArg> struct ListHashSetNode {
+--- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
++++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
+@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
+     if (string->length() != length)
+         return false;
+ 
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+     // 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)
+     const UChar* stringCharacters = string->characters();
+     for (unsigned i = 0; i != length; ++i) {
+         if (*stringCharacters++ != *characters++)
+--- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
++++ webkit-1.2.1/WebCore/platform/text/StringHash.h
+@@ -54,13 +54,13 @@ 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(SPARC) || CPU(SH4)
+             const UChar* aChars = a->characters();
+             const UChar* bChars = b->characters();
+-            for (unsigned i = 0; i != aLength; ++i) {
++            for (unsigned i = 0; i != aLength; ++i)
+                 if (*aChars++ != *bChars++)
+                     return false;
+-            }
++
+             return true;
+ #else
+             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/debian/patches/series b/debian/patches/series
index 1ed8c9b..ea397c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix-bashism-in-build.diff
+02-pool-fixup-and-sparc-support.patch

-- 
WebKit Debian packaging