03/03: gnu: qtwebengine: Fix build failure.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit a0635b08cb91c4941f9aebd7cf5e9e306e2ba490
Author: Marius Bakke <address@hidden>
AuthorDate: Sat May 23 15:42:07 2020 +0200

    gnu: qtwebengine: Fix build failure.
    
    * gnu/packages/qt.scm (qtwebengine)[source](snippet): Preserve the included
    Mesa headers, to avoid an incompatibility with system Mesa.  Also adjust 
some
    files to use system Vulkan headers.  Preserve third_party/emoji-segmenter.
    [inputs]: Remove obsolete comment (LCMS is already in inputs).
---
 gnu/packages/qt.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0c3a680..d22c84f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1595,6 +1595,7 @@ message.")))
                     "third_party/crc32c"
                     "third_party/dav1d"
                     "third_party/dawn"
+                    "third_party/emoji-segmenter"
                     "third_party/ffmpeg"
                     "third_party/googletest"
                     "third_party/hunspell"
@@ -1621,6 +1622,7 @@ message.")))
                     "third_party/libyuv"
                     "third_party/lss"
                     "third_party/markupsafe"
+                    "third_party/mesa_headers"
                     "third_party/metrics_proto"
                     "third_party/modp_b64"
                     "third_party/nasm"
@@ -1737,6 +1739,12 @@ message.")))
                  (substitute*
                      
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
                    (("third_party/curl") "curl"))
+                 (substitute*
+                     '("components/viz/common/gpu/vulkan_context_provider.h"
+                       
"components/viz/common/resources/resource_format_utils.h"
+                       "gpu/config/gpu_util.cc")
+                   (("third_party/vulkan/include/")
+                    ""))
 
                  ;; Replace Google Analytics bundle with an empty file and hope
                  ;; no one notices.
@@ -1777,8 +1785,6 @@ message.")))
        ("libgcrypt" ,libgcrypt)
        ("libjpeg" ,libjpeg-turbo)
        ("libvpx" ,libvpx)
-       ;; FIXME: configure does not find system lcms
-       ;; ("lcms" ,lcms)
        ("libwebp" ,libwebp)
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)