[EFL] Missing dependency between freetype6 and fontconfig libs.
authortgergely.u-szeged@partner.samsung.com <tgergely.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Jun 2014 23:07:19 +0000 (23:07 +0000)
committertgergely.u-szeged@partner.samsung.com <tgergely.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Jun 2014 23:07:19 +0000 (23:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=134190

Reviewed by Gyuyoung Kim.

The external dependencies contain the freetype6 and the fontconfig libs.
The fontconfig lib requires freetype, but the dependency is not set in
the efl/jhbuild.modules file. So, during building the external libs,
fontconfig uses the freetype package of the system, while WebKit
binaries will use freetype from the WebKitBuild/Dependency directory.
There are more similar dependencies that were not indicated in the
jhbuild.modules file.

* efl/jhbuild.modules:
  Added dependencies between libs.

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

Tools/ChangeLog
Tools/efl/jhbuild.modules

index 59fa884..2136d01 100644 (file)
@@ -1,3 +1,21 @@
+2014-06-26  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
+
+        [EFL] Missing dependency between freetype6 and fontconfig libs.
+        https://bugs.webkit.org/show_bug.cgi?id=134190
+
+        Reviewed by Gyuyoung Kim.
+
+        The external dependencies contain the freetype6 and the fontconfig libs.
+        The fontconfig lib requires freetype, but the dependency is not set in
+        the efl/jhbuild.modules file. So, during building the external libs,
+        fontconfig uses the freetype package of the system, while WebKit
+        binaries will use freetype from the WebKitBuild/Dependency directory.
+        There are more similar dependencies that were not indicated in the
+        jhbuild.modules file.
+
+        * efl/jhbuild.modules:
+          Added dependencies between libs.
+
 2014-06-25  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Expose Cache Information to WinLauncher
index a23f8d0..8c80318 100644 (file)
              autogenargs="--without-gnome --disable-introspection">
     <dependencies>
       <dep package="glib-networking"/>
+      <dep package="libxml2"/>
     </dependencies>
     <branch module="/pub/gnome/sources/libsoup/2.42/libsoup-2.42.0.tar.xz" version="2.42.0"
             repo="ftp.gnome.org"
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure">
+    <dependencies>
+      <dep package="freetype6"/>
+      <dep package="libxml2"/>
+    </dependencies>
     <branch module="software/fontconfig/release/fontconfig-2.8.0.tar.gz" version="2.8.0"
             repo="freedesktop.org"
             hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
   <autotools id="efl" autogen-sh="configure"
              autogenargs="--disable-fribidi --disable-audio --disable-libmount --disable-physics --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa">
     <dependencies>
+      <dep package="fontconfig"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
     <branch repo="gstreamer"
             module="gstreamer/gstreamer-1.2.1.tar.xz" version="1.2.1"
             hash="sha256:a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9"/>
+    <dependencies>
+        <dep package="glib"/>
+    </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-base"
     <branch module="pub/GNOME/sources/atk/2.11/atk-2.11.92.tar.xz" version="2.11.92"
             repo="ftp.gnome.org"
             hash="sha256:71e9880f1b704dfd98806643b8dc66a5df4fcef155cf5944184d8e8f66dac689"/>
+    <dependencies>
+        <dep package="glib"/>
+    </dependencies>
   </autotools>
 
 </moduleset>