[GTK][JHBuild] Tools/gtk/install-dependencies: Package libxfont does …

…not exist anymore in Arch Linux

https://bugs.webkit.org/show_bug.cgi?id=181476

Reviewed by Michael Catanzaro.

Update to xorg-server 1.19.6 which depends on libxfont2, and change
the lists of packages to install libxfont2-devel (or equivalent).

* gtk/install-dependencies:
* gtk/jhbuild.modules:

Canonical link: https://commits.webkit.org/197502@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,16 @@
+2018-01-15  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][JHBuild] Tools/gtk/install-dependencies: Package libxfont does not exist anymore in Arch Linux
+        https://bugs.webkit.org/show_bug.cgi?id=181476
+
+        Reviewed by Michael Catanzaro.
+
+        Update to xorg-server 1.19.6 which depends on libxfont2, and change
+        the lists of packages to install libxfont2-devel (or equivalent).
+
+        * gtk/install-dependencies:
+        * gtk/jhbuild.modules:
+
 2018-01-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK][WPE] Add support for unit test expectations

Tools/gtk/install-dependencies

@@ -199,7 +199,8 @@ function installDependenciesWithApt {
         libv4l-dev \
         libxcb-composite0-dev \
         libxcb-xfixes0-dev \
-        $(aptIfElse libxfont1-dev libxfont-dev) \
+        libxfont-dev \
+        libxfont2 \
         libxkbfile-dev \
         libxkbcommon-x11-dev \
         libtool-bin \
@@ -496,7 +497,7 @@ function installDependenciesWithDnf {
         gsettings-desktop-schemas-devel \
         icon-naming-utils \
         itstool \
-        libXfont-devel \
+        libXfont2-devel \
         libcroco-devel \
         libdrm-devel \
         libepoxy-devel \

Tools/gtk/jhbuild.modules

@@ -322,10 +322,10 @@
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
-    <branch module="/releases/individual/xserver/xorg-server-1.16.4.tar.bz2" version="1.16.4"
+    <branch module="/releases/individual/xserver/xorg-server-1.19.6.tar.bz2" version="1.16.4"
             repo="xorg"
-            hash="sha256:abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871"
-            md5sum="80d140f631d862b76dc67ae983151c77">
+            hash="sha256:a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
+            md5sum="3e47777ff034a331aed2322b078694a8">
       <patch file="xserver-remove-bogus-dependencies.patch" strip="1"/>
       <patch file="xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch" strip="1"/>
     </branch>