[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 25173dc0c9c09ba639ef9dad2ca0e61186acae96
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 21:55:55 2014 +0200

    Refresh patch: 05_sparc_unaligned_access.diff
---
 debian/patches/05_sparc_unaligned_access.diff | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 152aede..ca9db7a 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -2,12 +2,12 @@ Description: fix some alignment problems on sparc.
 Author: Mike Hommey <glandium at debian.org>
 
 ---
- Source/JavaScriptCore/wtf/ListHashSet.h |    9 +++------
+ Source/WTF/wtf/ListHashSet.h |    9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
---- a/Source/JavaScriptCore/wtf/ListHashSet.h
-+++ b/Source/JavaScriptCore/wtf/ListHashSet.h
-@@ -145,7 +145,7 @@ namespace WTF {
+--- a/Source/WTF/wtf/ListHashSet.h
++++ b/Source/WTF/wtf/ListHashSet.h
+@@ -168,7 +168,7 @@
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
          { 
@@ -16,7 +16,7 @@ Author: Mike Hommey <glandium at debian.org>
          }
  
          Node* allocate()
-@@ -189,7 +189,7 @@ namespace WTF {
+@@ -217,16 +217,13 @@
          }
  
      private:
@@ -24,8 +24,6 @@ Author: Mike Hommey <glandium at debian.org>
 +        Node* pool() { return reinterpret_cast_ptr<Node*>(m_pool); }
          Node* pastPool() { return pool() + m_poolSize; }
  
-         bool inPool(Node* node)
-@@ -200,10 +200,7 @@ namespace WTF {
          Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;

-- 
QtWebKit packaging