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

[Pino Toscano]

The following commit has been merged in the master branch:
commit 81e7d8fc8c500e87669ec2f0aab8c552e94aac87
Author: Pino Toscano <pino at debian.org>
Date:   Wed Aug 10 21:20:20 2011 +0200

    05_sparc_unaligned_access.diff: reduce unneeded changes
---
 debian/changelog                              |    1 +
 debian/patches/05_sparc_unaligned_access.diff |   18 ++++--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0c545b..79a9a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit (2.1.0~2011week13-3) UNRELEASED; urgency=low
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
     - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
   * Add patch s390.diff from upstream to support s390x. (Closes: #637004)
+  * Patch 05_sparc_unaligned_access.diff: reduce unneeded changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Jun 2011 12:52:21 +0200
 
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 738467c..28c055a 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -41,20 +41,18 @@ Author: Mike Hommey <glandium at debian.org>
      template<typename ValueArg, size_t inlineCapacity> struct ListHashSetNode {
 --- a/JavaScriptCore/wtf/text/AtomicString.cpp
 +++ b/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -128,9 +128,9 @@ static inline bool equal(StringImpl* str
-     if (string->length() != length)
-         return false;
+@@ -130,7 +130,7 @@ static inline bool equal(StringImpl* str
  
-+#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
      // 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/JavaScriptCore/wtf/text/StringHash.h
 +++ b/JavaScriptCore/wtf/text/StringHash.h
-@@ -56,13 +56,13 @@ namespace WebCore {
+@@ -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
@@ -62,12 +60,4 @@ Author: Mike Hommey <glandium at debian.org>
 +#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
              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 */
+             for (unsigned i = 0; i != aLength; ++i) {

-- 
QtWebKit packaging