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

demarchi at webkit.org demarchi at webkit.org
Wed Dec 22 13:39:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4847d4523a8aeefc0befb3e4bfc22c1d2ef192b2
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 15:27:03 2010 +0000

    2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Unreviewed, EFL build fix.
    
            * CMakeListsEfl.txt:
            * platform/efl/ClipboardEfl.cpp:
            (WebCore::ClipboardEfl::ClipboardEfl):
    2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Unreviewed, EFL build fix.
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index c892cf4..a4d4a60 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -67,6 +67,7 @@ IF (WTF_PLATFORM_CAIRO)
     "${WEBCORE_DIR}/platform/graphics/cairo"
   )
   LIST(APPEND WebCore_SOURCES
+    platform/graphics/cairo/CairoUtilities.cpp
     platform/graphics/cairo/FontCacheFreeType.cpp
     platform/graphics/cairo/FontCairo.cpp
     platform/graphics/cairo/FontCustomPlatformData.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 155ed96..9fa5213 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Unreviewed, EFL build fix.
+
+        * CMakeListsEfl.txt:
+        * platform/efl/ClipboardEfl.cpp:
+        (WebCore::ClipboardEfl::ClipboardEfl):
+
 2010-09-22  İsmail Dönmez  <ismail at namtrac.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/efl/ClipboardEfl.cpp b/WebCore/platform/efl/ClipboardEfl.cpp
index fdc3813..a7c2a54 100644
--- a/WebCore/platform/efl/ClipboardEfl.cpp
+++ b/WebCore/platform/efl/ClipboardEfl.cpp
@@ -38,7 +38,7 @@ PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy, DragData*, Frame*
 }
 
 ClipboardEfl::ClipboardEfl(ClipboardAccessPolicy policy, ClipboardType clipboardType)
-    : Clipboard(clipboardType, forDragging)
+    : Clipboard(policy, clipboardType)
 {
     notImplemented();
 }
diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 6bc5100..7de8686 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -1,6 +1,7 @@
 SET(WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}"
     "${WEBCORE_DIR}"
+    "${WEBCORE_DIR}/accessibility"
     "${WEBCORE_DIR}/bindings/js"
     "${WEBCORE_DIR}/bindings"
     "${WEBCORE_DIR}/bridge"
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 19ddf85..0126336 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Unreviewed, EFL build fix.
+
+        * CMakeLists.txt:
+
 2010-09-20  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Eric Carlson.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list