[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=aa00e3a

The following commit has been merged in the experimental branch:
commit aa00e3ac977f5c18f028f04875cdbaec9e1cc947
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 23:02:37 2014 +0200

    Refresh patch: hurd.diff
---
 debian/patches/hurd.diff | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 1631c4d..7a1053e 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -11,9 +11,9 @@ Last-Update: 2011-12-30
  Source/JavaScriptCore/wtf/FastMalloc.cpp |    4 ++++
  1 file changed, 4 insertions(+)
 
---- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1595,6 +1595,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su
+--- a/Source/WTF/wtf/FastMalloc.cpp
++++ b/Source/WTF/wtf/FastMalloc.cpp
+@@ -1744,6 +1744,9 @@
  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 @@
  
      pthread_mutexattr_destroy(&attr);
  #endif

-- 
QtWebKit packaging