[WPE] xkbcommon: ERROR: failed to add default include path /home/mcatanzaro/Projects...
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Apr 2018 16:29:08 +0000 (16:29 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Apr 2018 16:29:08 +0000 (16:29 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/wpe/install-dependencies
Tools/wpe/jhbuild.modules

index 8261697..7a9402d 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         [Web Animations] Turn CSS Animations and CSS Transitions as Web Animations on by default
index ad5a2a2..366bbe8 100755 (executable)
@@ -123,6 +123,7 @@ function installDependenciesWithApt {
         libvorbis-dev \
         libvpx-dev \
         libxcb-xkb-dev \
+        libxkbcommon-dev \
         libxml-libxml-perl \
         libwayland-dev \
         luajit \
@@ -209,6 +210,7 @@ function installDependenciesWithPacman {
         libvorbis \
         libvpx \
         libxcb \
+        libxkbcommon \
         luajit \
         mesa \
         mesa-libgl \
@@ -295,6 +297,7 @@ function installDependenciesWithDnf {
         libvorbis-devel \
         libvpx-devel \
         libxcb-devel \
+        libxkbcommon-devel \
         libXrandr-devel \
         luajit \
         luajit-devel \
index 2087bcb..1556b8d 100644 (file)
@@ -16,7 +16,6 @@
       <dep package="fontconfig"/>
       <dep package="freetype6"/>
       <dep package="harfbuzz"/>
-      <dep package="xkbcommon"/>
       <dep package="webkit-gstreamer-testing-dependencies"/>
       <dep package="woff2"/>
       <dep package="wpebackend"/>
@@ -41,8 +40,6 @@
       href="https://github.com"/>
   <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/"/>
   <repository type="tarball" name="gnupg.org"
             hash="sha1:c6f7b99986f93c9df78653c3e6a3b5043f65145e"/>
   </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"
             tag="3013faaebab42e7ef7497b3850a2902978eb3d6f" />
     <dependencies>
       <dep package="wpebackend"/>
       <dep package="glib"/>
-      <dep package="xkbcommon"/>
     </dependencies>
     <branch repo="github.com" module="Igalia/WPEBackend-fdo.git"
             tag="064c60806422ff1bb32cef7fb1de68923aecba82"/>