Changeset 227900 in webkit

Timestamp:

Jan 31, 2018, 7:55:37 AM (9 years ago)

Author:

cturner@igalia.com

Message:

[WPE] Update jhbuild dependencies
​https://bugs.webkit.org/show_bug.cgi?id=182286

This upgrades the following packages,
glib 2.44.1 -> 2.54.3
glib-networking 2.42.0 -> 2.54.1
libsoup 2.48.0 -> 2.60.3

The initial reason for performing these upgrades was that when
visiting ​https://youtube.com, WPE was getting TLS certificate
errors. After upgrading glib-networking, these were fixed, but the
upgrade introduced dependencies on newer versions of the other
packages upgraded in this commit.

The upgrade to glib caused a linking error in gstreamer, the
following errors were being logged during linking,

usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_from_script'
usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_get_unicode_funcs'
usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_to_script'

This was fixed by adding the glib package built in the jhbuild to
harfbuzz.

Finally, the upgrade of glib caused the glib-warning-fix.patch to
no longer apply, so this patch was removed.

Reviewed by Michael Catanzaro.

• wpe/jhbuild.modules: Added dependecies.
• wpe/patches/glib-warning-fix.patch: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• wpe/jhbuild.modules (modified) (4 diffs)
• wpe/patches/glib-revert-wakeup-changes.patch (added)
• wpe/patches/glib-warning-fix.patch (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-01-31  Charlie Turner  <cturner@igalia.com>
+
+        [WPE] Update jhbuild dependencies
+        https://bugs.webkit.org/show_bug.cgi?id=182286
+
+        This upgrades the following packages,
+        glib 2.44.1 -> 2.54.3
+        glib-networking 2.42.0 -> 2.54.1
+        libsoup 2.48.0 -> 2.60.3
+
+        The initial reason for performing these upgrades was that when
+        visiting https://youtube.com, WPE was getting TLS certificate
+        errors. After upgrading glib-networking, these were fixed, but the
+        upgrade introduced dependencies on newer versions of the other
+        packages upgraded in this commit.
+
+        The upgrade to glib caused a linking error in gstreamer, the
+        following errors were being logged during linking,
+
+        //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_from_script'
+        //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_get_unicode_funcs'
+        //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_to_script'
+
+        This was fixed by adding the glib package built in the jhbuild to
+        harfbuzz.
+
+        Finally, the upgrade of glib caused the glib-warning-fix.patch to
+        no longer apply, so this patch was removed.
+
+        Reviewed by Michael Catanzaro.
+
+        * wpe/jhbuild.modules: Added dependecies.
+        * wpe/patches/glib-warning-fix.patch: Removed.
+
 2018-01-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/wpe/jhbuild.modules

@@ -59 +59 @@
       <dep package="libffi"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
+    <branch module="/pub/GNOME/sources/glib/2.54/glib-2.54.3.tar.xz" version="2.54.3"
             repo="ftp.gnome.org"
-            hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
-      <patch file="glib-warning-fix.patch" strip="1"/>
+            hash="sha256:963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8">
       <patch file="gdate-suppress-string-format-literal-warning.patch" strip="1"/>
+      <patch file="glib-revert-wakeup-changes.patch" strip="1"/>
     </branch>
   </autotools>
@@ -72 +72 @@
       <dep package="glib"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/glib-networking/2.42/glib-networking-2.42.0.tar.xz" version="2.42.0"
+    <branch module="/pub/GNOME/sources/glib-networking/2.54/glib-networking-2.54.1.tar.xz" version="2.54.1"
             repo="ftp.gnome.org"
-            hash="sha256:304dd9e4c0ced69094300e0b9e66cd2eaae7161b9fc3186536d11458677d820d"/>
+            hash="sha256:eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"/>
   </autotools>
 
@@ -83 +83 @@
       <dep package="glib-networking"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/libsoup/2.48/libsoup-2.48.0.tar.xz" version="2.48.0"
+    <branch module="/pub/GNOME/sources/libsoup/2.60/libsoup-2.60.3.tar.xz" version="2.60.3"
             repo="ftp.gnome.org"
-            hash="sha256:ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784"/>
+            hash="sha256:1b0dc762f23abe4e0d29b77370e539fd35f31d8e8e0318d6ddccff395be68a22"/>
   </autotools>
 
@@ -117 +117 @@
 
   <autotools id="harfbuzz" autogen-sh="configure"
-        autogenargs="--with-cairo=no --with-glib=no --with-freetype=yes --with-fontconfig=yes">
-    <dependencies>
+        autogenargs="--with-cairo=no --with-glib=yes --with-freetype=yes --with-fontconfig=yes">
+    <dependencies>
+      <dep package="glib"/>
       <dep package="freetype6"/>
       <dep package="fontconfig"/>