Unreviewed, rolling out r165962.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Mar 2014 15:34:56 +0000 (15:34 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Mar 2014 15:34:56 +0000 (15:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=130512

It broke the build (Requested by Ossy on #webkit).

Reverted changeset:

.:

"[EFL][GTK] Get CMake to find Freetype2 properly"
https://bugs.webkit.org/show_bug.cgi?id=130150
http://trac.webkit.org/changeset/165962

Source/WebCore:

"[EFL][GTK] Get CMake to find Freetype2 properly"
https://bugs.webkit.org/show_bug.cgi?id=130150
http://trac.webkit.org/changeset/165962

Source/WebKit:

"[EFL][GTK] Get CMake to find Freetype2 properly"
https://bugs.webkit.org/show_bug.cgi?id=130150
http://trac.webkit.org/changeset/165962

Source/WebKit2:

"[EFL][GTK] Get CMake to find Freetype2 properly"
https://bugs.webkit.org/show_bug.cgi?id=130150
http://trac.webkit.org/changeset/165962

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@165966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformEfl.cmake
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/cmake/FindFreetype2.cmake [deleted file]
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake

index 23d2ad0..88bdf56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-03-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165962.
+        https://bugs.webkit.org/show_bug.cgi?id=130512
+
+        It broke the build (Requested by Ossy on #webkit).
+
+        Reverted changeset:
+
+        "[EFL][GTK] Get CMake to find Freetype2 properly"
+        https://bugs.webkit.org/show_bug.cgi?id=130150
+        http://trac.webkit.org/changeset/165962
+
 2014-03-20  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 
         [EFL][GTK] Get CMake to find Freetype2 properly
index 9878608..4aeb2c0 100644 (file)
@@ -1,3 +1,16 @@
+2014-03-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165962.
+        https://bugs.webkit.org/show_bug.cgi?id=130512
+
+        It broke the build (Requested by Ossy on #webkit).
+
+        Reverted changeset:
+
+        "[EFL][GTK] Get CMake to find Freetype2 properly"
+        https://bugs.webkit.org/show_bug.cgi?id=130150
+        http://trac.webkit.org/changeset/165962
+
 2014-03-20  Lorenzo Tilve  <ltilve@igalia.com>
 
         "input" event is not fired when changing a select element's value
index 149d09b..1886917 100644 (file)
@@ -221,7 +221,7 @@ list(APPEND WebCore_LIBRARIES
     ${E_DBUS_EUKIT_LIBRARIES}
     ${E_DBUS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
@@ -248,7 +248,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${EEZE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
-    ${FREETYPE2_INCLUDE_DIRS}
+    ${FREETYPE_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
     ${SQLITE_INCLUDE_DIR}
index 5212167..50cd5d3 100644 (file)
@@ -294,7 +294,7 @@ list(APPEND WebCore_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${ENCHANT_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${GEOCLUE_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
@@ -323,7 +323,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
-    ${FREETYPE2_INCLUDE_DIRS}
+    ${FREETYPE_INCLUDE_DIRS}
     ${GEOCLUE_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
index bc7b100..bb38f47 100644 (file)
@@ -1,3 +1,16 @@
+2014-03-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165962.
+        https://bugs.webkit.org/show_bug.cgi?id=130512
+
+        It broke the build (Requested by Ossy on #webkit).
+
+        Reverted changeset:
+
+        "[EFL][GTK] Get CMake to find Freetype2 properly"
+        https://bugs.webkit.org/show_bug.cgi?id=130150
+        http://trac.webkit.org/changeset/165962
+
 2014-03-20  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 
         [EFL][GTK] Get CMake to find Freetype2 properly
index 37f05e1..139661a 100644 (file)
@@ -149,7 +149,7 @@ list(APPEND WebKit_LIBRARIES
     ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${HARFBUZZ_LIBRARIES}
index 2722fda..3ad0c85 100644 (file)
@@ -1,3 +1,16 @@
+2014-03-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r165962.
+        https://bugs.webkit.org/show_bug.cgi?id=130512
+
+        It broke the build (Requested by Ossy on #webkit).
+
+        Reverted changeset:
+
+        "[EFL][GTK] Get CMake to find Freetype2 properly"
+        https://bugs.webkit.org/show_bug.cgi?id=130150
+        http://trac.webkit.org/changeset/165962
+
 2014-03-20  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 
         [EFL][GTK] Get CMake to find Freetype2 properly
index 42498ab..2e4ccb7 100644 (file)
@@ -278,7 +278,7 @@ list(APPEND WebKit2_LIBRARIES
     ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
+    ${Freetype_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
diff --git a/Source/cmake/FindFreetype2.cmake b/Source/cmake/FindFreetype2.cmake
deleted file mode 100644 (file)
index 2ea1f87..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_FREETYPE2 REQUIRED freetype2)
-
-find_path(FREETYPE2_HEADER_DIR
-    NAMES freetype.h
-    HINTS ${PC_FREETYPE2_INCLUDE_DIRS}
-          ${PC_FREETYPE2_INCLUDEDIR}
-    PATH_SUFFIXES freetype
-)
-
-find_path(FREETYPE2_ROOT_INCLUDE_DIR
-    NAMES freetype/freetype.h
-    HINTS ${PC_FREETYPE2_INCLUDE_DIRS}
-          ${PC_FREETYPE2_INCLUDEDIR}
-)
-
-find_library(FREETYPE2_LIBRARIES
-    NAMES freetype
-    HINTS ${PC_FREETYPE2_LIBDIR}
-          ${PC_FREETYPE2_LIBRARY_DIRS}
-)
-
-set(FREETYPE2_INCLUDE_DIRS
-    ${FREETYPE2_HEADER_DIR}
-    ${FREETYPE2_ROOT_INCLUDE_DIR}
-)
-
-# Inspired in the original FindFreetype.cmake
-if (FREETYPE2_HEADER_DIR AND EXISTS "${FREETYPE2_HEADER_DIR}/freetype.h")
-    file(STRINGS "${FREETYPE2_HEADER_DIR}/freetype.h" freetype_version_str
-         REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
-
-    unset(FREETYPE2_VERSION_STRING)
-    foreach (VPART MAJOR MINOR PATCH)
-        foreach (VLINE ${freetype_version_str})
-            if (VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}")
-                string(REGEX REPLACE "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$" "\\1"
-                       FREETYPE2_VERSION_PART "${VLINE}")
-                if (FREETYPE2_VERSION_STRING)
-                    set(FREETYPE2_VERSION_STRING "${FREETYPE2_VERSION_STRING}.${FREETYPE2_VERSION_PART}")
-                else ()
-                    set(FREETYPE2_VERSION_STRING "${FREETYPE2_VERSION_PART}")
-                endif ()
-                unset(FREETYPE2_VERSION_PART)
-            endif ()
-        endforeach ()
-    endforeach ()
-endif ()
-
-set(VERSION_OK TRUE)
-if (FREETYPE2_VERSION_STRING)
-    if (PC_FREETYPE2_FIND_VERSION_EXACT)
-        if (NOT("${Freetype2_FIND_VERSION}" VERSION_EQUAL "${FREETYPE2_VERSION_STRING}"))
-            set(VERSION_OK FALSE)
-        endif ()
-    else ()
-        if ("${FREETYPE2_VERSION_STRING}" VERSION_LESS "${Freetype2_FIND_VERSION}")
-            set(VERSION_OK FALSE)
-        endif ()
-    endif ()
-endif ()
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype2 DEFAULT_MSG FREETYPE2_INCLUDE_DIRS FREETYPE2_LIBRARIES VERSION_OK)
index 66ee6be..0b61d07 100644 (file)
@@ -159,7 +159,7 @@ find_package(Eet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
 find_package(Eeze ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
 find_package(Efreet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE})
 
-find_package(Freetype2 2.4.11 REQUIRED)
+find_package(Freetype 2.4.2 REQUIRED)
 find_package(HarfBuzz 0.9.2 REQUIRED)
 add_definitions(-DWTF_USE_FREETYPE=1)
 add_definitions(-DWTF_USE_HARFBUZZ=1)
index f78c96e..dd1fc5e 100644 (file)
@@ -170,7 +170,7 @@ add_definitions(-DMOZ_X11)
 
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
-find_package(Freetype2 2.4.11 REQUIRED)
+find_package(Freetype 2.4.2 REQUIRED)
 find_package(GTK2 2.24.10 REQUIRED)
 find_package(GDK2 2.24.10 REQUIRED)
 find_package(HarfBuzz 0.9.2 REQUIRED)