[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.0-1-62-g0ceb81e

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 9cdab6638c3454be3c646afd5b80a8b1dd027754
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Thu May 13 17:44:51 2010 -0300

    Remove patches made obsolete by the new version

diff --git a/debian/patches/pool-fixup.patch b/debian/patches/pool-fixup.patch
deleted file mode 100644
index 63f55e2..0000000
--- a/debian/patches/pool-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-description: fix up pool
---- webkit-1.2.0.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.2.0/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@
-             : 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 @@
-         }
- 
-     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 @@
-         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 {
diff --git a/debian/patches/series b/debian/patches/series
index 373fdd5..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-sparc-support.patch
-pool-fixup.patch
diff --git a/debian/patches/sparc-support.patch b/debian/patches/sparc-support.patch
deleted file mode 100644
index cf1afe8..0000000
--- a/debian/patches/sparc-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-description: add support for sparc architecture
---- webkit-1.2.0.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.2.0/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@
-     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.0.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.2.0/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@
- 
-             // 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 */

-- 
WebKit Debian packaging