Attachment 373331 Details for Bug 199406 – Patch

[patch] Patch

bug-199406-20190702181841.patch (text/plain), 5.21 KB, created by Carlos Alberto Lopez Perez on 2019-07-02 09:18:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2019-07-02 09:18:43 PDT

Size: 5.21 KB

patch

obsolete

>Subversion Revision: 247050
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a5d54877813a77ce610372e51ffc7745a1ac6516..8d3a9cefaa63e8b60984eee108efb845e6722a1b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-02  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>+
>+        [GTK][WPE] Not longer needed to build woff2 on the JHBuild
>+        https://bugs.webkit.org/show_bug.cgi?id=199406
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Install the Woff2 libraries and headers from the system package
>+        and stop building them on the JHBuild.
>+
>+        * gtk/install-dependencies:
>+        * gtk/jhbuild.modules:
>+        * wpe/install-dependencies:
>+        * wpe/jhbuild.modules:
>+
> 2019-07-02  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] Make PrintConfiguration platform aware
>diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
>index 43db52184a7f91f9ff5ef60f0923591a77feaa69..3d180fc2431f5e0caeb3ffbaffe9cdf4fa0b8cea 100755
>--- a/Tools/gtk/install-dependencies
>+++ b/Tools/gtk/install-dependencies
>@@ -139,6 +139,7 @@ function installDependenciesWithApt {
>         libvpx-dev \
>         libupower-glib-dev \
>         libwebp-dev \
>+        libwoff-dev \
>         libxcomposite-dev \
>         libxt-dev \
>         libxtst-dev \
>@@ -313,7 +314,8 @@ function installDependenciesWithPacman {
>         ruby \
>         util-linux \
>         xorg-font-utils \
>-        wayland"
>+        wayland \
>+        woff2"
> 
>     # These are dependencies necessary for running tests.
>     # Note: apache-mod_bw, ruby-json, and ruby-highline are available in the AUR
>@@ -476,7 +478,8 @@ function installDependenciesWithDnf {
>         redhat-rpm-config \
>         ruby \
>         sqlite-devel \
>-        upower-devel"
>+        upower-devel \
>+        woff2-devel"
> 
>     # These are dependencies necessary for running tests.
>     packages="$packages \
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index eb60744121a6d7e0014ff35684f45a403cebfa97..43d2cde1506c3f30bb2a9f445a28a53766981ed6 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -7,8 +7,6 @@
> 
>   <metamodule id="webkitgtk-testing-dependencies">
>     <dependencies>
>-      <dep package="brotli"/>
>-      <dep package="woff2"/>
>       <dep package="cairo"/>
>       <dep package="fonts"/>
>       <dep package="dicts"/>
>@@ -85,17 +83,6 @@
>   <repository type="tarball" name="wpewebkit"
>       href="https://wpewebkit.org/releases/"/>
> 
>-  <cmake id="brotli">
>-    <branch repo="github.com" module="google/brotli.git" checkoutdir="brotli" tag="v1.0.5"/>
>-  </cmake>
>-
>-  <cmake id="woff2">
>-    <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.2"/>
>-    <dependencies>
>-      <dep package="brotli"/>
>-    </dependencies>
>-  </cmake>
>-
>   <autotools id="cairo"
>              autogen-sh="configure">
>     <if condition-set="linux">
>diff --git a/Tools/wpe/install-dependencies b/Tools/wpe/install-dependencies
>index 08694ae818d21b76fbe1f223bf9521c89689627c..094996a6a504d9280009420e0e84f374dc7a51ff 100755
>--- a/Tools/wpe/install-dependencies
>+++ b/Tools/wpe/install-dependencies
>@@ -89,7 +89,8 @@ function installDependenciesWithApt {
>         patch \
>         pkg-config \
>         ruby \
>-        zlib1g-dev"
>+        zlib1g-dev \
>+        libwoff-dev"
> 
>     # These are dependencies necessary for running tests.
>     packages="$packages \
>@@ -188,7 +189,8 @@ function installDependenciesWithPacman {
>         sqlite \
>         texinfo \
>         which \
>-        zlib"
>+        zlib \
>+        woff2"
> 
>     # These are dependencies necessary for running tests.
>     # Note: apache-mod_bw, ruby-json and ruby-highline are available in the AUR
>@@ -341,6 +343,7 @@ function installDependenciesWithDnf {
>         pulseaudio-libs-devel \
>         python3-setuptools \
>         wayland-devel \
>+        woff2-devel \
>         yasm"
> 
>     # These are dependencies necessary for using webkit-patch
>diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
>index be0fe4fcad9313bd2062b3091e3fa724191c405f..3d953aaa603a2d05d57e1c518b9d7f027e202d59 100644
>--- a/Tools/wpe/jhbuild.modules
>+++ b/Tools/wpe/jhbuild.modules
>@@ -7,7 +7,6 @@
> 
>   <metamodule id="webkitwpe-testing-dependencies">
>     <dependencies>
>-      <dep package="brotli"/>
>       <dep package="glib"/>
>       <dep package="libsoup"/>
>       <dep package="cairo"/>
>@@ -18,7 +17,6 @@
>       <dep package="harfbuzz"/>
>       <dep package="icu"/>
>       <dep package="webkit-gstreamer-testing-dependencies"/>
>-      <dep package="woff2"/>
>       <dep package="libwpe"/>
>       <dep package="wpebackend-fdo"/>
>       <dep package="libgpg-error"/>
>@@ -56,17 +54,6 @@
>   <repository type="tarball" name="webkitgtk-jhbuild-mirror"
>       href="http://webkitgtk.org/jhbuild_mirror/"/>
> 
>-  <cmake id="brotli">
>-    <branch repo="github.com" module="google/brotli.git" checkoutdir="brotli" tag="v1.0.1"/>
>-  </cmake>
>-
>-  <cmake id="woff2">
>-    <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.2"/>
>-    <dependencies>
>-      <dep package="brotli"/>
>-    </dependencies>
>-  </cmake>
>-
>   <autotools id="libffi" autogen-sh="configure">
>     <branch module="libffi/libffi-3.0.10.tar.gz" version="3.0.10"
>              repo="sourceware.org-mirror"

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199406: 373331