[SCM] qt5webkit packaging branch, experimental, updated. debian/5.1.1-1-5-gbd23303

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Tue Dec 17 17:37:55 UTC 2013


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

The following commit has been merged in the experimental branch:
commit bd23303f9c61c0665334c221907ee12648f6dc37
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Dec 17 14:37:39 2013 -0300

    Refresh 05_sparc_unaligned_access.diff.
---
 debian/changelog                              | 1 +
 debian/patches/05_sparc_unaligned_access.diff | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95c3a94..a8d3ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-opensource-src (5.2.0-1) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
+  * Refresh 05_sparc_unaligned_access.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Dec 2013 11:23:02 -0300
 
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index 5a10b9e..f875008 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -1,6 +1,7 @@
 Description: fix some alignment problems on sparc.
 Author: Mike Hommey <glandium at debian.org>
 Author: Timo Jyrinki <timo at debian.org>
+Last-Update: 2013-12-17
 
 ---
  Source/JavaScriptCore/wtf/ListHashSet.h |    9 +++------
@@ -8,7 +9,7 @@ Author: Timo Jyrinki <timo at debian.org>
 
 --- a/Source/WTF/wtf/ListHashSet.h
 +++ b/Source/WTF/wtf/ListHashSet.h
-@@ -168,7 +168,7 @@ namespace WTF {
+@@ -173,7 +173,7 @@ namespace WTF {
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
          { 
@@ -17,14 +18,16 @@ Author: Timo Jyrinki <timo at debian.org>
          }
  
          Node* allocate()
-@@ -217,16 +217,13 @@ namespace WTF {
+@@ -217,7 +217,7 @@ namespace WTF {
          }
  
      private:
 -        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)
+         {
+@@ -227,10 +227,7 @@ namespace WTF {
          Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list