[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[leandro at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d7bbe62fa2db0e74ce4e27655595ecee2af0d5a6
Author: leandro at webkit.org <leandro at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 18:42:11 2010 +0000

    2010-10-15  Leandro Pereira  <leandro at profusion.mobi>
    
            [EFL] Unreviewed. Build fix.
    
            Add new files needed by the Soup network backend, and #ifdef a
            GTK+-port only include in soup-cache.h.
    
            * CMakeListsEfl.txt:
            * platform/network/soup/cache/webkit/soup-cache.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 2131c23..9bb1f3d 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -92,6 +92,8 @@ ENDIF ()
 IF (WTF_USE_SOUP)
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network/soup"
+    "${WEBCORE_DIR}/platform/network/soup/cache"
+    "${WEBCORE_DIR}/platform/network/soup/cache/webkit"
   )
   LIST(APPEND WebCore_SOURCES
     platform/network/soup/CookieJarSoup.cpp
@@ -100,6 +102,16 @@ IF (WTF_USE_SOUP)
     platform/network/soup/ResourceRequestSoup.cpp
     platform/network/soup/ResourceResponseSoup.cpp
     platform/network/soup/SocketStreamHandleSoup.cpp
+
+    platform/network/soup/cache/soup-directory-input-stream.c
+    platform/network/soup/cache/soup-http-input-stream.c
+    platform/network/soup/cache/soup-request-data.c
+    platform/network/soup/cache/soup-request-file.c
+    platform/network/soup/cache/soup-request-http.c
+    platform/network/soup/cache/soup-request.c
+    platform/network/soup/cache/soup-requester.c
+
+    platform/network/soup/cache/webkit/soup-cache.c
   )
 ENDIF ()
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3d3099..7a91d28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-15  Leandro Pereira  <leandro at profusion.mobi>
+
+        [EFL] Unreviewed. Build fix.
+
+        Add new files needed by the Soup network backend, and #ifdef a
+        GTK+-port only include in soup-cache.h.
+
+        * CMakeListsEfl.txt:
+        * platform/network/soup/cache/webkit/soup-cache.h:
+
 2010-10-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.h b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
index 9a62bb9..2a5e5cb 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.h
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
@@ -23,7 +23,13 @@
 #ifndef WEBKIT_SOUP_CACHE_H
 #define WEBKIT_SOUP_CACHE_H 1
 
+#if PLATFORM(GTK)
 #include <webkit/webkitdefines.h>
+#else
+#ifndef WEBKIT_API
+#define WEBKIT_API
+#endif
+#endif
 
 #include <libsoup/soup-types.h>
 #include <gio/gio.h>

-- 
WebKit Debian packaging