[WebKit] : Fix Build
authorBaptiste DURAND <baptiste.durand@frignu.net>
Wed, 11 Sep 2013 13:43:00 +0000 (15:43 +0200)
committerBaptiste DURAND <baptiste.durand@frignu.net>
Wed, 11 Sep 2013 13:43:00 +0000 (15:43 +0200)
meta-wrt-tizen/recipes-wrt/webkit-efl/webkit-efl-extraconf.inc
meta-wrt-tizen/recipes-wrt/webkit-efl/webkit-efl/FindLibHarfBuzz.patch [new file with mode: 0644]

index 0bc7639..0fe3efc 100644 (file)
@@ -1,9 +1,10 @@
 inherit tizen_cmake
 SRC_URI += "\
   file://FindLibSoup.patch \
+  file://FindLibHarfBuzz.patch \
   "
   
 do_patch_append () {
- echo RLM begining of python do_patch
  cat ${WORKDIR}/FindLibSoup.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/FindLibHarfBuzz.patch | patch -s -p1 --fuzz=2
 }
diff --git a/meta-wrt-tizen/recipes-wrt/webkit-efl/webkit-efl/FindLibHarfBuzz.patch b/meta-wrt-tizen/recipes-wrt/webkit-efl/webkit-efl/FindLibHarfBuzz.patch
new file mode 100644 (file)
index 0000000..33ace50
--- /dev/null
@@ -0,0 +1,21 @@
+diff --git a/Source/cmake/FindHarfBuzz.cmake b/Source/cmake/FindHarfBuzz.cmake
+index 8a99019..2b555a0 100644
+--- a/Source/cmake/FindHarfBuzz.cmake
++++ b/Source/cmake/FindHarfBuzz.cmake
+@@ -36,9 +36,15 @@ FIND_PATH(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
+   HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+ )
+-FIND_LIBRARY(HARFBUZZ_LIBRARIES NAMES harfbuzz
++FIND_LIBRARY(HARFBUZZ_SDT_LIBRARIES NAMES harfbuzz
+   HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+ )
++FIND_LIBRARY(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
++  HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
++)
++
++set(HARFBUZZ_LIBRARIES ${HARFBUZZ_SDT_LIBRARIES} ${HARFBUZZ_ICU_LIBRARIES})
++
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)