[SCM] qt5webkit packaging branch, experimental, updated. debian/5.1.1-1-7-g0650c28

[Lisandro Damián Nicanor Pérez]

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

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

    Refresh hurd.diff.
---
 debian/changelog         | 2 +-
 debian/patches/hurd.diff | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 544ec8d..2bbffc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +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 and no_gc_sections.diff.
+  * Refresh 05_sparc_unaligned_access.diff, no_gc_sections.diff and hurd.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/hurd.diff b/debian/patches/hurd.diff
index a37ea82..46318d3 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
-@@ -1744,6 +1744,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su
+@@ -1966,6 +1966,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
-@@ -1755,6 +1758,7 @@ void TCMalloc_PageHeap::initializeScaven
+@@ -1977,6 +1980,7 @@ void TCMalloc_PageHeap::initializeScaven
  
      pthread_mutexattr_destroy(&attr);
  #endif

-- 
qt5webkit packaging