[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-2-5-gdbf11da

[Pino Toscano]

The following commit has been merged in the master branch:
commit dbf11da14a631417922d18b9435727d70ed79409
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 30 13:17:11 2011 +0100

    add patch hurd.diff to temporarly workaround build failure on Hurd
---
 debian/changelog         |    1 +
 debian/patches/hurd.diff |   29 +++++++++++++++++++++++++++++
 debian/patches/series    |    1 +
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddc2d6f..4dcc1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit (2.2.0-3) UNRELEASED; urgency=low
   * Update the symbols file for ia64 and mipsel architectures.
 
   [ Pino Toscano ]
+  * Add patch hurd.diff to temporarly workaround build failure on Hurd.
   * Update the symbols file for hurd-i386, sh4, and sparc64 architectures.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 28 Dec 2011 10:10:59 +0200
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
new file mode 100644
index 0000000..83d4866
--- /dev/null
+++ b/debian/patches/hurd.diff
@@ -0,0 +1,29 @@
+Author: Pino Toscano <pino at debian.org>
+Description: fix (workaround) build on GNU/Hurd
+ Apparently PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT cannot be used
+ in preprocessor expressions, so temporarly use directly the code which would
+ be used on GNU/Hurd.
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2011-12-30
+
+--- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
++++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
+@@ -1595,6 +1595,9 @@
+ void TCMalloc_PageHeap::initializeScavenger()
+ {
+     // Create a non-recursive mutex.
++#if defined(__GNU__)
++    pthread_mutex_init(&m_scavengeMutex, 0);
++#else
+ #if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT
+     pthread_mutex_init(&m_scavengeMutex, 0);
+ #else
+@@ -1606,6 +1609,7 @@
+ 
+     pthread_mutexattr_destroy(&attr);
+ #endif
++#endif
+ 
+     pthread_cond_init(&m_scavengeCondition, 0);
+     m_scavengeThreadActive = true;
diff --git a/debian/patches/series b/debian/patches/series
index b2d2bc4..d0b4dc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ no_gc_sections.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
 glibc_mkspec.diff
+hurd.diff

-- 
QtWebKit packaging