[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-2-3-gcd68765

[Sune Vuorela]

The following commit has been merged in the master branch:
commit cd6876593c248f818c9418b662329ab40dd883e5
Author: Sune Vuorela <pusling at eider.killmulehill.net>
Date:   Fri Apr 9 01:45:36 2010 +0200

    Also add the GNU/kFreeBSD patch from 4:4.6.2-1 to the second
    JavaScriptCore copy (used for QtSCript)
---
 debian/changelog                                  |    2 ++
 debian/patches/51_kfreebsd_strnstr_build_fix.diff |   11 +++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e68d6e8..225df48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qt4-x11 (4:4.6.2-3) experimentalUNRELEASED; urgency=low
     and thus the build fails, as the linker can't handle more than a couple of
     GB large files, and debugging symbols on s390 are real large. This is a
     repetition of #528485
+  * Also add the GNU/kFreeBSD patch from 4:4.6.2-1 to the second
+    JavaScriptCore copy (used for QtSCript)
 
  -- Sune Vuorela <debian at pusling.com>  Fri, 09 Apr 2010 01:37:15 +0200
 
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 1c0a814..7184ebd 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -12,4 +12,15 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 +#if defined(__linux__) || defined(__GLIBC__)
  #define WTF_PLATFORM_LINUX 1
  #endif
+
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -68,7 +68,7 @@
+ /* PLATFORM(LINUX) */
+ /* Operating system level dependencies for Linux-like systems that */
+ /* should be used regardless of operating environment */
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #define WTF_PLATFORM_LINUX 1
+ #endif
  

-- 
Qt 4 Debian packaging