[SCM] qt5webkit packaging branch, master, updated. debian/5.0.2-3-6-g5697190

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 421359d01f013964950b0f487dde86e01591e1b5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jul 14 23:39:41 2013 -0300

    refresh patches.
---
 debian/changelog                              |    1 +
 debian/patches/05_sparc_unaligned_access.diff |    6 ++----
 debian/patches/hurd.diff                      |    4 ++--
 debian/patches/no_gc_sections.diff            |    4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8363a5..6458891 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-opensource-src (5.1.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Fix watch file.
   * Bump Qt build depends to 5.1.0~.
+  * Refresh pacthes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Jul 2013 23:02:20 -0300
 
diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff
index ba7720d..5a10b9e 100644
--- a/debian/patches/05_sparc_unaligned_access.diff
+++ b/debian/patches/05_sparc_unaligned_access.diff
@@ -8,7 +8,7 @@ Author: Timo Jyrinki <timo at debian.org>
 
 --- a/Source/WTF/wtf/ListHashSet.h
 +++ b/Source/WTF/wtf/ListHashSet.h
-@@ -145,7 +145,7 @@ namespace WTF {
+@@ -168,7 +168,7 @@ namespace WTF {
              : m_freeList(pool())
              , m_isDoneWithInitialFreeList(false)
          { 
@@ -17,7 +17,7 @@ Author: Timo Jyrinki <timo at debian.org>
          }
  
          Node* allocate()
-@@ -189,7 +189,7 @@ namespace WTF {
+@@ -217,16 +217,13 @@ namespace WTF {
          }
  
      private:
@@ -26,8 +26,6 @@ Author: Timo Jyrinki <timo at debian.org>
          Node* pastPool() { return pool() + m_poolSize; }
  
          Node* m_freeList;
-@@ -200,10 +200,7 @@ namespace WTF {
-         Node* m_freeList;
          bool m_isDoneWithInitialFreeList;
          static const size_t m_poolSize = inlineCapacity;
 -        union {
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index e0b4153..a37ea82 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -13,7 +13,7 @@ Last-Update: 2011-12-30
 
 --- a/Source/WTF/wtf/FastMalloc.cpp
 +++ b/Source/WTF/wtf/FastMalloc.cpp
-@@ -1595,6 +1595,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su
+@@ -1744,6 +1744,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su
  void TCMalloc_PageHeap::initializeScavenger()
  {
      // Create a non-recursive mutex.
@@ -23,7 +23,7 @@ Last-Update: 2011-12-30
  #if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT
      pthread_mutex_init(&m_scavengeMutex, 0);
  #else
-@@ -1606,6 +1609,7 @@ void TCMalloc_PageHeap::initializeScaven
+@@ -1755,6 +1758,7 @@ void TCMalloc_PageHeap::initializeScaven
  
      pthread_mutexattr_destroy(&attr);
  #endif
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 72cb91a..4f26e9a 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -14,7 +14,7 @@ Last-Update: 2013-02-07 (add i686)
 
 --- a/Source/WebCore/WebCore.pri
 +++ b/Source/WebCore/WebCore.pri
-@@ -326,7 +326,7 @@ mac {
+@@ -289,7 +289,7 @@ mac {
      unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections
  }
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
@@ -22,4 +22,4 @@ Last-Update: 2013-02-07 (add i686)
 +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):!equals(QT_ARCH, i386):!equals(QT_ARCH, i686):QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
- unix|win32-g++* {
+ contains(DEFINES, ENABLE_OPENCL=1) {

-- 
qt5webkit packaging