unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69628@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>, 宋文武 <iyzsong@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	[thread overview]
Message-ID: <2f8cfb8dd1d8a0a46fd908486aa7afa577d4a77a.1710320156.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1710320156.git.zhengjunjie@iscas.ac.cn>

* 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





  parent reply	other threads:[~2024-03-13  9:02 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08  6:06 [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package Zheng Junjie via Guix-patches
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 01/21] FIXME: gnu: qtbase: Update to 6.6.2 Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 02/21] gnu: qtsvg: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 03/21] gnu: qtshadertools: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 04/21] gnu: qtnetworkauth: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 05/21] gnu: qtimageformats: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 06/21] gnu: qtlanguageserver: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 07/21] gnu: qtpositioning: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 08/21] FIXME: gnu: qtdeclarative: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 09/21] gnu: qttools: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 10/21] gnu: qt5compat: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 11/21] gnu: qtlottie: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 12/21] gnu: qtwebsockets: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 13/21] gnu: qttranslations: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 14/21] gnu: qtwebchannel: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 15/21] gnu: qtwayland: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 16/21] gnu: qtremoteobjects: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 17/21] gnu: qtmultimedia: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to qtspeech-5 Zheng Junjie
2024-03-08 19:12   ` Liliana Marie Prikler
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 19/21] gnu: Add qtspeech Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 20/21] gnu: qtsensors: Rename to qtsensors-5 Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 21/21] gnu: Add qtsensors Zheng Junjie
2024-03-09 18:23 ` [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package Maxim Cournoyer
2024-03-11  5:34 ` [bug#69628] [PATCH v2] gnu: qt: Update to 6.6.2 Zheng Junjie
2024-03-11 10:52 ` [bug#69628] [PATCH v3] " Zheng Junjie
2024-03-12 14:44   ` Maxim Cournoyer
2024-03-13  8:57 ` [bug#69628] [PATCH qt-team v4 00/24] " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 01/24] gnu: qtbase: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 02/24] gnu: qt5compat: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 03/24] gnu: qtsvg: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 04/24] gnu: qtimageformats: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 05/24] gnu: qtdeclarative: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 06/24] gnu: qtwebsockets: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 07/24] gnu: qtshadertools: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 08/24] gnu: qtmultimedia: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 09/24] gnu: qtwayland: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 10/24] gnu: qtwebchannel: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 11/24] gnu: qtlanguageserver: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 12/24] gnu: qtlottie: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 13/24] gnu: qttools: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 14/24] gnu: qttranslations: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 15/24] gnu: qtpositioning: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 16/24] gnu: qtnetworkauth: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 17/24] gnu: qtremoteobjects: " Zheng Junjie
2024-03-13  8:58   ` Zheng Junjie [this message]
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 19/24] gnu: python-{shiboken, pyside}-6: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 20/24] gnu: qtsensors: Rename package to qtsensors-5 Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 21/24] gnu: Add qtsensors Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 22/24] gnu: qtspeech: Rename package to qtspeech-5 Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 23/24] gnu: Add qtspeech Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 24/24] gnu: qt-creator: Update to 12.0.2 Zheng Junjie
2024-03-25 15:21   ` [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2 Maxim Cournoyer
2024-03-26  3:10   ` Maxim Cournoyer
     [not found]     ` <87il194k0v.fsf@iscas.ac.cn>
2024-03-26 10:12       ` 宋文武 via Guix-patches via
2024-03-26 14:17         ` Maxim Cournoyer
2024-03-27 13:07 ` [bug#69628] [PATCH 1/2] gnu: python-sip: Update to 6.8.3 Zheng Junjie
2024-03-27 13:07   ` [bug#69628] [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1 Zheng Junjie
2024-03-30  2:34     ` bug#69628: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2f8cfb8dd1d8a0a46fd908486aa7afa577d4a77a.1710320156.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=69628@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).