Attachment 322668 Details for Bug 177865 – Patch

[patch] Patch

bug-177865-20171004163503.patch (text/plain), 3.39 KB, created by Carlos Alberto Lopez Perez on 2017-10-04 07:35:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2017-10-04 07:35:04 PDT

Size: 3.39 KB

patch

obsolete

>Subversion Revision: 222838
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 34bf7eb1af768ffc7e225368c6148020a6ab1ef2..6040b416ea5cb9bd0da27fc0d15d50045403e514 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -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-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
> 
>         [GLib] Let WebCore know of low power situations
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index fa3b9b46a9130847835e3541351537a0b3aa1e8a..6a612479ce4345df9166d46e7ca7769fa72934b1 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -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"
>diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
>index 1af8f76a42b07ee9acc2095f86f5fd8db7f02415..1cd3d55bf4eb9e1beffe8c7cb35856670d9dfc0a 100644
>--- a/Tools/wpe/jhbuild.modules
>+++ b/Tools/wpe/jhbuild.modules
>@@ -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"

Actions: View | Formatted Diff | Diff

Attachments on bug 177865: 322652 | 322668