[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:27:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9af3bf1f5154ef7f2b0aa7fb49e7fb3c758162f5
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 12:07:05 2010 +0000

    2010-09-16  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Unreviewed build fix for EFL
    
            [EFL] REGRESSION(67567) FontCacheCairo was removed
            https://bugs.webkit.org/show_bug.cgi?id=45858
    
            * CMakeListsEfl.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index 66fb485..6d41543 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -65,8 +65,8 @@ IF (WTF_PLATFORM_CAIRO)
     "${WEBCORE_DIR}/platform/graphics/cairo"
   )
   LIST(APPEND WebCore_SOURCES
-    platform/graphics/cairo/FontCacheCairo.cpp
-    platform/graphics/cairo/FontCairoFreeType.cpp
+    platform/graphics/cairo/FontCacheFreeType.cpp
+    platform/graphics/cairo/FontCairo.cpp
     platform/graphics/cairo/FontCustomPlatformData.cpp
     platform/graphics/cairo/FontPlatformDataFreeType.cpp
     platform/graphics/cairo/OwnPtrCairo.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 34801b9..b970ced 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-16  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Unreviewed build fix for EFL
+
+        [EFL] REGRESSION(67567) FontCacheCairo was removed
+        https://bugs.webkit.org/show_bug.cgi?id=45858
+
+        * CMakeListsEfl.txt:
+
 2010-09-16  Yong Li  <yoli at rim.com>
 
         Reviewed by George Staikos.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list