[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-1-1-g75e2e2d

Fathi Boudra fabo at alioth.debian.org
Wed Jul 7 06:54:02 UTC 2010


The following commit has been merged in the master branch:
commit 75e2e2de0a56433ab6b0aadbcf0f3774988fe2ac
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jul 7 09:53:42 2010 +0300

    Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc systems.
---
 debian/changelog                                   |    6 ++++++
 debian/patches/06_kfreebsd_strnstr.diff            |   15 +++++++++++++++
 ...7_s390_stabs_format_debugging_information.diff} |    0
 ...ns.diff => 08_powerpc_s390_no_gc_sections.diff} |    0
 debian/patches/series                              |    5 +++--
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef5aed6..c13f496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtwebkit (2.0~week26-2) experimental; urgency=low
+
+  * Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc systems.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 07 Jul 2010 09:51:03 +0300
+
 qtwebkit (2.0~week26-1) experimental; urgency=low
 
   * Initial release (Closes: #576006)
diff --git a/debian/patches/06_kfreebsd_strnstr.diff b/debian/patches/06_kfreebsd_strnstr.diff
new file mode 100644
index 0000000..b535c47
--- /dev/null
+++ b/debian/patches/06_kfreebsd_strnstr.diff
@@ -0,0 +1,15 @@
+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
+
+--- a/JavaScriptCore/wtf/Platform.h
++++ b/JavaScriptCore/wtf/Platform.h
+@@ -367,7 +367,7 @@
+ #endif
+ 
+ /* OS(LINUX) - Linux */
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #define WTF_OS_LINUX 1
+ #endif
+ 
diff --git a/debian/patches/06_s390_stabs_format_debugging_information.diff b/debian/patches/07_s390_stabs_format_debugging_information.diff
similarity index 100%
rename from debian/patches/06_s390_stabs_format_debugging_information.diff
rename to debian/patches/07_s390_stabs_format_debugging_information.diff
diff --git a/debian/patches/07_powerpc_s390_no_gc_sections.diff b/debian/patches/08_powerpc_s390_no_gc_sections.diff
similarity index 100%
rename from debian/patches/07_powerpc_s390_no_gc_sections.diff
rename to debian/patches/08_powerpc_s390_no_gc_sections.diff
diff --git a/debian/patches/series b/debian/patches/series
index 3d59bb2..acce5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,6 @@
 03_hide_std_symbols.diff
 04_enable_debug_information.diff
 05_sparc_unaligned_access.diff
-06_s390_stabs_format_debugging_information.diff
-07_powerpc_s390_no_gc_sections.diff
+06_kfreebsd_strnstr.diff
+07_s390_stabs_format_debugging_information.diff
+08_powerpc_s390_no_gc_sections.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list