Package: guix-patches;
Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Date: Fri, 8 Mar 2024 06:26:02 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn> To: 69628 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, 宋文武 <iyzsong <at> envs.net> Subject: [bug#69628] [PATCH qt-team v4 18/24] gnu: qtwebengine: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:12 +0800
* gnu/packages/qt.scm (qtwebengine): Update to 6.6.2.
(qtwebengine)[source]: Adjust snippet.
[arguments]<#:configure-flags>: Adjust it.
<#:phases>: Add 'delete-installed-tests phase.
Change-Id: If60f91e27464a80a927f459cc627a7a5ae3f229a
---
gnu/packages/qt.scm | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5680d5520a..053f589987 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3076,14 +3076,14 @@ (define-public qtwebengine-5
(define-public qtwebengine
(package
(name "qtwebengine")
- (version "6.5.3")
+ (version "6.6.2")
(source
(origin
(method url-fetch)
(uri (qt-url name version))
(sha256
(base32
- "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"))
+ "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"))
(modules '((ice-9 ftw)
(ice-9 match)
(srfi srfi-1)
@@ -3115,12 +3115,11 @@ (define-public qtwebengine
"net/third_party/uri_template"
"third_party/abseil-cpp"
"third_party/angle"
- "third_party/angle/src/common/third_party/base"
- "third_party/angle/src/common/third_party/smhasher"
"third_party/angle/src/common/third_party/xxhash"
"third_party/angle/src/third_party/libXNVCtrl" ;Expat
- "third_party/angle/src/third_party/trace_event"
"third_party/angle/src/third_party/volk"
+ "third_party/angle/src/third_party/systeminfo"
+ "third_party/angle/src/third_party/ceval"
"third_party/axe-core"
"third_party/blink"
"third_party/boringssl"
@@ -3152,8 +3151,6 @@ (define-public qtwebengine
"third_party/dawn/third_party/khronos"
"third_party/devtools-frontend"
"third_party/devtools-frontend/src/front_end/third_party/i18n"
- "third_party/devtools-frontend/src/front_end/third_party/acorn"
- "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
"third_party/devtools-frontend/src/front_end/third_party/\
additional_readme_paths.json"
"third_party/devtools-frontend/src/front_end/third_party/axe-core"
@@ -3164,11 +3161,18 @@ (define-public qtwebengine
"third_party/devtools-frontend/src/front_end/third_party/i18n"
"third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
"third_party/devtools-frontend/src/front_end/third_party/lighthouse"
- "third_party/devtools-frontend/src/front_end/third_party/lit-html"
+ "third_party/devtools-frontend/src/front_end/third_party/lit"
+ "third_party/devtools-frontend/src/front_end/third_party/acorn"
"third_party/devtools-frontend/src/front_end/third_party/marked"
"third_party/devtools-frontend/src/front_end/third_party/puppeteer"
+ "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/mitt"
+ "third_party/devtools-frontend/src/front_end/third_party/\
+vscode.web-custom-data"
+ "third_party/devtools-frontend/src/third_party/pyjson5"
"third_party/devtools-frontend/src/front_end/third_party/wasmparser"
"third_party/devtools-frontend/src/third_party/typescript"
+ "third_party/devtools-frontend/src/third_party/i18n"
"third_party/distributed_point_functions"
"third_party/dom_distiller_js"
"third_party/emoji-segmenter"
@@ -3211,7 +3215,6 @@ (define-public qtwebengine
"third_party/libgav1"
"third_party/libjingle_xmpp"
"third_party/libjpeg_turbo"
- "third_party/libjxl"
"third_party/libpng" ;TODO: make pdfium use system version
"third_party/libsecret" ;LGPL2.1+
"third_party/libsrtp"
@@ -3230,6 +3233,7 @@ (define-public qtwebengine
"third_party/lss"
"third_party/mako"
"third_party/markupsafe"
+ "third_party/material_color_utilities" ;ASL2.0
"third_party/mesa_headers"
"third_party/metrics_proto"
"third_party/minigbm" ;BSD-3
@@ -3249,6 +3253,7 @@ (define-public qtwebengine
"third_party/opus/src/include/opus_multistream.h"
"third_party/opus/src/include/opus_types.h"
"third_party/ots"
+ "third_party/flac"
"third_party/pdfium"
"third_party/pdfium/third_party/agg23"
"third_party/pdfium/third_party/base"
@@ -3256,7 +3261,6 @@ (define-public qtwebengine
"third_party/pdfium/third_party/freetype"
"third_party/pdfium/third_party/lcms"
"third_party/pdfium/third_party/libopenjpeg"
- "third_party/pdfium/third_party/libpng16"
"third_party/pdfium/third_party/libtiff"
"third_party/pdfium/third_party/skia_shared"
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
@@ -3326,6 +3330,7 @@ (define-public qtwebengine
"v8/src/third_party/utf8-decoder"
"v8/src/third_party/valgrind"
"v8/third_party/inspector_protocol"
+ "v8/third_party/glibc/src/sysdeps/ieee754/dbl-64"
"v8/third_party/v8/builtins")))
(with-directory-excursion "src/3rdparty"
@@ -3393,14 +3398,17 @@ (define-public qtwebengine
"-DQT_FEATURE_webengine_system_libjpeg=ON"
"-DQT_FEATURE_webengine_system_libpci=ON"
"-DQT_FEATURE_webengine_system_libpng=ON"
+ "-DQT_FEATURE_webengine_system_libtiff=ON"
"-DQT_FEATURE_webengine_system_libwebp=ON"
"-DQT_FEATURE_webengine_system_libxml=ON"
- "-DQT_FEATURE_webengine_system_libxslt=ON"
"-DQT_FEATURE_webengine_system_minizip=ON"
"-DQT_FEATURE_webengine_system_opus=ON"
"-DQT_FEATURE_webengine_system_pulseaudio=ON"
"-DQT_FEATURE_webengine_system_re2=ON"
- "-DQT_FEATURE_webengine_system_zlib=ON")
+ "-DQT_FEATURE_webengine_system_zlib=ON"
+ "-DQT_FEATURE_webengine_system_glib=ON"
+ "-DQT_FEATURE_webengine_system_libvpx=ON"
+ "-DQT_FEATURE_webengine_system_snappy=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
@@ -3450,7 +3458,11 @@ (define-public qtwebengine
'()))))
(replace 'install
(lambda _
- (invoke "cmake" "--install" "."))))))
+ (invoke "cmake" "--install" ".")))
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
(native-inputs
(modify-inputs (package-native-inputs qtwebengine-5)
(delete "python2" "python2-six")
--
2.41.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.