Title: [230634] trunk/Tools
Revision
230634
Author
mcatanz...@igalia.com
Date
2018-04-13 09:29:08 -0700 (Fri, 13 Apr 2018)

Log 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:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (230633 => 230634)


--- trunk/Tools/ChangeLog	2018-04-13 16:17:44 UTC (rev 230633)
+++ trunk/Tools/ChangeLog	2018-04-13 16:29:08 UTC (rev 230634)
@@ -1,3 +1,17 @@
+2018-04-13  Michael Catanzaro  <mcatanz...@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  <grao...@apple.com>
 
         [Web Animations] Turn CSS Animations and CSS Transitions as Web Animations on by default

Modified: trunk/Tools/wpe/install-dependencies (230633 => 230634)


--- trunk/Tools/wpe/install-dependencies	2018-04-13 16:17:44 UTC (rev 230633)
+++ trunk/Tools/wpe/install-dependencies	2018-04-13 16:29:08 UTC (rev 230634)
@@ -123,6 +123,7 @@
         libvorbis-dev \
         libvpx-dev \
         libxcb-xkb-dev \
+        libxkbcommon-dev \
         libxml-libxml-perl \
         libwayland-dev \
         luajit \
@@ -209,6 +210,7 @@
         libvorbis \
         libvpx \
         libxcb \
+        libxkbcommon \
         luajit \
         mesa \
         mesa-libgl \
@@ -295,6 +297,7 @@
         libvorbis-devel \
         libvpx-devel \
         libxcb-devel \
+        libxkbcommon-devel \
         libXrandr-devel \
         luajit \
         luajit-devel \

Modified: trunk/Tools/wpe/jhbuild.modules (230633 => 230634)


--- trunk/Tools/wpe/jhbuild.modules	2018-04-13 16:17:44 UTC (rev 230633)
+++ trunk/Tools/wpe/jhbuild.modules	2018-04-13 16:29:08 UTC (rev 230634)
@@ -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=""
   <repository type="tarball" name="github-tarball"
       href=""
-  <repository type="tarball" name="xkbcommon.org"
-      href=""
   <repository type="tarball" name="savannah.gnu.org"
       href=""
   <repository type="tarball" name="gnupg.org"
@@ -165,13 +162,6 @@
             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" />
@@ -181,7 +171,6 @@
     <dependencies>
       <dep package="wpebackend"/>
       <dep package="glib"/>
-      <dep package="xkbcommon"/>
     </dependencies>
     <branch repo="github.com" module="Igalia/WPEBackend-fdo.git"
             tag="064c60806422ff1bb32cef7fb1de68923aecba82"/>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to