Changeset 230634 in webkit

Timestamp:

Apr 13, 2018 9:29:08 AM (6 years ago)

Author:

Michael Catanzaro

Message:

[WPE] xkbcommon: ERROR: failed to add default include path /home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesWPE/Root/share/X11/xkb
​https://bugs.webkit.org/show_bug.cgi?id=184388

Reviewed by Carlos Alberto Lopez Perez.

Remove libxkbcommon from the JHBuild environment. We could alternatively add
xkeyboard-config, but there doesn't seem to be any need to build libxkbcommon because I do
not believe it depends on anything else in the JHBuild environment.

• wpe/install-dependencies:
• wpe/jhbuild.modules:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-13  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [WPE] xkbcommon: ERROR: failed to add default include path /home/mcatanzaro/Projects/WebKit/WebKitBuild/DependenciesWPE/Root/share/X11/xkb
+        https://bugs.webkit.org/show_bug.cgi?id=184388
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Remove libxkbcommon from the JHBuild environment. We could alternatively add
+        xkeyboard-config, but there doesn't seem to be any need to build libxkbcommon because I do
+        not believe it depends on anything else in the JHBuild environment.
+
+        * wpe/install-dependencies:
+        * wpe/jhbuild.modules:
+
 2018-04-12  Antoine Quint  <graouts@apple.com>
 

trunk/Tools/wpe/install-dependencies

@@ -124 +124 @@
         libvpx-dev \
         libxcb-xkb-dev \
+        libxkbcommon-dev \
         libxml-libxml-perl \
         libwayland-dev \
@@ -210 +211 @@
         libvpx \
         libxcb \
+        libxkbcommon \
         luajit \
         mesa \
@@ -296 +298 @@
         libvpx-devel \
         libxcb-devel \
+        libxkbcommon-devel \
         libXrandr-devel \
         luajit \

trunk/Tools/wpe/jhbuild.modules

@@ -17 +17 @@
       <dep package="freetype6"/>
       <dep package="harfbuzz"/>
-      <dep package="xkbcommon"/>
       <dep package="webkit-gstreamer-testing-dependencies"/>
       <dep package="woff2"/>
@@ -42 +41 @@
   <repository type="tarball" name="github-tarball"
       href="https://github.com/"/>
-  <repository type="tarball" name="xkbcommon.org"
-      href="http://xkbcommon.org"/>
   <repository type="tarball" name="savannah.gnu.org"
       href="http://download.savannah.gnu.org/releases/"/>
@@ -166 +163 @@
   </autotools>
 
-  <autotools id="xkbcommon"
-             autogen-sh="configure">
-    <branch module="download/libxkbcommon-0.5.0.tar.xz" version="0.5.0"
-            repo="xkbcommon.org"
-            hash="sha1:7127993bfb69e13cdff25fb8b3c8f26ce6be5bfa"/>
-  </autotools>
-
   <cmake id="wpebackend">
     <branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend.git"
@@ -182 +172 @@
       <dep package="wpebackend"/>
       <dep package="glib"/>
-      <dep package="xkbcommon"/>
     </dependencies>
     <branch repo="github.com" module="Igalia/WPEBackend-fdo.git"