Title: [222851] trunk/Tools
- Revision
- 222851
- Author
- [email protected]
- Date
- 2017-10-04 09:54:16 -0700 (Wed, 04 Oct 2017)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222850 => 222851)
--- trunk/Tools/ChangeLog 2017-10-04 15:18:00 UTC (rev 222850)
+++ trunk/Tools/ChangeLog 2017-10-04 16:54:16 UTC (rev 222851)
@@ -1,3 +1,17 @@
+2017-10-04 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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 <[email protected]>
[Test262] Update Test262 to Oct 4 version
Modified: trunk/Tools/gtk/jhbuild.modules (222850 => 222851)
--- trunk/Tools/gtk/jhbuild.modules 2017-10-04 15:18:00 UTC (rev 222850)
+++ trunk/Tools/gtk/jhbuild.modules 2017-10-04 16:54:16 UTC (rev 222851)
@@ -118,15 +118,19 @@
<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"
Modified: trunk/Tools/wpe/jhbuild.modules (222850 => 222851)
--- trunk/Tools/wpe/jhbuild.modules 2017-10-04 15:18:00 UTC (rev 222850)
+++ trunk/Tools/wpe/jhbuild.modules 2017-10-04 16:54:16 UTC (rev 222851)
@@ -100,11 +100,11 @@
<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">
@@ -117,9 +117,10 @@
</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"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
