[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-14-g44e3b37

[Pino Toscano]

The following commit has been merged in the master branch:
commit 44e3b37a4110f5eed457e9a3c14b8404157aba32
Author: Pino Toscano <pino at kde.org>
Date:   Tue Jan 4 12:10:17 2011 +0100

    add patch 09_hurd.diff to fix compilation on Hurd
---
 debian/changelog            |    3 +++
 debian/patches/09_hurd.diff |   24 ++++++++++++++++++++++++
 debian/patches/series       |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c470897..e80e80f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ qtwebkit (2.1~week35-1) UNRELEASED; urgency=low
   [ Modestas Vainius ]
   * Fix debian/control Vcs fields to point to the new location.
 
+  [ Pino Toscano ]
+  * Add patch 09_hurd.diff to fix compilation on Hurd.
+
  -- Fathi Boudra <fabo at debian.org>  Sun, 05 Sep 2010 09:08:05 +0300
 
 qtwebkit (2.0~week26-2) experimental; urgency=low
diff --git a/debian/patches/09_hurd.diff b/debian/patches/09_hurd.diff
new file mode 100644
index 0000000..23a6dca
--- /dev/null
+++ b/debian/patches/09_hurd.diff
@@ -0,0 +1,24 @@
+Author: Pino Toscano <pino at kde.org>
+Description: quick fix for compilation on Debian/Hurd
+ Patch 06_kfreebsd_strnstr.diff uses __GLIBC__, so make sure to have this
+ definition (provided by any C stdlib header) at this time. Include stdlib.h
+ on Hurd only, as it seems to be working already on the other archs.
+ A better fix (adding WTF_OS_HURD and using it where needed) should be done
+ upstream.
+Forwarded: no
+Last-Update: 2011-01-04
+
+--- a/JavaScriptCore/wtf/Platform.h
++++ b/JavaScriptCore/wtf/Platform.h
+@@ -27,6 +27,11 @@
+ #ifndef WTF_Platform_h
+ #define WTF_Platform_h
+ 
++/* make sure to have __GLIBC__, at least on Hurd */
++#ifdef __GNU__
++#include <stdlib.h>
++#endif
++
+ /* ==== PLATFORM handles OS, operating environment, graphics API, and
+    CPU. This macro will be phased out in favor of platform adaptation
+    macros, policy decision macros, and top-level port definitions. ==== */
diff --git a/debian/patches/series b/debian/patches/series
index acce5e4..a461737 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 06_kfreebsd_strnstr.diff
 07_s390_stabs_format_debugging_information.diff
 08_powerpc_s390_no_gc_sections.diff
+09_hurd.diff

-- 
QtWebKit packaging