--- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake	2014-10-09 01:54:38.000000000 +0800
+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake	2014-10-15 13:41:29.832290412 +0800
@@ -34,21 +34,39 @@
 
 pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
 
-find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
-    HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-)
-
-find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
-    HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-)
-
 # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
 if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
     pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)
-    find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
+
+    find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h
+        HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+    )
+
+    find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
         HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
     )
-    list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
+
+    find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
+        HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+    )
+
+    set(HARFBUZZ_INCLUDE_DIRS
+        ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR}
+        CACHE INTERNAL ""
+    )
+
+    set(HARFBUZZ_LIBRARIES
+        ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY}
+        CACHE INTERNAL ""
+    )
+else ()
+    find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
+        HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+    )
+
+    find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
+        HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+    )
 endif ()
 
 include(FindPackageHandleStandardArgs)