[JHBuild][GTK][WKE] Circular dependency between harfbuzz and freetype6
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Oct 2017 16:54:16 +0000 (16:54 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Oct 2017 16:54:16 +0000 (16:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177865

Reviewed by Michael Catanzaro.

Build freetype6 without harfbuzz support.
This seems to be what distros like Fedora, Debian or OpenEmbedded do.
Also explicitly enable support for freetype and fontconfig on harfbuzz.

* gtk/jhbuild.modules: Enable also support for icu.
* wpe/jhbuild.modules:

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

Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/wpe/jhbuild.modules

index 7989917..0911d06 100644 (file)
@@ -1,3 +1,17 @@
+2017-10-04  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [JHBuild][GTK][WKE] Circular dependency between harfbuzz and freetype6
+        https://bugs.webkit.org/show_bug.cgi?id=177865
+
+        Reviewed by Michael Catanzaro.
+
+        Build freetype6 without harfbuzz support.
+        This seems to be what distros like Fedora, Debian or OpenEmbedded do.
+        Also explicitly enable support for freetype and fontconfig on harfbuzz.
+
+        * gtk/jhbuild.modules: Enable also support for icu.
+        * wpe/jhbuild.modules:
+
 2017-10-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [Test262] Update Test262 to Oct 4 version
index fa3b9b4..6a61247 100644 (file)
     <branch repo="github.com" module="mrobinson/webkitgtk-test-dicts.git" checkoutdir="webkitgtk-test-dicts" tag="0.0.1"/>
   </autotools>
 
-  <autotools id="freetype6" autogen-sh="configure">
+  <autotools id="freetype6" autogen-sh="configure"
+        autogenargs="--with-harfbuzz=no">
     <branch module="freetype/freetype-2.8.tar.bz2" version="2.8"
             repo="savannah.gnu.org"
             hash="sha256:a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b"/>
   </autotools>
 
-  <autotools id="harfbuzz" autogen-sh="configure">
+  <autotools id="harfbuzz" autogen-sh="configure"
+        autogenargs="--with-freetype=yes --with-fontconfig=yes --with-icu=yes">
     <dependencies>
       <dep package="icu"/>
+      <dep package="freetype6"/>
+      <dep package="fontconfig"/>
     </dependencies>
     <branch module="software/harfbuzz/release/harfbuzz-1.4.2.tar.bz2"
             version="1.4.2"
index 1af8f76..1cd3d55 100644 (file)
     <branch repo="github.com" module="mrobinson/webkitgtk-test-dicts.git" checkoutdir="webkitgtk-test-dicts" tag="0.0.1"/>
   </autotools>
 
-  <autotools id="freetype6" autogen-sh="configure">
+  <autotools id="freetype6" autogen-sh="configure"
+        autogenargs="--with-harfbuzz=no">
     <branch module="freetype/freetype-2.8.tar.bz2" version="2.8"
             repo="savannah.gnu.org"
-            hash="sha256:a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b">
-    </branch>
+            hash="sha256:a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b"/>
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure">
   </autotools>
 
   <autotools id="harfbuzz" autogen-sh="configure"
-        autogenargs="--with-cairo=no --with-glib=no --with-freetype=yes">
+        autogenargs="--with-cairo=no --with-glib=no --with-freetype=yes --with-fontconfig=yes">
     <dependencies>
       <dep package="freetype6"/>
+      <dep package="fontconfig"/>
     </dependencies>
     <branch module="software/harfbuzz/release/harfbuzz-1.3.3.tar.bz2"
             version="1.3.3"