From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EJUQHScx6mbOgAAA62LTzQ:P1 (envelope-from ) for ; Wed, 18 Sep 2024 01:47:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EJUQHScx6mbOgAAA62LTzQ (envelope-from ) for ; Wed, 18 Sep 2024 03:47:19 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=L9x8gtxJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726624039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=F+aZOXDsRmJWqAVRKxQ5Zm3Gzi+p7D8SkDPvRbIxYVg=; b=DOPcH21KKNSI5JZD5ADZpFjPWYixxHRHVGcelHfhENj3dSVvSg+u0YJvfhPSXrtrR8djEt Gnz10Qv+eS6At4EHyy6a/fuOyYyy2XMTweETXiXUTWXBlzyUySYy7EaVTjS7CFjQhoLx9m xmKBQu7b7/1cmTvWxLgXCd8ttE7emWFc9gvbivVju8/a2bDKBZF6tXUbIvRMeVLfdcaKgA Lc1XDrRvwaeiU9lP6K90o208zEDg/3454zv8FqOW8IMhdu0z67SrqNF67Aez69eV0eGjbF beqERje6CZ5AMiwlp4lQSHaK7qJNbQg+KcNP1nhUa6b5LRavZxmM6Ru1/eR4cg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726624039; a=rsa-sha256; cv=none; b=J+TLsO6o+pgn2nXuxTYP3YHIrTDMuxjtiX7MN4HL7hTT1NscHSyR/5oye/9mxpxGEin98S d1UWpKT5r+wuiQlVOftRaYnNkO5hKC5f1cOb6xvm05y8GHxKo1oUQqIXIGZDkKF/0jXw94 M2qR50jfG6JA8somrr7JL+EA2aIUE9kj/pfjiiVkoiNgrvym1UvGDG+335aGaQMElj+wjx 8UCCtV2QsGjuKE1xAhUuWvbhVDwLoj55Is2WiGOFqR4Jiina48NS04OCVU4tj/9kLG/U7B 9cy17mV484pE4uwzA7F3uR6w8Ynb+tN9vI9meNJLjf8XFHNIetlm+EWkrq9/OA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=L9x8gtxJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 45723930B for ; Wed, 18 Sep 2024 03:47:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqjmR-0004nM-NT; Tue, 17 Sep 2024 21:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqjmO-0004jo-S2 for guix-patches@gnu.org; Tue, 17 Sep 2024 21:46:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqjmO-0008Ln-Hn for guix-patches@gnu.org; Tue, 17 Sep 2024 21:46:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=F+aZOXDsRmJWqAVRKxQ5Zm3Gzi+p7D8SkDPvRbIxYVg=; b=L9x8gtxJfU/90MpneekNoUYVPsaya8E39X6wCRXKJYoXNKSxtug4VKSsCFzOHxqRDu8w2+2LI2qy+xZDp+Js4XTUiOMf4r5aJ59pX474CdE+Xi92TiWGsFdKeTz9yGB3G9O1CauKQchqWr22jQrjb574Oc2/MMSuid44dtbi4YVs+7YT78O4pOCZUJ1ECKSBf+m7UE9V5C6O7IAM2Xsw1NKda5l3XpXK65rMLEKab+v2lEEWvnT7bF5U+O8cOk8ygQjVnf2dCLImXbSHxK/q9dplM5IBKEPOcYUQE2INj5p8/Cb7b3Mi+j18lxZe9HqYTmPpzc7G/lXj7dKaA/Ynbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqjmd-0004FU-TC; Tue, 17 Sep 2024 21:47:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72835] [PATCH qt-team v2 29/74] gnu: qtwebengine: Update to 6.7.2. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 18 Sep 2024 01:47:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72835@debbugs.gnu.org Cc: Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 72835-submit@debbugs.gnu.org id=B72835.172662402216230 (code B ref 72835); Wed, 18 Sep 2024 01:47:07 +0000 Received: (at 72835) by debbugs.gnu.org; 18 Sep 2024 01:47:02 +0000 Received: from localhost ([127.0.0.1]:56421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqjmX-0004DW-8s for submit@debbugs.gnu.org; Tue, 17 Sep 2024 21:47:02 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:57872 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqjmU-0004Cm-8x for 72835@debbugs.gnu.org; Tue, 17 Sep 2024 21:46:59 -0400 Received: from m.tailaa68d.ts.net (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowACHVIzpMOpmMZhWBA--.351S6; Wed, 18 Sep 2024 09:46:34 +0800 (CST) From: Zheng Junjie Date: Wed, 18 Sep 2024 09:43:11 +0800 Message-ID: <053855fe16dcae77897ce3c956b14d53e260b54e.1726567073.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowACHVIzpMOpmMZhWBA--.351S6 X-Coremail-Antispam: 1UD129KBjvJXoW3WFy3trW8GFy5GF4Duw48Zwb_yoWxCw17pa yUJr1Dtr1UGa47ur9xAr1xCrWq9F4jyF9xG3WftF4UAa1Sqr15Jr42kF15ur4qvr47AFyk Cw1UuF17Jry5J3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9lb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK xVWUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV AFwI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8I cIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r 4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUgUDGDUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.61 X-Spam-Score: -4.61 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: 45723930B X-TUID: CFsSeEVkvnhE * gnu/packages/qt.scm (qtwebengine): Update to 6.7.2. [source]: Adjust preserved-third-party-files. [inputs]: replace icu4c and re2 with icu4c-75 and re2-next. add fxdiv, fp16. [arguments]<#:configuration-flags>: Set -DQT_FEATURE_webenginedriver=OFF. Change-Id: Idbfe2c0b180947c41dabbb55548bbc3aaf217d05 Change-Id: Ib1a9445ca815e2cc065716d408e0d1c5211694c7 --- gnu/packages/qt.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 946f5ff39a..1370b91078 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3342,14 +3342,14 @@ (define-public qtwebengine-5 (define-public qtwebengine (package (name "qtwebengine") - (version "6.6.3") + (version "6.7.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw")) + "1lgz0mj9lw4ii1c8nkbr0ll02xzx8i6n7wvvn21f72sdb5smhxf7")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -3384,10 +3384,10 @@ (define-public qtwebengine "third_party/angle/src/common/third_party/xxhash" "third_party/angle/src/third_party/libXNVCtrl" ;Expat "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/bidimapper" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat" "third_party/breakpad" @@ -3411,6 +3411,7 @@ (define-public qtwebengine "third_party/crashpad/crashpad/third_party/lss" "third_party/crashpad/crashpad/third_party/zlib" "third_party/crc32c" + "third_party/d3" "third_party/dav1d" "third_party/dawn" "third_party/dawn/third_party/gn/webgpu-cts" @@ -3424,7 +3425,6 @@ (define-public qtwebengine "third_party/devtools-frontend/src/front_end/third_party/codemirror" "third_party/devtools-frontend/src/front_end/third_party/codemirror.next" "third_party/devtools-frontend/src/front_end/third_party/diff" - "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" @@ -3434,7 +3434,10 @@ (define-public qtwebengine "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/\ +puppeteer/package/lib/esm/third_party/rxjs" + "third_party/devtools-frontend/src/front_end/third_party/\ vscode.web-custom-data" + "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" "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" @@ -3477,6 +3480,7 @@ (define-public qtwebengine "third_party/libaom/source/libaom/third_party/vector" "third_party/libaom/source/libaom/third_party/x86inc" "third_party/libavif" + "third_party/libavifinfo" "third_party/libevent" "third_party/libgav1" "third_party/libjingle_xmpp" @@ -3511,7 +3515,6 @@ (define-public qtwebengine "third_party/one_euro_filter" "third_party/openscreen" ;BSD-3 "third_party/openscreen/src/third_party/tinycbor" ;Expat - "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3 "third_party/openh264" "third_party/opus/src/include/opus.h" "third_party/opus/src/include/opus_custom.h" @@ -3528,7 +3531,6 @@ (define-public qtwebengine "third_party/pdfium/third_party/lcms" "third_party/pdfium/third_party/libopenjpeg" "third_party/pdfium/third_party/libtiff" - "third_party/pdfium/third_party/skia_shared" "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType "third_party/perfetto" "third_party/perfetto/protos/third_party/chromium" @@ -3544,6 +3546,7 @@ (define-public qtwebengine "third_party/re2" "third_party/rnnoise" "third_party/ruy" ;ASL2.0 + "third_party/selenium-atoms" "third_party/s2cellid" ;ASL2.0 "third_party/securemessage" ;ASL2.0 "third_party/shell-encryption" ;ASL2.0 @@ -3573,7 +3576,7 @@ (define-public qtwebengine "third_party/vulkan-deps/vulkan-tools" "third_party/vulkan-deps/vulkan-validation-layers" "third_party/vulkan_memory_allocator" - "third_party/web-animations-js" + "third_party/webgpu-cts" "third_party/webrtc" "third_party/webrtc/common_audio/third_party/ooura" "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" @@ -3589,6 +3592,7 @@ (define-public qtwebengine "third_party/wuffs" "third_party/x11proto" "third_party/xnnpack" ;BSD-3 + "third_party/zstd" "third_party/zlib" ;TODO: make pdfium use system version "third_party/zxcvbn-cpp" ;Expat "url/third_party/mozilla" @@ -3649,6 +3653,10 @@ (define-public qtwebengine "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine "-DQT_FEATURE_system_ffmpeg=ON" + ;; The webenginedriver feature is disabled, otherwise the RUNPATH + ;; validation phase fails. + "-DQT_FEATURE_webenginedriver=OFF" + ;; Do not artificially limit codec support; video decoding is ;; done by ffmpeg. "-DQT_FEATURE_webengine_proprietary_codecs=ON" @@ -3726,9 +3734,9 @@ (define-public qtwebengine (lambda _ (invoke "cmake" "--install" "."))) (add-after 'install 'delete-installed-tests - (lambda _ - (delete-file-recursively - (string-append #$output "/tests"))))))) + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) (native-inputs (modify-inputs (package-native-inputs qtwebengine-5) (delete "python2" "python2-six") @@ -3740,8 +3748,10 @@ (define-public qtwebengine python-html5lib))) (inputs (modify-inputs (package-inputs qtwebengine-5) + (replace "icu4c" icu4c-75) + (replace "re2" re2-next) (replace "qtmultimedia" qtmultimedia) - (append libxkbfile xkeyboard-config))) + (append fp16 fxdiv libxkbfile xkeyboard-config))) (propagated-inputs (modify-inputs (package-propagated-inputs qtwebengine-5) (replace "qtbase" qtbase) -- 2.45.2