[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/63: gnu: qtwebengine: Fix build failure.
From: |
guix-commits |
Subject: |
62/63: gnu: qtwebengine: Fix build failure. |
Date: |
Tue, 26 May 2020 17:18:16 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit c37b621cf3f0cd9c06677b4be6f931d927e7fea5
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)
- 47/63: gnu: vulkan-tools: Update to 1.2.140., (continued)
- 47/63: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/26
- 51/63: gnu: Mesa: Remove unused input., guix-commits, 2020/05/26
- 22/63: gnu: python-urllib3: Update to 1.25.9., guix-commits, 2020/05/26
- 31/63: gnu: python-jinja2: Update to 2.11.2., guix-commits, 2020/05/26
- 41/63: gnu: spirv-tools: Do not build static libraries., guix-commits, 2020/05/26
- 52/63: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/26
- 30/63: gnu: json-c: Update to 0.14., guix-commits, 2020/05/26
- 54/63: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/26
- 56/63: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/26
- 59/63: gnu: nheko: Update to 0.7.1., guix-commits, 2020/05/26
- 62/63: gnu: qtwebengine: Fix build failure.,
guix-commits <=
- 60/63: gnu: mutter: Fix build with Mesa 20., guix-commits, 2020/05/26
- 20/63: gnu: python-cryptography: Update to 2.9.2., guix-commits, 2020/05/26
- 27/63: gnu: python-mako: Update to 1.1.2., guix-commits, 2020/05/26
- 33/63: gnu: Qt: Update to 5.14.2., guix-commits, 2020/05/26
- 49/63: gnu: shaderc: Enable (some) tests., guix-commits, 2020/05/26
- 26/63: gnu: python-idna: Update to 2.9., guix-commits, 2020/05/26
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/26
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/26
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/26
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/26