[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-26-g95b5835

[Pino Toscano]

The following commit has been merged in the master branch:
commit d255a9fcae95e9ac5335034865ad03b5e908da55
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 20:00:22 2011 +0200

    drop patches 06_kfreebsd_strnstr.diff and 09_hurd.diff
    
    now strnstr() is properly enabled in WTF
---
 debian/changelog                        |    2 ++
 debian/patches/06_kfreebsd_strnstr.diff |   19 -------------------
 debian/patches/09_hurd.diff             |   28 ----------------------------
 debian/patches/series                   |    2 --
 4 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b20788..b0eea9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
     - 0001_fix_symbols_visibility_for_webcore.diff: drop, stolen upstream.
     - 05_sparc_unaligned_access.diff: refresh
     - no_gc_sections.diff: refresh
+    - 06_kfreebsd_strnstr.diff, 09_hurd.diff: drop, now strnstr() is properly
+      enabled
 
   [ Pino Toscano ]
   * Use wildcard architectures: (Closes: #634388)
diff --git a/debian/patches/06_kfreebsd_strnstr.diff b/debian/patches/06_kfreebsd_strnstr.diff
deleted file mode 100644
index 0fee625..0000000
--- a/debian/patches/06_kfreebsd_strnstr.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc systems.
-Author: Fathi Boudra <fabo at debian.org>
-Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
-
----
- Source/JavaScriptCore/wtf/Platform.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Source/JavaScriptCore/wtf/Platform.h
-+++ b/Source/JavaScriptCore/wtf/Platform.h
-@@ -423,7 +423,7 @@
- #endif
- 
- /* OS(LINUX) - Linux */
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- #define WTF_OS_LINUX 1
- #endif
- 
diff --git a/debian/patches/09_hurd.diff b/debian/patches/09_hurd.diff
deleted file mode 100644
index e368ea9..0000000
--- a/debian/patches/09_hurd.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
----
- Source/JavaScriptCore/wtf/Platform.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/Source/JavaScriptCore/wtf/Platform.h
-+++ b/Source/JavaScriptCore/wtf/Platform.h
-@@ -28,6 +28,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 c8a34da..97c8e15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,9 +6,7 @@
 03_hide_std_symbols.diff
 04_enable_debug_information.diff
 05_sparc_unaligned_access.diff
-06_kfreebsd_strnstr.diff
 stabs_format_debug_info.diff
 no_gc_sections.diff
-09_hurd.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff

-- 
QtWebKit packaging