Changeset 247138 in webkit

Timestamp:

Jul 4, 2019 3:52:34 AM (5 years ago)

Author:

clopez@igalia.com

Message:

[GTK][WPE] Not longer needed to build woff2 on the JHBuild
​https://bugs.webkit.org/show_bug.cgi?id=199406

Reviewed by Michael Catanzaro.

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/install-dependencies (modified) (3 diffs)
• gtk/jhbuild.modules (modified) (2 diffs)
• wpe/install-dependencies (modified) (3 diffs)
• wpe/jhbuild.modules (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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 Michael Catanzaro.
+
+        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-04  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/gtk/install-dependencies

@@ -140 +140 @@
         libupower-glib-dev \
         libwebp-dev \
+        libwoff-dev \
         libxcomposite-dev \
         libxt-dev \
@@ -314 +315 @@
         util-linux \
         xorg-font-utils \
-        wayland"
+        wayland \
+        woff2"
 
     # These are dependencies necessary for running tests.
@@ -477 +479 @@
         ruby \
         sqlite-devel \
-        upower-devel"
+        upower-devel \
+        woff2-devel"
 
     # These are dependencies necessary for running tests.

trunk/Tools/gtk/jhbuild.modules

@@ -8 +8 @@
   <metamodule id="webkitgtk-testing-dependencies">
     <dependencies>
-      <dep package="brotli"/>
-      <dep package="woff2"/>
       <dep package="cairo"/>
       <dep package="fonts"/>
@@ -86 +84 @@
       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">

trunk/Tools/wpe/install-dependencies

@@ -84 +84 @@
         libtool \
         libwebp-dev \
+        libwoff-dev \
         libxml2-dev \
         libxslt1-dev \
@@ -189 +190 @@
         texinfo \
         which \
-        zlib"
+        zlib \
+        woff2"
 
     # These are dependencies necessary for running tests.
@@ -342 +344 @@
         python3-setuptools \
         wayland-devel \
+        woff2-devel \
         yasm"
 

trunk/Tools/wpe/jhbuild.modules

@@ -8 +8 @@
   <metamodule id="webkitwpe-testing-dependencies">
     <dependencies>
-      <dep package="brotli"/>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -19 +18 @@
       <dep package="icu"/>
       <dep package="webkit-gstreamer-testing-dependencies"/>
-      <dep package="woff2"/>
       <dep package="libwpe"/>
       <dep package="wpebackend-fdo"/>
@@ -57 +55 @@
       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"