[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478

Mike Hommey glandium at debian.org
Sat Apr 12 19:56:53 UTC 2008 

The following commit has been merged in the debian/unstable branch:
commit 68cedd89e7f21894660c7897c93adbe239fb5bd4
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Feb 21 22:54:41 2008 +0100

    Fix FTBFS with gcc 4.3
      * JavaScriptCore/kjs/interpreter.cpp, JavaScriptCore/wtf/ASCIICType.h,
        WebCore/dom/Position.cpp, WebCore/editing/Selection.cpp,
        WebCore/editing/SelectionController.cpp,
        WebCore/editing/VisiblePosition.cpp,
        WebCore/ksvg2/svg/SVGFontFaceElement.cpp,
        WebCore/loader/FTPDirectoryParser.cpp,
        WebCore/loader/icon/IconDatabase.cpp,
        WebCore/platform/TextCodecLatin1.cpp,
        WebCore/platform/TextCodecUserDefined.cpp,
        WebCore/platform/TextStream.cpp,
        WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp: Fix FTBFS with
        gcc 4.3 due to missing includes. Closes: #455125.

diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/kjs/interpreter.cpp
index 1cf0b59..2cf5f76 100644
--- a/JavaScriptCore/kjs/interpreter.cpp
+++ b/JavaScriptCore/kjs/interpreter.cpp
@@ -58,6 +58,8 @@
 
 #if PLATFORM(WIN_OS)
 #include <windows.h>
+#else
+#include <unistd.h>
 #endif
 
 #if PLATFORM(QT)
diff --git a/JavaScriptCore/wtf/ASCIICType.h b/JavaScriptCore/wtf/ASCIICType.h
index 849b811..3e61a87 100644
--- a/JavaScriptCore/wtf/ASCIICType.h
+++ b/JavaScriptCore/wtf/ASCIICType.h
@@ -49,10 +49,10 @@ namespace WTF {
     inline bool isASCIIAlpha(wchar_t c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
 #endif
 
-    inline bool isASCIIAlphanumeric(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
-    inline bool isASCIIAlphanumeric(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
+    inline bool isASCIIAlphanumeric(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
+    inline bool isASCIIAlphanumeric(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
 #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-    inline bool isASCIIAlphanumeric(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
+    inline bool isASCIIAlphanumeric(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
 #endif
 
     inline bool isASCIIDigit(char c) { return c >= '0' && c <= '9'; }
@@ -61,10 +61,10 @@ namespace WTF {
     inline bool isASCIIDigit(wchar_t c) { return c >= '0' && c <= '9'; }
 #endif
 
-    inline bool isASCIIHexDigit(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
-    inline bool isASCIIHexDigit(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
+    inline bool isASCIIHexDigit(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
+    inline bool isASCIIHexDigit(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
 #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-    inline bool isASCIIHexDigit(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
+    inline bool isASCIIHexDigit(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
 #endif
 
     inline bool isASCIILower(char c) { return c >= 'a' && c <= 'z'; }
diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp
index 48e179a..0c9ae73 100644
--- a/WebCore/dom/Position.cpp
+++ b/WebCore/dom/Position.cpp
@@ -38,6 +38,8 @@
 #include "Text.h"
 #include "TextIterator.h"
 #include "visible_units.h"
+
+#include <cstdio>
   
 namespace WebCore {
 
diff --git a/WebCore/editing/Selection.cpp b/WebCore/editing/Selection.cpp
index c799335..d69bc49 100644
--- a/WebCore/editing/Selection.cpp
+++ b/WebCore/editing/Selection.cpp
@@ -33,6 +33,7 @@
 #include "visible_units.h"
 #include "Range.h"
 #include <wtf/Assertions.h>
+#include <cstdio>
 
 namespace WebCore {
 
diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index b0115d4..0afe3e4 100644
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -49,6 +49,8 @@
 #include "htmlediting.h"
 #include "visible_units.h"
 
+#include <cstdio>
+
 #define EDIT_DEBUG 0
 
 namespace WebCore {
diff --git a/WebCore/editing/VisiblePosition.cpp b/WebCore/editing/VisiblePosition.cpp
index 3ca28f7..852822f 100644
--- a/WebCore/editing/VisiblePosition.cpp
+++ b/WebCore/editing/VisiblePosition.cpp
@@ -35,6 +35,7 @@
 #include "Text.h"
 #include "htmlediting.h"
 #include "visible_units.h"
+#include <cstdio>
 
 namespace WebCore {
 
diff --git a/WebCore/ksvg2/svg/SVGFontFaceElement.cpp b/WebCore/ksvg2/svg/SVGFontFaceElement.cpp
index a358753..a05bcf6 100644
--- a/WebCore/ksvg2/svg/SVGFontFaceElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFontFaceElement.cpp
@@ -31,6 +31,8 @@ Boston, MA 02110-1301, USA.
 #include "SVGFontFaceSrcElement.h"
 #include "SVGDefinitionSrcElement.h"
 
+#include <cstdio>
+
 namespace WebCore {
 
 using namespace SVGNames;
diff --git a/WebCore/loader/FTPDirectoryParser.cpp b/WebCore/loader/FTPDirectoryParser.cpp
index 3c624ea..e36013d 100644
--- a/WebCore/loader/FTPDirectoryParser.cpp
+++ b/WebCore/loader/FTPDirectoryParser.cpp
@@ -25,6 +25,7 @@
 #include "FTPDirectoryParser.h"
 
 #include <wtf/ASCIICType.h>
+#include <cstdio>
 
 using namespace WTF;
 
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index bd9cf81..e4502a3 100644
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -49,6 +49,8 @@
 #include <sys/stat.h>
 #endif
 
+#include <pthread.h>
+
 #include <errno.h>
 
 // For methods that are meant to support API from the main thread - should not be called internally
diff --git a/WebCore/platform/TextCodecLatin1.cpp b/WebCore/platform/TextCodecLatin1.cpp
index 74693c6..c80cb20 100644
--- a/WebCore/platform/TextCodecLatin1.cpp
+++ b/WebCore/platform/TextCodecLatin1.cpp
@@ -29,6 +29,8 @@
 #include "CString.h"
 #include "PlatformString.h"
 
+#include <cstdio>
+
 using std::auto_ptr;
 
 namespace WebCore {
diff --git a/WebCore/platform/TextCodecUserDefined.cpp b/WebCore/platform/TextCodecUserDefined.cpp
index 2ac56b8..4f774ee 100644
--- a/WebCore/platform/TextCodecUserDefined.cpp
+++ b/WebCore/platform/TextCodecUserDefined.cpp
@@ -29,6 +29,8 @@
 #include "CString.h"
 #include "PlatformString.h"
 
+#include <cstdio>
+
 using std::auto_ptr;
 
 namespace WebCore {
diff --git a/WebCore/platform/TextStream.cpp b/WebCore/platform/TextStream.cpp
index 64df346..d076a83 100644
--- a/WebCore/platform/TextStream.cpp
+++ b/WebCore/platform/TextStream.cpp
@@ -30,6 +30,7 @@
 #include "Logging.h"
 #include "PlatformString.h"
 #include <wtf/Vector.h>
+#include <cstdio>
 
 namespace WebCore {
 
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index cc246e2..b6959c1 100644
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "config.h"
+#include <cstdio>
 #include "JPEGImageDecoder.h"
 #include <assert.h>
 
diff --git a/debian/changelog b/debian/changelog
index 6f8c765..30c0f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,18 @@ webkit (0~svn27674-4) UNRELEASED; urgency=low
     enough.
   * WebKit.pro: Don't build testkjs, that provokes the s390 FTBFSes ; we don't
     install it anyways. Closes: #466848.
+  * JavaScriptCore/kjs/interpreter.cpp, JavaScriptCore/wtf/ASCIICType.h,
+    WebCore/dom/Position.cpp, WebCore/editing/Selection.cpp,
+    WebCore/editing/SelectionController.cpp,
+    WebCore/editing/VisiblePosition.cpp,
+    WebCore/ksvg2/svg/SVGFontFaceElement.cpp,
+    WebCore/loader/FTPDirectoryParser.cpp,
+    WebCore/loader/icon/IconDatabase.cpp,
+    WebCore/platform/TextCodecLatin1.cpp,
+    WebCore/platform/TextCodecUserDefined.cpp,
+    WebCore/platform/TextStream.cpp,
+    WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp: Fix FTBFS with
+    gcc 4.3 due to missing includes. Closes: #455125.
 
  -- Mike Hommey <glandium at debian.org>  Thu, 21 Feb 2008 20:54:07 +0100
 
@@ -93,3 +105,4 @@ webkit (0~svn24735-1) unstable; urgency=low
   * Initial release. (Closes: #428855)
 
  -- Mike Hommey <glandium at debian.org>  Wed, 15 Aug 2007 14:19:46 +0200
+

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list