[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:50:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 526c49ee0054a64b51118f52948b7eb757899cdd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Nov 14 20:14:59 2010 +0000
2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Martin Robinson.
[EFL] add pango support
https://bugs.webkit.org/show_bug.cgi?id=46029
Add FONT_BACKEND option to switch between pango and freetype.
* cmake/OptionsEfl.cmake:
2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Martin Robinson.
[EFL] add pango support
https://bugs.webkit.org/show_bug.cgi?id=46029
Include pango related files.
No new tests; functionality is unchanged.
* CMakeListsEfl.txt:
2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Martin Robinson.
[EFL] add pango support
https://bugs.webkit.org/show_bug.cgi?id=46029
Add pango in include and libs.
* CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71987 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index c32158d..3ad287d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Martin Robinson.
+
+ [EFL] add pango support
+ https://bugs.webkit.org/show_bug.cgi?id=46029
+
+ Add FONT_BACKEND option to switch between pango and freetype.
+
+ * cmake/OptionsEfl.cmake:
+
2010-11-11 Eric Seidel <eric at webkit.org>
Rubber-stamped by Adam Roben.
diff --git a/WebCore/CMakeListsEfl.txt b/WebCore/CMakeListsEfl.txt
index a257a72..789cfdc 100644
--- a/WebCore/CMakeListsEfl.txt
+++ b/WebCore/CMakeListsEfl.txt
@@ -65,7 +65,6 @@ LIST(APPEND WebCore_SOURCES
IF (WTF_PLATFORM_CAIRO)
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/freetype"
)
LIST(APPEND WebCore_SOURCES
platform/graphics/cairo/CairoUtilities.cpp
@@ -80,14 +79,39 @@ IF (WTF_PLATFORM_CAIRO)
platform/graphics/cairo/PatternCairo.cpp
platform/graphics/cairo/RefPtrCairo.cpp
platform/graphics/cairo/TransformationMatrixCairo.cpp
- platform/graphics/freetype/FontCacheFreeType.cpp
- platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
- platform/graphics/freetype/FontPlatformDataFreeType.cpp
- platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
- platform/graphics/freetype/SimpleFontDataFreeType.cpp
platform/image-decoders/cairo/ImageDecoderCairo.cpp
)
+
+ IF (WTF_USE_FREETYPE)
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/freetype"
+ )
+ LIST(APPEND WebCore_SOURCES
+ platform/graphics/freetype/FontCacheFreeType.cpp
+ platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+ platform/graphics/freetype/FontPlatformDataFreeType.cpp
+ platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
+ platform/graphics/freetype/SimpleFontDataFreeType.cpp
+ )
+ ENDIF ()
+
+ IF (WTF_USE_PANGO)
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/pango"
+ ${Pango_INCLUDE_DIRS}
+ )
+ LIST(APPEND WebCore_SOURCES
+ platform/graphics/pango/FontCachePango.cpp
+ platform/graphics/pango/FontCustomPlatformDataPango.cpp
+ platform/graphics/pango/FontPlatformDataPango.cpp
+ platform/graphics/pango/GlyphPageTreeNodePango.cpp
+ platform/graphics/pango/SimpleFontDataPango.cpp
+ )
+ LIST(APPEND WebCore_LIBRARIES
+ ${Pango_LIBRARIES}
+ )
+ ENDIF ()
ENDIF ()
IF (WTF_USE_SOUP)
@@ -165,7 +189,6 @@ LIST(APPEND WebCore_LIBRARIES
${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
- ${Pango_LIBRARIES}
${SQLITE_LIBRARIES}
)
@@ -199,7 +222,6 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${ICU_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
- ${Pango_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3cca0c3..2fa0edd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Martin Robinson.
+
+ [EFL] add pango support
+ https://bugs.webkit.org/show_bug.cgi?id=46029
+
+ Include pango related files.
+ No new tests; functionality is unchanged.
+
+ * CMakeListsEfl.txt:
+
2010-11-12 Tenghui Zhu <ztenghui at google.com>
Reviewed by Andreas Kling.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 1819883..d2c70b9 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -11,7 +11,6 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/efl/ewk"
"${WEBKIT_DIR}/efl/WebCoreSupport"
"${WEBCORE_DIR}/platform/efl"
- "${WEBCORE_DIR}/platform/graphics/freetype"
${Cairo_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
@@ -32,6 +31,22 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
)
ENDIF()
+IF (WTF_USE_FREETYPE)
+ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/freetype"
+ )
+ENDIF ()
+
+IF (WTF_USE_PANGO)
+ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/graphics/pango"
+ ${Pango_INCLUDE_DIRS}
+ )
+ LIST(APPEND WebKit_LIBRARIES
+ ${Pango_LIBRARIES}
+ )
+ENDIF ()
+
LIST(APPEND WebKit_SOURCES
efl/WebCoreSupport/ChromeClientEfl.cpp
efl/WebCoreSupport/ContextMenuClientEfl.cpp
@@ -59,7 +74,6 @@ LIST(APPEND WebKit_LIBRARIES
${EFLDEPS_LIBRARIES}
${Freetype_LIBRARIES}
${LIBXML2_LIBRARIES}
- ${Pango_LIBRARIES}
${SQLITE_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${PNG_LIBRARY}
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index a872105..cc38037 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Martin Robinson.
+
+ [EFL] add pango support
+ https://bugs.webkit.org/show_bug.cgi?id=46029
+
+ Add pango in include and libs.
+
+ * CMakeListsEfl.txt:
+
2010-11-11 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Adam Barth.
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index b760610..652d392 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -12,9 +12,14 @@ SET(WTF_PLATFORM_EFL 1)
SET(ALL_NETWORK_BACKENDS soup curl)
SET(NETWORK_BACKEND "soup" CACHE STRING "choose which network backend to use (one of ${ALL_NETWORK_BACKENDS})")
+# -----------------------------------------------------------------------------
+# Determine which font backend will be used
+# -----------------------------------------------------------------------------
+SET(ALL_FONT_BACKENDS freetype pango)
+SET(FONT_BACKEND "freetype" CACHE STRING "choose which network backend to use (one of ${ALL_FONT_BACKENDS})")
+
FIND_PACKAGE(Cairo 1.6 REQUIRED)
FIND_PACKAGE(EFL REQUIRED)
-FIND_PACKAGE(Freetype 9.0 REQUIRED)
FIND_PACKAGE(Fontconfig 2.8.0 REQUIRED)
FIND_PACKAGE(Sqlite REQUIRED)
FIND_PACKAGE(LibXml2 2.6 REQUIRED)
@@ -34,9 +39,6 @@ LIST(APPEND WTF_INCLUDE_DIRECTORIES ${ICU_INCLUDE_DIRS})
SET(WTF_PLATFORM_CAIRO 1)
ADD_DEFINITIONS(-DWTF_PLATFORM_CAIRO=1)
-SET(WTF_USE_FREETYPE 1)
-ADD_DEFINITIONS(-DUSE_FREETYPE=1)
-
SET(JSC_EXECUTABLE_NAME jsc_efl)
SET(WTF_LIBRARY_NAME wtf_efl)
SET(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)
@@ -112,6 +114,21 @@ ELSE ()
ADD_DEFINITIONS(-DWTF_USE_CURL=1)
ENDIF ()
+IF (FONT_BACKEND STREQUAL "freetype")
+ FIND_PACKAGE(Freetype 9.0 REQUIRED)
+ SET(WTF_USE_FREETYPE 1)
+ ADD_DEFINITIONS(-DUSE_FREETYPE=1)
+ELSE ()
+ FIND_PACKAGE(Pango REQUIRED)
+ SET(WTF_USE_PANGO 1)
+ ADD_DEFINITIONS(-DUSE_PANGO=1)
+
+ IF (NOT ENABLE_GLIB_SUPPORT)
+ SET(ENABLE_GLIB_SUPPORT 1)
+ MESSAGE("Forcing Glib support")
+ ENDIF ()
+ENDIF ()
+
IF (ENABLE_VIDEO)
SET(ENABLE_GLIB_SUPPORT 1)
MESSAGE("Forcing Glib support")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list