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

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


The following commit has been merged in the debian/unstable branch:
commit caefb46b1d1c9ac2ab78d4f37b86d46fb40eac80
Author: Mike Hommey <glandium at debian.org>
Date:   Sun Apr 6 19:06:40 2008 +0200

    Fix FTBFS with gcc 4.3
      * WebCore/platform/gtk/FileSystemGtk.cpp,
        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp: Fix FTBFX with gcc
        4.3 due to missing includes.

diff --git a/WebCore/platform/gtk/FileSystemGtk.cpp b/WebCore/platform/gtk/FileSystemGtk.cpp
index 3b46598..3d373cd 100644
--- a/WebCore/platform/gtk/FileSystemGtk.cpp
+++ b/WebCore/platform/gtk/FileSystemGtk.cpp
@@ -29,6 +29,8 @@
 #include <glib/gstdio.h>
 #include <glib/gutils.h>
 
+#include <unistd.h>
+
 namespace WebCore {
 
 bool fileExists(const String& path)
diff --git a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
index 724bcda..0a6f5f6 100644
--- a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
@@ -26,6 +26,8 @@
 #include "DumpRenderTree.h"
 #include <JavaScriptCore/JSStringRef.h>
 
+#include <cstring>
+
 // Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
 static gchar* JSStringCopyUTF8CString(JSStringRef jsString)
 {
diff --git a/debian/changelog b/debian/changelog
index ab672f9..987ba73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ webkit (0~svn29752-2) UNRELEASED; urgency=low
     Qt sources.
   * debian/libqtwebkit*: Removed.
   * debian/rules: Replaced make calls with $(MAKE).
+  * WebCore/platform/gtk/FileSystemGtk.cpp,
+    WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp: Fix FTBFX with gcc
+    4.3 due to missing includes.
 
  -- Mike Hommey <glandium at debian.org>  Sun, 06 Apr 2008 18:45:18 +0200
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list