From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:25:54 2024 Received: (at submit) by debbugs.gnu.org; 8 Mar 2024 06:25:54 +0000 Received: from localhost ([127.0.0.1]:55915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTfy-0004RZ-VL for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:25:54 -0500 Received: from lists.gnu.org ([209.51.188.17]:48664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTft-0004RO-S3 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:25:49 -0500 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 1riTfN-00049t-B3 for guix-patches@gnu.org; Fri, 08 Mar 2024 01:25:13 -0500 Received: from [159.226.251.84] (helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1riTfH-0006Ex-G7 for guix-patches@gnu.org; Fri, 08 Mar 2024 01:25:13 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADHzaH_quplmkbdBA--.46291S2; Fri, 08 Mar 2024 14:06:56 +0800 (CST) From: Zheng Junjie To: guix-patches@gnu.org Subject: [PATCH WIP qt-team 00/21] Update some qt6 package. Date: Fri, 8 Mar 2024 14:06:54 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADHzaH_quplmkbdBA--.46291S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Cry8CrWkJFWDWF47AFyftFb_yoW8Cr13pF ZIgw15uw1vk34FqwsrGrW8Ca1rWw4kJFW5t3yxZw1rKr1jkrZ5J3y5GF48GrWxWryrWw4x ua1rG3y7JFySvFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU86OJ5UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Host-Lookup-Failed: Reverse DNS lookup failed for 159.226.251.84 (deferred) Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello! This is some qt6 package update, is part of plasma 6 update, I'm not very familiar with qt6, So if there is any problem, it must be my problem. Commits prefixed with FIXME are packages that may need to be fix. Missing qtwebengine, pyqt and many packages. plasma 6 work is in https://github.com/Z572/guix/commits/kde6-rebase2/ Zheng Junjie (21): FIXME: gnu: qtbase: Update to 6.6.2. gnu: qtsvg: Update to 6.6.2. gnu: qtshadertools: Update to 6.6.2. gnu: qtnetworkauth: Update to 6.6.2. gnu: qtimageformats: Update to 6.6.2. gnu: qtlanguageserver: Update to 6.6.2. gnu: qtpositioning: Update to 6.6.2. FIXME: gnu: qtdeclarative: Update to 6.6.2. gnu: qttools: Update to 6.6.2. gnu: qt5compat: Update to 6.6.2. gnu: qtlottie: Update to 6.6.2. gnu: qtwebsockets: Update to 6.6.2. gnu: qttranslations: Update to 6.6.2. gnu: qtwebchannel: Update to 6.6.2. gnu: qtwayland: Update to 6.6.2. gnu: qtremoteobjects: Update to 6.6.2. gnu: qtmultimedia: Update to 6.6.2. gnu: qtspeech: Rename to qtspeech-5. gnu: Add qtspeech. gnu: qtsensors: Rename to qtsensors-5. gnu: Add qtsensors. gnu/local.mk | 1 - gnu/packages/education.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-pim.scm | 4 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ---------------- .../qtdeclarative-disable-qmlcache.patch | 27 +++- gnu/packages/qt.scm | 151 ++++++++++++------ gnu/packages/radio.scm | 2 +- 13 files changed, 136 insertions(+), 204 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch base-commit: 0b5cbca689b2f91949e191ca256ffc9bb48c1141 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:30 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:30 +0000 Received: from localhost ([127.0.0.1]:55938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlL-0004bq-9U for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:30 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39276 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlB-0004bB-Qj for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:21 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3F6mGsOplhRDeBA--.65112S3; Fri, 08 Mar 2024 14:30:32 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 02/21] gnu: qtsvg: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:02 +0800 Message-ID: <171ebf5712a79709f61ad4db9c41575fdd636e91.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3F6mGsOplhRDeBA--.65112S3 X-Coremail-Antispam: 1UD129KBjvdXoW7JF18Zr1xXFWxXF1UJw4ktFb_yoW3Crc_Xr yxXrnayrWkZryUta18CF1UKFyrW3WDXw42grW7Kry8t3Z3Wr1UWF9rWF97Ja15Wa1rtFna yr4YkryfWrW8ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3kYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF 4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIda VFxhVjvjDU0xZFpf9x07j5db8UUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtsvg): Update to 6.6.2. Change-Id: Ic24e80df3a52a918b97cc2b226ca98f2677287c2 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 13008154c4..2b860f0e68 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1174,13 +1174,13 @@ (define-public qtsvg-5 (define-public qtsvg (package (name "qtsvg") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28")))) + "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:35 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:35 +0000 Received: from localhost ([127.0.0.1]:55946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlS-0004cV-7b for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:35 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39282 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlB-0004bC-Qn for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:21 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3F6mGsOplhRDeBA--.65112S4; Fri, 08 Mar 2024 14:30:32 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 03/21] gnu: qtshadertools: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:03 +0800 Message-ID: <3fcc15faf64aec1a0aa61cf9596fb99e48f110d1.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3F6mGsOplhRDeBA--.65112S4 X-Coremail-Antispam: 1UD129KBjvdXoWrtrW7uFWkuFWrKr4rJF4ktFb_yoWfWFc_G3 9xXw1Iyrs5Z348Kw4xCF10y3yrWF1q9w42gay3KFn7t3Zagw4UWFyDWr97J3W8uw48KFn3 AFs0kryrXry29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3kYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF 4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIda VFxhVjvjDU0xZFpf9x07j5-B_UUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtshadertools): Update to 6.6.2. Change-Id: I640701c1449cca0438d209932c8ce6de785a7a63 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b860f0e68..f192b52048 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1717,7 +1717,7 @@ (define-public qtmultimedia-5 (define-public qtshadertools (package (name "qtshadertools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1725,7 +1725,7 @@ (define-public qtshadertools ;; sources. (sha256 (base32 - "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya")))) + "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:36 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:36 +0000 Received: from localhost ([127.0.0.1]:55949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlX-0004dL-8S for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:35 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39292 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlE-0004bH-HG for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:25 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3F6mGsOplhRDeBA--.65112S2; Fri, 08 Mar 2024 14:30:31 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 01/21] FIXME: gnu: qtbase: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:01 +0800 Message-ID: <14c084f94067e3fddae771bc5912515e74204c85.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3F6mGsOplhRDeBA--.65112S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtFyUuFyfKr48XrW3XFWxXrb_yoWfAr1UpF 4akFna9w4rGFy5Jrs3J342q34avw42kFy3Cw1xCwn5t34jka4UZFWftr45Cr13W3yfCw13 Wa18Xr13ua43AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU5PpnJUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtbase): Update to 6.6.2. [source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch [arguments]<#:phase>: skip tst_qt_cmake_create,tst_selftests test. [inputs]: add libb2. * gnu/packages/patches/qtbase-use-TZDIR.patch: remove this. * gnu/local.mk(dist_patch_DATA): remove patch. Change-Id: I650d1b3380095fdae269adcdbf014c7d918080a6 Change-Id: Ief788d0da5be0e9772ca1f35695f17cd658bd8f7 --- gnu/local.mk | 1 - gnu/packages/patches/qtbase-use-TZDIR.patch | 141 -------------------- gnu/packages/qt.scm | 18 +-- 3 files changed, 10 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83937db4c8..0a0ef49719 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1950,7 +1950,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ %D%/packages/patches/qtbase-5-use-TZDIR.patch \ - %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch deleted file mode 100644 index 98bf7493e9..0000000000 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 -From: Edward Welbourne -Date: Mon, 11 Sep 2023 11:41:39 +0200 -Subject: [PATCH] Support the TZDIR environment variable - -On Linux / glibc, this overrides the default system location for the -zone info. So check for files there first. Break out a function to -manage the trying of (now three) zoneinfo directories when opening a -file by name relative to there. - -Pick-to: 6.6 6.5 -Task-number: QTBUG-116017 -Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 ---- -* Rebased on top of v6.5.2. - - src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- - 1 file changed, 49 insertions(+), 24 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 067191d816..a8b2fc894e 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,17 +51,41 @@ typedef QHash QTzTimeZoneHash; - - static bool isTzFile(const QString &name); - -+// Open a named file under the zone info directory: -+static bool openZoneInfo(QString name, QFile *file) -+{ -+ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system -+ // default location for zone info: -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ if (!tzdir.isEmpty()) { -+ file->setFileName(QDir(tzdir).filePath(name)); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Try modern system path first: -+ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; -+ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Fall back to legacy system path: -+ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; -+ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ return false; -+} -+ - // Parse zone.tab table for territory information, read directories to ensure we - // find all installed zones (many are omitted from zone.tab; even more from - // zone1970.tab). - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -- if (!QFile::exists(path)) -- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -- -- QFile tzif(path); -- if (!tzif.open(QIODevice::ReadOnly)) -+ QFile tzif; -+ if (!openZoneInfo("zone.tab"_L1, &tzif)) - return QTzTimeZoneHash(); - - QTzTimeZoneHash zonesHash; -@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() - } - } - -+ const QString path = tzif.fileName(); - const qsizetype cut = path.lastIndexOf(u'/'); - Q_ASSERT(cut > 0); - const QDir zoneDir = QDir(path.first(cut)); -@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) - tzif.setFileName(QStringLiteral("/etc/localtime")); - if (!tzif.open(QIODevice::ReadOnly)) - return ret; -- } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- auto check = validatePosixRule(ianaId); -- if (check.isValid) { -- ret.m_hasDst = check.hasDst; -- ret.m_posixRule = ianaId; -- } -- return ret; -- } -+ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ auto check = validatePosixRule(ianaId); -+ if (check.isValid) { -+ ret.m_hasDst = check.hasDst; -+ ret.m_posixRule = ianaId; -+ return ret; - } - } - -@@ -1317,7 +1335,8 @@ private: - { - // On most distros /etc/localtime is a symlink to a real file so extract - // name from the path -- const auto zoneinfo = "/zoneinfo/"_L1; -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ constexpr auto zoneinfo = "/zoneinfo/"_L1; - QString path = QStringLiteral("/etc/localtime"); - long iteration = getSymloopMax(); - // Symlink may point to another symlink etc. before being under zoneinfo/ -@@ -1325,9 +1344,15 @@ private: - // symlink, like America/Montreal pointing to America/Toronto - do { - path = QFile::symLinkTarget(path); -- int index = path.indexOf(zoneinfo); -- if (index >= 0) // Found zoneinfo file; extract zone name from path: -- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); -+ // If it's a zoneinfo file, extract the zone name from its path: -+ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); -+ if (index >= 0) { -+ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); -+ return tail.startsWith(u'/') ? tail.sliced(1) : tail; -+ } -+ index = path.indexOf(zoneinfo); -+ if (index >= 0) -+ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); - } while (!path.isEmpty() && --iteration > 0); - - return QByteArray(); - -base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 --- -2.41.0 - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 761d12e31f..13008154c4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -67,6 +67,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages crypto) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -654,25 +655,22 @@ (define-public qtbase (package (inherit qtbase-5) (name "qtbase") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) + "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(with-directory-excursion "src/3rdparty" (for-each delete-file-recursively - ;; The bundled pcre2 copy is kept, as its headers - ;; are required by some internal bootstrap target - ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" + "pcre2" "md4c" "libpng" "libjpeg" + "sqlite" "xcb" "zlib")))) + (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" "qtbase-qmake-use-libname.patch")))) (build-system cmake-build-system) @@ -814,6 +812,9 @@ (define-public qtbase (string-join (append (list + ;; FIXME + "tst_qt_cmake_create" + "tst_selftests" ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". "tst_moc" @@ -984,6 +985,7 @@ (define-public qtbase bash-minimal coreutils-minimal md4c + libb2 libice libsm libxcb -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:36 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:36 +0000 Received: from localhost ([127.0.0.1]:55951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlX-0004dV-Vi for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:36 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39278 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlB-0004bD-Qu for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:25 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3F6mGsOplhRDeBA--.65112S6; Fri, 08 Mar 2024 14:30:33 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 05/21] gnu: qtimageformats: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:05 +0800 Message-ID: <1ece37501636a819911adb9635ea65446ad67a17.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3F6mGsOplhRDeBA--.65112S6 X-Coremail-Antispam: 1UD129KBjvdXoWrKry5trW3uw17Cr4DJr1UZFb_yoWfXwb_Ar 97J3sayrWkZr15tw4F9F12ya4fWa4Dur42ga42gF1ktFn3Ww1UXFyDuF1xJa18WF48tFn5 ArWa9r1rWFyUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r 4UYxBIdaVFxhVjvjDU0xZFpf9x07j8xhLUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtimageformats): Update to 6.6.2. Change-Id: Ie4490b88eb50e2f8eb78f94d9feedf6ac61ed18c --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c5a27dfbd0..4bbf2ca552 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1233,14 +1233,14 @@ (define-public qtimageformats-5 (define-public qtimageformats (package (name "qtimageformats") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtimageformats-5)) (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a")))) + "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:36 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:36 +0000 Received: from localhost ([127.0.0.1]:55953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlY-0004dc-9F for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:36 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39280 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlB-0004bE-RC for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:25 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3F6mGsOplhRDeBA--.65112S5; Fri, 08 Mar 2024 14:30:33 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 04/21] gnu: qtnetworkauth: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:04 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3F6mGsOplhRDeBA--.65112S5 X-Coremail-Antispam: 1UD129KBjvdXoWrKryUCFWxKry7XFy3Ww1Utrb_yoWfCFg_Wr WxJw1Fyr4rZr4jkw4kJr40k34fCFWUZ3WIgFy3Krn7KFn3Ww17XF1Dury8JF4xWF4kKFna yr4qkryrWrWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbaxYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0c7CE w4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6x kF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c 02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE 4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4I kC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWU WwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr 0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWU JVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYx BIdaVFxhVjvjDU0xZFpf9x07j1q2_UUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtnetworkauth): Update to 6.6.2. Change-Id: Idd7e9a92aa37e079e380f3831bd16057916da072 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f192b52048..c5a27dfbd0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2495,13 +2495,13 @@ (define-public qtnetworkauth-5 (define-public qtnetworkauth (package (name "qtnetworkauth") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f")))) + "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) (native-inputs (list perl)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:36 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:37 +0000 Received: from localhost ([127.0.0.1]:55955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlY-0004dj-Im for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:36 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39300 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlG-0004bL-Uu for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:26 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABniKmOsOplGxLeBA--.65238S3; Fri, 08 Mar 2024 14:30:39 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 07/21] gnu: qtpositioning: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:07 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABniKmOsOplGxLeBA--.65238S3 X-Coremail-Antispam: 1UD129KBjvdXoWrKrWfKF4kXr1rGr18ZrW7CFg_yoW3uFcEyr y2qwnay395ZryUtw48KFsFka98u3W8ZrsFga17KF18K3Za9r18XFyDur97Ja15WF48Krn5 CrsYkryfWrW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3kYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr 1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIda VFxhVjvjDU0xZFpf9x07j1ApnUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtpositioning): Update to 6.6.2. Change-Id: Ief9c719aab9361c95723abbc1c01a05fddec22c0 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5e22bc6455..2f2c08a582 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2382,13 +2382,13 @@ (define-public qtscxml (define-public qtpositioning (package (name "qtpositioning") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh")))) + "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:37 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:37 +0000 Received: from localhost ([127.0.0.1]:55957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlY-0004dr-Qx for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:37 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39304 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlH-0004bN-Px for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:26 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABniKmOsOplGxLeBA--.65238S2; Fri, 08 Mar 2024 14:30:38 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 06/21] gnu: qtlanguageserver: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:06 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABniKmOsOplGxLeBA--.65238S2 X-Coremail-Antispam: 1UD129KBjvdXoWrKry7KF4DWw15JFWUWFy3urg_yoWfXFg_Jr 17Gwnayrs7Zr4UKw48JF10yayFgF4xWw42ga17KF4kKFn3Wr18WFyDuFykJa18WF4xKrs3 Kr4Y9ryfWry09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFkYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWU JVW8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtlanguageserver): Update to 6.6.2. Change-Id: Ieaff26120a1fae9194923d7f193b7267bbc2928e --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4bbf2ca552..5e22bc6455 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2082,13 +2082,13 @@ (define-public qtwebview (define-public qtlanguageserver (package (name "qtlanguageserver") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk")))) + "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:39 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:39 +0000 Received: from localhost ([127.0.0.1]:55961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTla-0004eE-Ri for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:39 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39328 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlK-0004bQ-0V for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:28 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABniKmOsOplGxLeBA--.65238S4; Fri, 08 Mar 2024 14:30:39 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 08/21] FIXME: gnu: qtdeclarative: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:08 +0800 Message-ID: <96d051b0dea2c4918eeb034a1a43b8a6a06484ee.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABniKmOsOplGxLeBA--.65238S4 X-Coremail-Antispam: 1UD129KBjvJXoWxGF15Aw1fGrWUGw47Xw1rCrg_yoW5uryDp3 45Aa4Fvay0gFy2q3Z3tw1xWF15u397JFyDC3yDJw18uw42vryIqryftFWF9F43Cr45Ww42 9r18tFn3GFy5AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Gb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF 7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIccxYrVCFb41lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU5MuWJUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/qt.scm (qtdeclarative): Update to 6.6.2. * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust. Change-Id: If86771a66eca5014b4a30478eac5dba5940dbd7c --- .../qtdeclarative-disable-qmlcache.patch | 27 ++++++++++++++----- gnu/packages/qt.scm | 6 +++-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index 5f06ec53b4..df76fab910 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -1,16 +1,31 @@ Retrieved from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2f2c08a582..889b5c29c5 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1408,14 +1408,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.5.2") + (version "6.6.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (outputs '("out" "debug")) (build-system cmake-build-system) @@ -1485,6 +1485,8 @@ (define-public qtdeclarative "(" (string-join (list + ;; FIXME + "tst_qquickiconimage" ;; This test is marked as flaky upstream (see: ;; https://bugreports.qt.io/browse/QTBUG-101488). "tst_qquickfiledialogimpl" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:39 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:39 +0000 Received: from localhost ([127.0.0.1]:55963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlb-0004eH-Cz for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:39 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39332 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlK-0004bS-SV for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:30 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABniKmOsOplGxLeBA--.65238S5; Fri, 08 Mar 2024 14:30:42 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 09/21] gnu: qttools: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:09 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABniKmOsOplGxLeBA--.65238S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tr4xGrW8KrW3Xw4DZF18Krg_yoW8Gr4UpF 43CryDt34xWFy5Cwn7twnFgay3WayIyF95C3yrAw4UGw42vrW8Gry3trWakr9rCrn7G342 9F10qa1UZFyrJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9ab7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv 6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzV Aqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S 6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026x CaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_ JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r 1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_ Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8Jr UvcSsGvfC2KfnxnUUI43ZEXa7IU8j-e5UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qttools): Update to 6.6.2. [inputs]: add zstd:lib. Change-Id: Iaa1912a3663bb4e7966044d6e051b3346119ceaf --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 889b5c29c5..163b2000d9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2186,13 +2186,13 @@ (define-public qttools-5 (define-public qttools (package (name "qttools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm")))) + "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76")))) (build-system cmake-build-system) (arguments (list @@ -2213,7 +2213,7 @@ (define-public qttools (native-inputs (list perl qtdeclarative vulkan-headers)) ;; Use clang-15, which is built using as a single shared library, which is ;; what the build system of qttools expects. - (inputs (list clang-15 libxkbcommon mesa qtbase)) + (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib"))) (home-page (package-home-page qtbase)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:40 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:40 +0000 Received: from localhost ([127.0.0.1]:55966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlb-0004eP-P3 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:40 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39334 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlL-0004bT-4L for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:30 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABniKmOsOplGxLeBA--.65238S6; Fri, 08 Mar 2024 14:30:42 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 10/21] gnu: qt5compat: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:10 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABniKmOsOplGxLeBA--.65238S6 X-Coremail-Antispam: 1UD129KBjvdXoWruFy3Zr4rKw1DJF1xtr43Wrg_yoW3Zrg_CF y7X3WSyrZ5ZryUKw4FkF1jkFy5W3WDZr47K3W7KFn7tFn3Wr48X3WDWr97Ja15XF48KFsY yr4SkryrXFWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-xYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUzLvKUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qt5compat): Update to 6.6.2. Change-Id: Id4be1c4a1e1dc7e7fd09eb32f50ea55c24a0cd7c --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 163b2000d9..723b63ad51 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1076,13 +1076,13 @@ (define-public qt3d-5 (define-public qt5compat (package (name "qt5compat") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr")))) + "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:40 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:41 +0000 Received: from localhost ([127.0.0.1]:55968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlc-0004ea-6S for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:40 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39354 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlR-0004bo-7V for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:32 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAnL6uXsOplRRTeBA--.44389S6; Fri, 08 Mar 2024 14:30:49 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 15/21] gnu: qtwayland: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:15 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAnL6uXsOplRRTeBA--.44389S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF1kAr17Zr4UKFyfKrWDCFg_yoW8JFW5pF 1rCrs8u3ZY9ay8Gw4kXr12kw4DWrsrCFyUA393A3y2kw4I9rWUJry3CFWakrnrJFW0gw12 9ayIga15Wr1rJrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9vb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E 87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8cTmDUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwayland): Update to 6.6.2. [arguments]<#:phases>: Adjust set-test-environment phase. Change-Id: I6e7194df614d18fb9937a66cad7b6a1527c06a4b --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 040c289e25..85cdf252e6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1869,13 +1869,13 @@ (define-public qtwayland-5 (define-public qtwayland (package (name "qtwayland") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 - (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h")))) + (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") @@ -1892,6 +1892,7 @@ (define-public qtwayland (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) (add-before 'check 'set-test-environment (lambda _ + (setenv "XDG_RUNTIME_DIR" (getcwd)) ;; Do not fail just because /etc/machine-id is missing. (setenv "DBUS_FATAL_WARNINGS" "0") ;; Make Qt render "offscreen", required for tests. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:41 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:41 +0000 Received: from localhost ([127.0.0.1]:55971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlc-0004ek-Oe for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:41 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39352 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlR-0004bn-72 for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:32 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAnL6uXsOplRRTeBA--.44389S3; Fri, 08 Mar 2024 14:30:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 12/21] gnu: qtwebsockets: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:12 +0800 Message-ID: <93d8b749647478c40188b0b7a83532ac7b6d6b02.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAnL6uXsOplRRTeBA--.44389S3 X-Coremail-Antispam: 1UD129KBjvdXoWrZFWkKw18Xw45uFWxJFyDGFg_yoW3uwc_Jr 9xA3sayrWkZrWUKw48CF1jkFWfWF1jyF42gFy3KF18tFn3uw18XFyDWF97Ja1rWF40yFna krWFkr93GrW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr 1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCT nIWIevJa73UjIFyTuYvjxU2AhLUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwebsockets): Update to 6.6.2. Change-Id: Ic34b9a381edbb00f97acc7d269bbedb33415fd8c --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d4db8e2ee8..c3728635fa 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1603,13 +1603,13 @@ (define-public qtwebsockets-5 (define-public qtwebsockets (package (name "qtwebsockets") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0")))) + "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:42 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:42 +0000 Received: from localhost ([127.0.0.1]:55973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTld-0004ex-8r for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:41 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39350 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlR-0004bm-38 for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:32 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAnL6uXsOplRRTeBA--.44389S4; Fri, 08 Mar 2024 14:30:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 13/21] gnu: qttranslations: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:13 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAnL6uXsOplRRTeBA--.44389S4 X-Coremail-Antispam: 1UD129KBjvdXoWrtry8Xw1fZr4DWFW8tFyxZrb_yoWfXFb_Cr yxX3ZayF4rXryUta18GF1ktayruF48Zw1IgFW7KFykKFnxWr4UWFyDWrWkJa1UWF4rtFna yrs0kry3Zry7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F4 0Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC 6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x 0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2 zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr 1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWU CwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCT nIWIevJa73UjIFyTuYvjxU7J3vUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qttranslations): Update to 6.6.2. Change-Id: Iff2a08a486cfb0574dd33345a5689ad719b487b2 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c3728635fa..c490619c8d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2226,13 +2226,13 @@ (define-public qttools (define-public qttranslations (package (name "qttranslations") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k")))) + "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list qtbase qttools)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:42 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:42 +0000 Received: from localhost ([127.0.0.1]:55975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTld-0004f4-Vj for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:42 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39360 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlS-0004bt-Aj for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:32 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAnL6uXsOplRRTeBA--.44389S5; Fri, 08 Mar 2024 14:30:49 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 14/21] gnu: qtwebchannel: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:14 +0800 Message-ID: <9a5507124e633a4510ff65332cc45ad9e8f75dea.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAnL6uXsOplRRTeBA--.44389S5 X-Coremail-Antispam: 1UD129KBjvdXoW7Gry3Gw4xCw4ruFW3CF15urg_yoW3uwc_GF yxXwnavrWkZry8Kw48KF1UKayFg3WUZw12ga13Kr48tFnxWw4UXFyqgrykAa18WF48tF93 Crs0kryfWFW09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbakYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0c7CE w4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6x kF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c 02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE 4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4I kC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWU WwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Gr 0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWU JVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJb IYCTnIWIevJa73UjIFyTuYvjxU7qXdUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwebchannel): Update to 6.6.2. Change-Id: Id534496d96628d6af66772842f0a1a9525292b9d --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c490619c8d..040c289e25 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2000,13 +2000,13 @@ (define-public qtwebchannel-5 (define-public qtwebchannel (package (name "qtwebchannel") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261")))) + "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:45 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:45 +0000 Received: from localhost ([127.0.0.1]:55978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlh-0004fQ-Br for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:45 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39358 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlR-0004bs-DI for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:34 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAnL6uXsOplRRTeBA--.44389S2; Fri, 08 Mar 2024 14:30:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 11/21] gnu: qtlottie: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:11 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAnL6uXsOplRRTeBA--.44389S2 X-Coremail-Antispam: 1UD129KBjvdXoWrZryrArW3Gr13GFykWrW8Xrb_yoW3ZrX_Cr W7Jwnayr48ZrnrKa10k3W0ka4rWa1UAa129FW3KF1ktFn3Ww1xWF9rWr97Ja1UWa18tFn5 Jr4SkryrGrW09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8ag4DUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtlottie): Update to 6.6.2. Change-Id: I68e4725203684646b1e746cf31e183b9a7de668e --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 723b63ad51..d4db8e2ee8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2133,13 +2133,13 @@ (define-public qtlocation (define-public qtlottie (package (name "qtlottie") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0")))) + "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:46 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:46 +0000 Received: from localhost ([127.0.0.1]:55980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlh-0004fX-Jh for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:45 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39376 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlY-0004cg-Lo for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:37 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABXeKmfsOplNRbeBA--.62644S2; Fri, 08 Mar 2024 14:30:56 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 16/21] gnu: qtremoteobjects: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:16 +0800 Message-ID: <66e23a285e07e05afce2e3a6aa36a69d9927deb0.1709877023.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXeKmfsOplNRbeBA--.62644S2 X-Coremail-Antispam: 1UD129KBjvdXoWrKFy3trWxCFWftr17WryrtFb_yoW3tFX_AF W7t3WIvr4kZryjkw48AF10ka4rWF47Aw1IgFZxKrWktF9Igw18XF1DWr97Ja18Wa18Kr9a yrsakry8WrW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8ag4DUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtremoteobjects): Update to 6.6.2. Change-Id: Ic5728e1703ec3334b472c1a8b8841a913528834b --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 85cdf252e6..00ff9a62e3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2518,13 +2518,13 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (name "qtremoteobjects") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60")))) + "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:46 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:46 +0000 Received: from localhost ([127.0.0.1]:55982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlh-0004fa-VZ for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:46 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39380 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlZ-0004cn-M3 for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:38 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABXeKmfsOplNRbeBA--.62644S3; Fri, 08 Mar 2024 14:30:56 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 17/21] gnu: qtmultimedia: Update to 6.6.2. Date: Fri, 8 Mar 2024 14:30:17 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXeKmfsOplNRbeBA--.62644S3 X-Coremail-Antispam: 1UD129KBjvJXoW7CrWktF4DXr1xJw4xJr13urg_yoW8Gw4Upr ZFqry2kw10gF1UJwn7Gr1Iyan8WF4xJrWUCw4fZa1fKwnF9rWUJrWIyFWrurn7XrWxtw4U u3W0g3W5Zr1aqFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Fb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF 7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6r yUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7IU890ePUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtmultimedia): Update to 6.6.2. [arguments]<#:phases>: adjust 'disable-integration-tests phase. Change-Id: I34c74de856566ae815c90e62aedf29e3b5990d83 --- gnu/packages/qt.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 00ff9a62e3..79e59a0e74 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1748,13 +1748,13 @@ (define-public qtshadertools (define-public qtmultimedia (package (name "qtmultimedia") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl")) + "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572")) (modules '((guix build utils))) (snippet '(begin @@ -1779,7 +1779,10 @@ (define-public qtmultimedia ;; session bus, which requires an X11 server, and then is still ;; unhappy). (substitute* "tests/auto/CMakeLists.txt" - (("add_subdirectory\\(integration)") "")))) + (("add_subdirectory\\(integration)") "")) + ;; fail on offscreen rendering + (substitute* "tests/auto/unit/multimedia/CMakeLists.txt" + (("add_subdirectory\\(qvideoframecolormanagement\\)") "")))) (add-before 'check 'prepare-for-tests (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:46 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:47 +0000 Received: from localhost ([127.0.0.1]:55985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTli-0004fh-D7 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:46 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39386 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlb-0004dA-3o for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:40 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABXeKmfsOplNRbeBA--.62644S5; Fri, 08 Mar 2024 14:30:58 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 19/21] gnu: Add qtspeech. Date: Fri, 8 Mar 2024 14:30:19 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXeKmfsOplNRbeBA--.62644S5 X-Coremail-Antispam: 1UD129KBjvJXoW7try7CF4kCw1xWw1rJFWDArb_yoW8Xw47pF WFkr1Y93WrGF13A39IqF40kFn8Wws3ArWUAw47Zw12kw4j9rWrAry3KrZ8Wrn7JFy3Aa13 Wa18Xa15urW5WFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9ab7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv 6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzV Aqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S 6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026x CaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_ JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r 4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_ Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8Jr UvcSsGvfC2KfnxnUUI43ZEXa7IU8zwZ7UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtspeech): New variable. Change-Id: Iba3277b2774b80366960b57207ed179979e54215 --- gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cf4baee99b..4fb07e1a36 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2580,6 +2580,38 @@ (define-public qtspeech-5 In such a scenario, the messaging application can read out the incoming message."))) +(define-public qtspeech + (package + (inherit qtspeech-5) + (name "qtspeech") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0")))) + (build-system qt-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'prepare-for-tests + (lambda* (#:key outputs #:allow-other-keys) + (setenv "QML2_IMPORT_PATH" + (string-append (assoc-ref outputs "out") + "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs '()) + (propagated-inputs (list qtmultimedia)) + (inputs (list qtbase qtdeclarative)))) + (define-public qtvirtualkeyboard-5 (package (inherit qtsvg-5) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:47 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:48 +0000 Received: from localhost ([127.0.0.1]:55987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTli-0004fv-Tb for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:47 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39388 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlb-0004dC-TX for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:41 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABXeKmfsOplNRbeBA--.62644S6; Fri, 08 Mar 2024 14:30:58 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 20/21] gnu: qtsensors: Rename to qtsensors-5. Date: Fri, 8 Mar 2024 14:30:20 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Maxim Cournoyer , Sharlatan Hellseher , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXeKmfsOplNRbeBA--.62644S6 X-Coremail-Antispam: 1UD129KBjvJXoWxXF4fCw4DAw4xtFyfXw4fXwb_yoW5GF18pF W5C3WI9348KrWrJws2qw12kw4YgayxCFW5CwsrZw4Fkw47Zry0vryaya15C3W7Gr1kWw1U ua1kXF45Ar98GFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9vb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E 87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8cTmDUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm(qtsensors): Rename to qtsensors-5. (python-pyqt,python-pyside-2): Adjust inputs. * gnu/packages/education.scm(gcompris-qt): Adjust inputs. * gnu/packages/kde-plasma.scm(kscreen): Adjust inputs. * gnu/packages/geo.scm(openorienteering-mapper): Adjust inputs. Change-Id: Id19408579f6c765cb4d28504a2ce90e6727615b4 --- gnu/packages/education.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..50d4b332ee 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..63e66afdb8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 331ab28cd1..5594136f12 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4fb07e1a36..064f9e0576 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1639,7 +1639,7 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -3713,7 +3713,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4527,7 +4527,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors + qtsensors-5 qtspeech-5 qtsvg-5 qttools-5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:48 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:48 +0000 Received: from localhost ([127.0.0.1]:55989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlj-0004g7-Sm for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:48 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39398 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTld-0004dT-Vn for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:43 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABXeKmfsOplNRbeBA--.62644S4; Fri, 08 Mar 2024 14:30:56 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to qtspeech-5. Date: Fri, 8 Mar 2024 14:30:18 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Liliana Marie Prikler , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXeKmfsOplNRbeBA--.62644S4 X-Coremail-Antispam: 1UD129KBjvJXoWxCw45Cr1rCw4fJFyxur17KFg_yoWrXF18pF Wayr1jvw1fKrWrJa1DGr42kwnxX3yxAFWUCanrZ3WrK3W7ury8ArW7KF45CF17Jrn7Ww47 ua1rWrW5Ar95JFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Fb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF 7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6r yUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7IU56rW7UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm(qtspeech): Rename to qtspeech-5. python-pyside-2: * gnu/packages/games.scm (chessx): * gnu/packages/kde-frameworks.scm(ktextwidgets): * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit): * gnu/packages/kde-utils.scm(kmouth): * gnu/packages/kde.scm(okular): * gnu/packages/radio.scm(sdrangel): Adjust inputs. Change-Id: I64cc893edbb1f5dbe0ada3ffb361513de0884b8b --- gnu/packages/games.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-pim.scm | 4 ++-- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ff08e5e74..fdc2d53a77 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10475,7 +10475,7 @@ (define-public chessx (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..227f9a28b1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3249,7 +3249,7 @@ (define-public ktextwidgets kwidgetsaddons kwindowsystem qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e95eac4e2f..9a1c0b8d8e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,7 +848,7 @@ (define-public kdepim-runtime qtdeclarative-5 qtkeychain qtnetworkauth-5 - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtxmlpatterns)) @@ -1993,7 +1993,7 @@ (define-public kpimtextedit kwidgetsaddons kxmlgui qtbase-5 - qtspeech + qtspeech-5 sonnet)) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..6c6a669597 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -874,7 +874,7 @@ (define-public kmouth kxmlgui breeze-icons ;; default icon set qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8e8bb32fda..385bb42926 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1557,7 +1557,7 @@ (define-public okular kio kparts kpty - qtspeech + qtspeech-5 kwallet kwindowsystem libkexiv2 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79e59a0e74..cf4baee99b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2555,7 +2555,7 @@ (define-public qtremoteobjects (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtspeech +(define-public qtspeech-5 (package (inherit qtsvg-5) (name "qtspeech") @@ -4496,7 +4496,7 @@ (define-public python-pyside-2 qtscript qtscxml qtsensors - qtspeech + qtspeech-5 qtsvg-5 qttools-5 qtwebchannel-5 diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index caa8b61ee3..cc020bc669 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2671,7 +2671,7 @@ (define-public sdrangel qtmultimedia-5 qtquickcontrols2-5 qtserialport - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtwebsockets-5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 01:31:57 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 06:31:57 +0000 Received: from localhost ([127.0.0.1]:55991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlp-0004lX-Db for submit@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:57 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39408 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riTlh-0004eN-Mm for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 01:31:46 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqosOplWBfeBA--.7295S2; Fri, 08 Mar 2024 14:31:05 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH WIP qt-team 21/21] gnu: Add qtsensors. Date: Fri, 8 Mar 2024 14:30:21 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADn7nqosOplWBfeBA--.7295S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GF1fXr4fJw13Gw4rKw47XFb_yoWkXFX_uF yxJF9Yyr48ZFWjqa4FyF1vk3sY9rW8Cr1xKa1jgr4vkr13Wr45XFsrWFy8AF4xXF45tr1F kr45CryfXr97ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFAYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUAVWUtwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8HGQDUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtsensors): New variable. Change-Id: I87f57a31b51b653ed55db47bfe120c270aa7c44f --- gnu/packages/qt.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 064f9e0576..4b00020c72 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1639,6 +1639,25 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) +(define-public qtsensors + (package + (inherit qtsvg) + (name "qtsensors") + (version "6.6.1") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1lwr6xw4flzcqvb017wl9g8p5yamf0z4zqx2wp4rmhrgbj0yw4xx")))) + (native-inputs + (list qtdeclarative)) + (inputs (list qtbase)) + (synopsis "Qt Sensors module") + (description "The Qt Sensors API provides access to sensor hardware via QML +and C++ interfaces. The Qt Sensors API also provides a motion gesture +recognition API for devices."))) + (define-public qtsensors-5 (package (inherit qtsvg-5) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 14:13:50 2024 Received: (at 69628) by debbugs.gnu.org; 8 Mar 2024 19:13:50 +0000 Received: from localhost ([127.0.0.1]:59581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riffC-0000ry-G0 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 14:13:50 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:45322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riffA-0000rk-3H for 69628@debbugs.gnu.org; Fri, 08 Mar 2024 14:13:49 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a45c006ab82so319749666b.3 for <69628@debbugs.gnu.org>; Fri, 08 Mar 2024 11:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709925130; x=1710529930; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Yp615zZbmKv5apiYqX6YQlUQxR73CM0TA1cDlnL+ntM=; b=WGw0Ipsrz2cyQBaFoBi4Hix+qWd4qWRbo224LrCZ3vmmU/KrVZGdn2a/jXSrMlmDXV PFgu+fzt693x0NzEdAUjUO3YQEp7hkUBBWcUFWZEb3tjnlsBYl3C5m6PJymsQ00eJM0f Mk1JlqwONgXngRnVpG1vE99xmhuA039kiLtsDCjy11I+jrMA4f7ZUTJLyup8DDNoU1cb ZJ86Zp5JnX/nQRXanEd3jUoYOP9xprO0AaH23JEQArTd8VIFdnqZGjTjd/23F1ag1LGY BiX3KJTl243qlVcsD1RA6fBHE41wZpPfzG7VGUI9tETwoAg65tUuqr7dYyHMFfrVfi0+ ZP8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709925130; x=1710529930; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Yp615zZbmKv5apiYqX6YQlUQxR73CM0TA1cDlnL+ntM=; b=kUJqcZSoU57hK2m/7MprLRt2iFff9PaxvY7FfQQ6N7uzrRCx/5k8WQWG0Ajq/CahU4 oaMiGKOHsxI25zw1TMADaK7qkB0nCm2G/elH6JYHPJsPQpKK/XTRarR2eAWTtlBt3/1I CAQMVgkxkPeaeuxEAcgnCR2GLGfj8EMZ2B5+a0sm15CcXYETS+QsHE0BkZhaE6fHb2bg 1IgSVHS0umW9oskSI/14DOvjC/mhvXXsCrqmKsnNdG/j9LG+8pku03BO2rS8DxbIfnOW 3MzJg6SCG9qsnIEpEG/61L+6R0NUCJZpXWqAPIgiYTeQa7zN+XbWCeNZ4nOyZVcrhYeN Nglw== X-Forwarded-Encrypted: i=1; AJvYcCUeDG4JG8vCHCmiNOUXnYJa2D7/Z8ByAd+g7eOaOIdWwWoPRPVgSecLVCjTiPhTV4FJaUtVk7l4r12PXOA716OGEtnuw0s= X-Gm-Message-State: AOJu0YzlAEelSss6LRPZ6o9E3pECWGsINc9lLQqZGxGlD0Rsio4vMIb3 /kC6q889pgC/eqQ+ihwJN0xD/QHQEVXpQaE7ridQqfRmQnmoWUAX X-Google-Smtp-Source: AGHT+IHWiEbcP0fKhNzAOKbzuBILpnQAFqlUgDcvvHVcA5jVmKgXhfh37mL+GC1Fd/LIC8JxljZNpA== X-Received: by 2002:a17:906:40cf:b0:a3f:1cb6:fb00 with SMTP id a15-20020a17090640cf00b00a3f1cb6fb00mr16598856ejk.69.1709925129985; Fri, 08 Mar 2024 11:12:09 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hq31-20020a1709073f1f00b00a45c09107d6sm85794ejc.29.2024.03.08.11.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 11:12:09 -0800 (PST) Message-ID: Subject: Re: [bug#69628] [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to qtspeech-5. From: Liliana Marie Prikler To: Zheng Junjie , 69628@debbugs.gnu.org Date: Fri, 08 Mar 2024 20:12:08 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: Andreas Enge , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 08.03.2024 um 14:30 +0800 schrieb Zheng Junjie: > * gnu/packages/qt.scm(qtspeech): Rename to qtspeech-5. > =C2=A0 python-pyside-2: > * gnu/packages/games.scm (chessx): > * gnu/packages/kde-frameworks.scm(ktextwidgets): > * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit): > * gnu/packages/kde-utils.scm(kmouth): > * gnu/packages/kde.scm(okular): > * gnu/packages/radio.scm(sdrangel): > Adjust inputs. >=20 > Change-Id: I64cc893edbb1f5dbe0ada3ffb361513de0884b8b > --- Got this mail from the games team, I don't think it'll be an issue. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 09 13:25:17 2024 Received: (at 69628) by debbugs.gnu.org; 9 Mar 2024 18:25:17 +0000 Received: from localhost ([127.0.0.1]:34779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rj1Nf-00061B-KC for submit@debbugs.gnu.org; Sat, 09 Mar 2024 13:25:17 -0500 Received: from mail-oa1-f42.google.com ([209.85.160.42]:53491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rj1NY-00060X-Nm for 69628@debbugs.gnu.org; Sat, 09 Mar 2024 13:25:09 -0500 Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-21f0c82e97fso1303547fac.2 for <69628@debbugs.gnu.org>; Sat, 09 Mar 2024 10:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710008606; x=1710613406; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=6ZoGvxzaObGgVUZQaUL/5tavOGJzXg4Tbw7iKKOeEl8=; b=mZ0i+EThKyZ8L89VNuyqJjCg4k/S4BzXQKnJV7Uan6mNTWqX0VeEg+HAwFqRueSSja vUkOduF0F+brL1dZW0MwKWkRKzkpzcRUD0xgiEsOWQ+l8XLcWjh4vWFHW7f1S2ibvKM9 nl9W3g7rFW9JihZuSBXOrjXJTFwYCSTubWlJ7PDHoerHfXb1rlFenu+kGvStmPhOWlsY JN4YjcmDx+IPynPXOJEcgVgjK+eA4jHP71Jl10aCzUzRSx/v5lghpA2T50LbMdbo64aw Mo6exPXuHeS6guRZbSVGhENiPOUV5tvNnPP92iwc1NQ1+/QF2EvaZgawRP6tMcaCRGkJ xOWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710008606; x=1710613406; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6ZoGvxzaObGgVUZQaUL/5tavOGJzXg4Tbw7iKKOeEl8=; b=aV4CcgDfcOhHq5wnTShm8g+K0zapE+3TEydMPrBU9boKWgqYOWoLS6qTwhdqRTsnnt Fn6wCvTlKh/DfjwOmHY2E0AEd59J3OKeMSdoPIPnhj25p1O+1vs+4T5TJDVCNtHKIXbh ORl2CvcCzoMzVDv/mUTpRTOOhwwsF6rwKUEX9EAkl8uXE7mYNKEsxO9x8fPaqUxa30LG Am4RL1mypd2z5JDPjhFsiaP84G2afTSKSXvOvGOhDMwnnXiLoUdxa7gt1w19ZNPYW9F9 vqZLDCahvhArfI3z95vLO+P3W67hKaehj86TvfnSHsq0edDpvKCemPGVIYVX3tNHl0WZ YOgg== X-Gm-Message-State: AOJu0Yz/kksP6BaSdR+EUdjB0Yw9nK6uRcuwr5H1uwDItQOO7WYaBhKU Zus7m7xGF+QUAHFRK4BBg/xQa//dkNW9s5yt+1MCWMnqUyAB1UiCKTNm1947j3c= X-Google-Smtp-Source: AGHT+IEK5vuHrXJY295WAEiTR3PbWx7sPjUrtf5L9kA1uMXCqzblGIlkdeu/sKQR3rN1IHMy2mc5Qg== X-Received: by 2002:a05:6871:29c:b0:221:35e9:6fc4 with SMTP id i28-20020a056871029c00b0022135e96fc4mr3012031oae.0.1710008604628; Sat, 09 Mar 2024 10:23:24 -0800 (PST) Received: from hurd (dsl-150-134.b2b2c.ca. [66.158.150.134]) by smtp.gmail.com with ESMTPSA id mh3-20020a056214564300b00690c77505bdsm289181qvb.37.2024.03.09.10.23.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 10:23:24 -0800 (PST) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package. In-Reply-To: (Zheng Junjie's message of "Fri, 8 Mar 2024 14:06:54 +0800") References: Date: Sat, 09 Mar 2024 13:23:23 -0500 Message-ID: <87sf0ze02s.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: 69628@debbugs.gnu.org, Andreas Enge , =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Zheng, Zheng Junjie writes: > Hello! This is some qt6 package update, is part of plasma 6 update, > I'm not very familiar with qt6, So if there is any problem, it must be my problem. > Commits prefixed with FIXME are packages that may need to be fix. > > Missing qtwebengine, pyqt and many packages. > > plasma 6 work is in https://github.com/Z572/guix/commits/kde6-rebase2/ I don't mind updating qt 6 to a more recent version than the LTS it's currently tracking (Jami wants a newer version as well), but I think we should update all the packages at the same time. This can be done via the manifests found under etc/teams/qt/. Would you like to try it? Then we could push the series as the 'qt-team' and have it built by Cuirass on Berlin to see if there are any problems with it. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 11 01:35:05 2024 Received: (at 69628) by debbugs.gnu.org; 11 Mar 2024 05:35:06 +0000 Received: from localhost ([127.0.0.1]:38327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjYJT-0001lm-KF for submit@debbugs.gnu.org; Mon, 11 Mar 2024 01:35:05 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:50018 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjYJM-0001l9-St for 69628@debbugs.gnu.org; Mon, 11 Mar 2024 01:35:01 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-03 (Coremail) with SMTP id rQCowADHzv7Ll+5l1CtLBQ--.50481S2; Mon, 11 Mar 2024 13:34:05 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH v2] gnu: qt: Update to 6.6.2. Date: Mon, 11 Mar 2024 13:34:02 +0800 Message-ID: <7ab3bccb56aef7d6c72a47f41d05836d240492c8.1710135242.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Andreas Enge , Eric Bavier , Liliana Marie Prikler , Maxim Cournoyer , Sharlatan Hellseher , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowADHzv7Ll+5l1CtLBQ--.50481S2 X-Coremail-Antispam: 1UD129KBjvAXoWDJrW5XF17XFWkZFW5Zr47Arb_yoWruw1kJo Z7XF1UX3yrGr43Xr4vkrnrAw4kZFZ5CF1aqFs5uF1kC3WkZay5G34rua1fXFW7ArW8CFZ3 Aa97GryxXFW5Xr1fn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYU7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJV W8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l 4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67 AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYY7kG6xAYrwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42 IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280 aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUL5x6UUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth, qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools, qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland, qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qt-creator, qtwebengine): Update to 6.6.2. (qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add qtbase-find-tools-in-PATH.patch, qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, qtbase-check-in-the-QML-folder-of-this-library-does-.patch. (qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test. (qtbase)[inputs]: add libb2. * gnu/packages/patches/qtbase-use-TZDIR.patch: remove this. * gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file * gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file * gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file * gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file * gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch. Add qtbase-find-tools-in-PATH.patch, Regist qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, qtbase-check-in-the-QML-folder-of-this-library-does-.patch. * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it. (qttools)[inputs]: add zstd:lib. (qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase. (qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase. gnu: Add qtspeech-5. * gnu/packages/qt.scm(python-pyside-2): * gnu/packages/games.scm (chessx): * gnu/packages/kde-frameworks.scm(ktextwidgets): * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit): * gnu/packages/kde-utils.scm(kmouth): * gnu/packages/kde.scm(okular): * gnu/packages/radio.scm(sdrangel): Adjust inputs. gnu: Add qtsensors-5. * gnu/packages/qt.scm(python-pyqt,python-pyside-2): * gnu/packages/education.scm(gcompris-qt): * gnu/packages/kde-plasma.scm(kscreen): * gnu/packages/geo.scm(openorienteering-mapper): Adjust inputs. (qtwebengine)[source]: Adjust snippet. [arguments]<#:configure-flags>: Adjust it. <#:phases>: Add delete-installed-tests phase. Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9 --- gnu/local.mk | 5 +- gnu/packages/education.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-pim.scm | 4 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 2 +- ...the-QML-folder-of-this-library-does-.patch | 35 +++ .../patches/qtbase-find-tools-in-PATH.patch | 45 ++++ ...mlimportscanner-the-QML2_IMPORT_PATH.patch | 30 +++ ...x-includedir-in-generated-pkg-config.patch | 26 +++ gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ------------ .../qtdeclarative-disable-qmlcache.patch | 27 ++- gnu/packages/qt.scm | 208 ++++++++++++------ gnu/packages/radio.scm | 2 +- 17 files changed, 316 insertions(+), 221 deletions(-) create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1aa413ebbe..3741cb9cd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1951,10 +1951,13 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-fix-agent-paths.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ + %D%/packages/patches/qtbase-find-tools-in-PATH.patch \ + %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \ + %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \ + %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ %D%/packages/patches/qtbase-5-use-TZDIR.patch \ - %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..50d4b332ee 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ff08e5e74..fdc2d53a77 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10475,7 +10475,7 @@ (define-public chessx (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..63e66afdb8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..227f9a28b1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3249,7 +3249,7 @@ (define-public ktextwidgets kwidgetsaddons kwindowsystem qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e95eac4e2f..9a1c0b8d8e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,7 +848,7 @@ (define-public kdepim-runtime qtdeclarative-5 qtkeychain qtnetworkauth-5 - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtxmlpatterns)) @@ -1993,7 +1993,7 @@ (define-public kpimtextedit kwidgetsaddons kxmlgui qtbase-5 - qtspeech + qtspeech-5 sonnet)) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..6c6a669597 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -874,7 +874,7 @@ (define-public kmouth kxmlgui breeze-icons ;; default icon set qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8e8bb32fda..385bb42926 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1557,7 +1557,7 @@ (define-public okular kio kparts kpty - qtspeech + qtspeech-5 kwallet kwindowsystem libkexiv2 diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch new file mode 100644 index 0000000000..ed749cb238 --- /dev/null +++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -0,0 +1,35 @@ +From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:17:00 -0400 +Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does + actually exist + +In a modularized installation, this folder will be the location where +`qtbase` itself is installed, but `qtbase` does not have any QML +code, and `qmlimportscanner` will complain that it does not exist. +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 320095a972d..87ba0d4e24b 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + } + for (const QString &importPath : qmlImportPaths) + argumentList << "-importPath" << importPath; ++ + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); +- argumentList.append( "-importPath"); +- argumentList.append(qmlImportsPath); ++ if (QFile::exists(qmlImportsPath)) { ++ argumentList.append( "-importPath"); ++ argumentList.append(qmlImportsPath); ++ } + + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch new file mode 100644 index 0000000000..1d60684e07 --- /dev/null +++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch @@ -0,0 +1,45 @@ +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 29 Mar 2023 11:51:33 +0800 +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH + +1. find qt's tools in `QTTOOLSPATH` env + qt assumes that all components use the same install prefix + we can't get the real prefix for qttools when build qtbase + we will add /libexec to `QTTOOLSPATH` in qtToolsHook + find_path will also search in 'PATH' by default + see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` + +2. disable tool_dependencies_enabled + We can guarantee the build order of qt components in nixpkgs + tools in qttools always build before qtdoc + qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` +--- + cmake/QtDocsHelpers.cmake | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake +index 48ed5a324bf..91d8d41fb1f 100644 +--- a/cmake/QtDocsHelpers.cmake ++++ b/cmake/QtDocsHelpers.cmake +@@ -47,9 +47,14 @@ function(qt_internal_add_docs) + set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") + endif() + +- set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") +- set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") +- set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") ++ set(tool_dependencies_enabled FALSE) ++ ++ find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH) ++ find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH) ++ find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH) ++ set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") + + get_target_property(target_type ${target} TYPE) + if (NOT target_type STREQUAL "INTERFACE_LIBRARY") +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch new file mode 100644 index 0000000000..7bf2193bc2 --- /dev/null +++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -0,0 +1,30 @@ +From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:12:56 -0400 +Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH + +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 2ae4f998944..ba10ae02bcd 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + argumentList.append( "-importPath"); + argumentList.append(qmlImportsPath); + ++ // In a modularized installation of qt as we have in Nix, instead, we will ++ // read the paths from the environment, as they are spread in multiple ++ // locations and normally set in the environment like this ++ auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':'); ++ for (const QString &importPath : envQmlImportPaths) ++ argumentList << "-importPath" << importPath; ++ + // run qmlimportscanner + QProcess qmlImportScanner; + qmlImportScanner.start(qmlImportScannerPath, argumentList); +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch new file mode 100644 index 0000000000..53f226254a --- /dev/null +++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -0,0 +1,26 @@ +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Fri, 14 Apr 2023 09:34:46 +0800 +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config + +--- + qmake/generators/makefile.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +index 11d2f0ff7df..c78ed0d3485 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() + << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") + // << varGlue("DEFINES","-D"," -D"," ") + ; +- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) +- t << "-I${includedir}"; ++ t << "-I${includedir}"; + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") + && libDir != QLatin1String("/Library/Frameworks")) { + t << " -F${libdir}"; +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch deleted file mode 100644 index 98bf7493e9..0000000000 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 -From: Edward Welbourne -Date: Mon, 11 Sep 2023 11:41:39 +0200 -Subject: [PATCH] Support the TZDIR environment variable - -On Linux / glibc, this overrides the default system location for the -zone info. So check for files there first. Break out a function to -manage the trying of (now three) zoneinfo directories when opening a -file by name relative to there. - -Pick-to: 6.6 6.5 -Task-number: QTBUG-116017 -Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 ---- -* Rebased on top of v6.5.2. - - src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- - 1 file changed, 49 insertions(+), 24 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 067191d816..a8b2fc894e 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,17 +51,41 @@ typedef QHash QTzTimeZoneHash; - - static bool isTzFile(const QString &name); - -+// Open a named file under the zone info directory: -+static bool openZoneInfo(QString name, QFile *file) -+{ -+ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system -+ // default location for zone info: -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ if (!tzdir.isEmpty()) { -+ file->setFileName(QDir(tzdir).filePath(name)); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Try modern system path first: -+ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; -+ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Fall back to legacy system path: -+ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; -+ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ return false; -+} -+ - // Parse zone.tab table for territory information, read directories to ensure we - // find all installed zones (many are omitted from zone.tab; even more from - // zone1970.tab). - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -- if (!QFile::exists(path)) -- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -- -- QFile tzif(path); -- if (!tzif.open(QIODevice::ReadOnly)) -+ QFile tzif; -+ if (!openZoneInfo("zone.tab"_L1, &tzif)) - return QTzTimeZoneHash(); - - QTzTimeZoneHash zonesHash; -@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() - } - } - -+ const QString path = tzif.fileName(); - const qsizetype cut = path.lastIndexOf(u'/'); - Q_ASSERT(cut > 0); - const QDir zoneDir = QDir(path.first(cut)); -@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) - tzif.setFileName(QStringLiteral("/etc/localtime")); - if (!tzif.open(QIODevice::ReadOnly)) - return ret; -- } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- auto check = validatePosixRule(ianaId); -- if (check.isValid) { -- ret.m_hasDst = check.hasDst; -- ret.m_posixRule = ianaId; -- } -- return ret; -- } -+ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ auto check = validatePosixRule(ianaId); -+ if (check.isValid) { -+ ret.m_hasDst = check.hasDst; -+ ret.m_posixRule = ianaId; -+ return ret; - } - } - -@@ -1317,7 +1335,8 @@ private: - { - // On most distros /etc/localtime is a symlink to a real file so extract - // name from the path -- const auto zoneinfo = "/zoneinfo/"_L1; -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ constexpr auto zoneinfo = "/zoneinfo/"_L1; - QString path = QStringLiteral("/etc/localtime"); - long iteration = getSymloopMax(); - // Symlink may point to another symlink etc. before being under zoneinfo/ -@@ -1325,9 +1344,15 @@ private: - // symlink, like America/Montreal pointing to America/Toronto - do { - path = QFile::symLinkTarget(path); -- int index = path.indexOf(zoneinfo); -- if (index >= 0) // Found zoneinfo file; extract zone name from path: -- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); -+ // If it's a zoneinfo file, extract the zone name from its path: -+ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); -+ if (index >= 0) { -+ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); -+ return tail.startsWith(u'/') ? tail.sliced(1) : tail; -+ } -+ index = path.indexOf(zoneinfo); -+ if (index >= 0) -+ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); - } while (!path.isEmpty() && --iteration > 0); - - return QByteArray(); - -base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 --- -2.41.0 - diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index 5f06ec53b4..df76fab910 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -1,16 +1,31 @@ Retrieved from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..a4f6d34a42 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -67,6 +67,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages crypto) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -654,27 +655,28 @@ (define-public qtbase (package (inherit qtbase-5) (name "qtbase") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) + "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(with-directory-excursion "src/3rdparty" (for-each delete-file-recursively - ;; The bundled pcre2 copy is kept, as its headers - ;; are required by some internal bootstrap target - ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" + "pcre2" "md4c" "libpng" "libjpeg" + "sqlite" "xcb" "zlib")))) + (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" - "qtbase-qmake-use-libname.patch")))) + "qtbase-qmake-use-libname.patch" + "qtbase-find-tools-in-PATH.patch" + "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch" + "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch" + "qtbase-check-in-the-QML-folder-of-this-library-does-.patch")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) @@ -749,7 +751,8 @@ (define-public qtbase (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) (substitute* '("mkspecs/features/qt_functions.prf" - "qmake/library/qmakebuiltins.cpp") + "qmake/library/qmakebuiltins.cpp" + "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp") (("/bin/sh") (search-input-file inputs "bin/bash"))) (substitute* "src/corelib/CMakeLists.txt" @@ -814,6 +817,16 @@ (define-public qtbase (string-join (append (list + ;; with expansion: + ;; false + ;; with messages: + ;; test := "keyboard" + ;; arguments := QList("-o", "-,tap") + ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8. + ;; Qt depends on a UTF-8 locale, but has failed to switch to one. + ;; If this causes problems, reconfigure your locale. See the locale(1) manual + ;; for more information. + "tst_selftests" ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". "tst_moc" @@ -984,6 +997,7 @@ (define-public qtbase bash-minimal coreutils-minimal md4c + libb2 libice libsm libxcb @@ -1074,13 +1088,13 @@ (define-public qt3d-5 (define-public qt5compat (package (name "qt5compat") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr")))) + "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0")))) (build-system cmake-build-system) (arguments (list @@ -1172,13 +1186,13 @@ (define-public qtsvg-5 (define-public qtsvg (package (name "qtsvg") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28")))) + "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss")))) (build-system cmake-build-system) (arguments (list @@ -1231,14 +1245,14 @@ (define-public qtimageformats-5 (define-public qtimageformats (package (name "qtimageformats") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtimageformats-5)) (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a")))) + "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i")))) (build-system cmake-build-system) (arguments (list @@ -1406,14 +1420,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.5.2") + (version "6.6.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (outputs '("out" "debug")) (build-system cmake-build-system) @@ -1483,6 +1497,8 @@ (define-public qtdeclarative "(" (string-join (list + ;; FIXME + "tst_qquickiconimage" ;; This test is marked as flaky upstream (see: ;; https://bugreports.qt.io/browse/QTBUG-101488). "tst_qquickfiledialogimpl" @@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5 (define-public qtwebsockets (package (name "qtwebsockets") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0")))) + "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0")))) (build-system cmake-build-system) (arguments (list @@ -1636,6 +1652,25 @@ (define-public qtwebsockets (license (package-license qtbase)))) (define-public qtsensors + (package + (inherit qtsvg) + (name "qtsensors") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa")))) + (native-inputs + (list qtdeclarative)) + (inputs (list qtbase)) + (synopsis "Qt Sensors module") + (description "The Qt Sensors API provides access to sensor hardware via QML +and C++ interfaces. The Qt Sensors API also provides a motion gesture +recognition API for devices."))) + +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5 (define-public qtshadertools (package (name "qtshadertools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1723,7 +1758,7 @@ (define-public qtshadertools ;; sources. (sha256 (base32 - "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya")))) + "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2")))) (build-system cmake-build-system) (arguments (list @@ -1744,13 +1779,13 @@ (define-public qtshadertools (define-public qtmultimedia (package (name "qtmultimedia") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl")) + "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572")) (modules '((guix build utils))) (snippet '(begin @@ -1775,7 +1810,10 @@ (define-public qtmultimedia ;; session bus, which requires an X11 server, and then is still ;; unhappy). (substitute* "tests/auto/CMakeLists.txt" - (("add_subdirectory\\(integration)") "")))) + (("add_subdirectory\\(integration)") "")) + ;; fail on offscreen rendering + (substitute* "tests/auto/unit/multimedia/CMakeLists.txt" + (("add_subdirectory\\(qvideoframecolormanagement\\)") "")))) (add-before 'check 'prepare-for-tests (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen"))) @@ -1865,13 +1903,13 @@ (define-public qtwayland-5 (define-public qtwayland (package (name "qtwayland") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 - (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h")))) + (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") @@ -1888,6 +1926,7 @@ (define-public qtwayland (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) (add-before 'check 'set-test-environment (lambda _ + (setenv "XDG_RUNTIME_DIR" (getcwd)) ;; Do not fail just because /etc/machine-id is missing. (setenv "DBUS_FATAL_WARNINGS" "0") ;; Make Qt render "offscreen", required for tests. @@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5 (define-public qtwebchannel (package (name "qtwebchannel") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261")))) + "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x")))) (build-system cmake-build-system) (arguments (list @@ -2080,13 +2119,13 @@ (define-public qtwebview (define-public qtlanguageserver (package (name "qtlanguageserver") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk")))) + "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2129,13 +2168,13 @@ (define-public qtlocation (define-public qtlottie (package (name "qtlottie") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0")))) + "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7")))) (build-system cmake-build-system) (arguments (list @@ -2193,13 +2232,13 @@ (define-public qttools-5 (define-public qttools (package (name "qttools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm")))) + "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76")))) (build-system cmake-build-system) (arguments (list @@ -2220,7 +2259,7 @@ (define-public qttools (native-inputs (list perl qtdeclarative vulkan-headers)) ;; Use clang-15, which is built using as a single shared library, which is ;; what the build system of qttools expects. - (inputs (list clang-15 libxkbcommon mesa qtbase)) + (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib"))) (home-page (package-home-page qtbase)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse @@ -2233,13 +2272,13 @@ (define-public qttools (define-public qttranslations (package (name "qttranslations") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k")))) + "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list qtbase qttools)) @@ -2391,13 +2430,13 @@ (define-public qtscxml (define-public qtpositioning (package (name "qtpositioning") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh")))) + "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd")))) (build-system cmake-build-system) (arguments (list @@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5 (define-public qtnetworkauth (package (name "qtnetworkauth") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f")))) + "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) (native-inputs (list perl)) @@ -2524,13 +2563,13 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (name "qtremoteobjects") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60")))) + "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa")))) (build-system cmake-build-system) (arguments (list @@ -2558,7 +2597,7 @@ (define-public qtremoteobjects (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtspeech +(define-public qtspeech-5 (package (inherit qtsvg-5) (name "qtspeech") @@ -2583,6 +2622,38 @@ (define-public qtspeech In such a scenario, the messaging application can read out the incoming message."))) +(define-public qtspeech + (package + (inherit qtspeech-5) + (name "qtspeech") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0")))) + (build-system qt-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'prepare-for-tests + (lambda* (#:key outputs #:allow-other-keys) + (setenv "QML2_IMPORT_PATH" + (string-append (assoc-ref outputs "out") + "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs '()) + (propagated-inputs (list qtmultimedia)) + (inputs (list qtbase qtdeclarative)))) + (define-public qtvirtualkeyboard-5 (package (inherit qtsvg-5) @@ -3042,14 +3113,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) @@ -3081,12 +3152,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" @@ -3118,8 +3188,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" @@ -3130,11 +3198,17 @@ (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" @@ -3177,7 +3251,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" @@ -3196,6 +3269,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 @@ -3215,6 +3289,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" @@ -3222,7 +3297,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 @@ -3292,6 +3366,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" @@ -3359,14 +3434,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 @@ -3416,7 +3494,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") @@ -3684,7 +3766,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4498,8 +4580,8 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors - qtspeech + qtsensors-5 + qtspeech-5 qtsvg-5 qttools-5 qtwebchannel-5 @@ -5086,7 +5168,7 @@ (define-public clazy (define-public qt-creator (package (name "qt-creator") - (version "12.0.1") + (version "12.0.2") (source (origin (method url-fetch) (uri (string-append @@ -5109,7 +5191,7 @@ (define-public qt-creator ((".*marketplace/marketplace.qbs.*") "")))) (sha256 (base32 - "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb")))) + "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) (build-system qt-build-system) (arguments (list diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9c8225d22b..938b786ae2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2671,7 +2671,7 @@ (define-public sdrangel qtmultimedia-5 qtquickcontrols2-5 qtserialport - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtwebsockets-5 base-commit: b0b988c41c9e0e591274495a1b2d6f27fcdae15a -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 11 06:53:35 2024 Received: (at 69628) by debbugs.gnu.org; 11 Mar 2024 10:53:35 +0000 Received: from localhost ([127.0.0.1]:38948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjdHg-00029V-Hc for submit@debbugs.gnu.org; Mon, 11 Mar 2024 06:53:34 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:48138 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjdHa-00029A-0Z for 69628@debbugs.gnu.org; Mon, 11 Mar 2024 06:53:31 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAHKKly4u5lwoh6BQ--.23278S2; Mon, 11 Mar 2024 18:52:35 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH v3] gnu: qt: Update to 6.6.2. Date: Mon, 11 Mar 2024 18:52:30 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Andreas Enge , Eric Bavier , Liliana Marie Prikler , Maxim Cournoyer , Sharlatan Hellseher , 宋文武 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAHKKly4u5lwoh6BQ--.23278S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I 6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Cr 1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth, qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools, qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland, qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qtwebengine): Update to 6.6.2. (qt-creator): Update to 12.0.2. (qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add qtbase-find-tools-in-PATH.patch, qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, qtbase-check-in-the-QML-folder-of-this-library-does-.patch. (qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test. (qtbase)[inputs]: add libb2. (qttools)[inputs]: add zstd:lib. (qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase. (qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase. (qtwebengine)[source]: Adjust snippet. [arguments]<#:configure-flags>: Adjust it. <#:phases>: Add delete-installed-tests phase. * gnu/packages/patches/qtbase-use-TZDIR.patch: remove this. * gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file * gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file * gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file * gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it. * gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch. Regist qtbase-find-tools-in-PATH.patch, qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, qtbase-check-in-the-QML-folder-of-this-library-does-.patch. gnu: Add qtspeech-5. * gnu/packages/qt.scm(qtspeech-5): New Variable. (python-pyside-2): * gnu/packages/games.scm (chessx): * gnu/packages/kde-frameworks.scm(ktextwidgets): * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit): * gnu/packages/kde-utils.scm(kmouth): * gnu/packages/kde.scm(okular): * gnu/packages/radio.scm(sdrangel): Adjust inputs. gnu: Add qtsensors-5. * gnu/packages/qt.scm(qtspeech-5): New Variable. (python-pyqt,python-pyside-2): * gnu/packages/education.scm(gcompris-qt): * gnu/packages/kde-plasma.scm(kscreen): * gnu/packages/geo.scm(openorienteering-mapper): Adjust inputs. Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9 --- gnu/local.mk | 5 +- gnu/packages/education.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-pim.scm | 4 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 2 +- ...the-QML-folder-of-this-library-does-.patch | 35 +++ .../patches/qtbase-find-tools-in-PATH.patch | 45 ++++ ...mlimportscanner-the-QML2_IMPORT_PATH.patch | 30 +++ ...x-includedir-in-generated-pkg-config.patch | 26 +++ gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ------------ .../qtdeclarative-disable-qmlcache.patch | 27 ++- gnu/packages/qt.scm | 210 ++++++++++++------ gnu/packages/radio.scm | 2 +- 17 files changed, 317 insertions(+), 222 deletions(-) create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1aa413ebbe..3741cb9cd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1951,10 +1951,13 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-fix-agent-paths.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ + %D%/packages/patches/qtbase-find-tools-in-PATH.patch \ + %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \ + %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \ + %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ %D%/packages/patches/qtbase-5-use-TZDIR.patch \ - %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..50d4b332ee 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ff08e5e74..fdc2d53a77 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10475,7 +10475,7 @@ (define-public chessx (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..63e66afdb8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..227f9a28b1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3249,7 +3249,7 @@ (define-public ktextwidgets kwidgetsaddons kwindowsystem qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e95eac4e2f..9a1c0b8d8e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,7 +848,7 @@ (define-public kdepim-runtime qtdeclarative-5 qtkeychain qtnetworkauth-5 - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtxmlpatterns)) @@ -1993,7 +1993,7 @@ (define-public kpimtextedit kwidgetsaddons kxmlgui qtbase-5 - qtspeech + qtspeech-5 sonnet)) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..6c6a669597 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -874,7 +874,7 @@ (define-public kmouth kxmlgui breeze-icons ;; default icon set qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8e8bb32fda..385bb42926 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1557,7 +1557,7 @@ (define-public okular kio kparts kpty - qtspeech + qtspeech-5 kwallet kwindowsystem libkexiv2 diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch new file mode 100644 index 0000000000..ed749cb238 --- /dev/null +++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -0,0 +1,35 @@ +From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:17:00 -0400 +Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does + actually exist + +In a modularized installation, this folder will be the location where +`qtbase` itself is installed, but `qtbase` does not have any QML +code, and `qmlimportscanner` will complain that it does not exist. +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 320095a972d..87ba0d4e24b 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + } + for (const QString &importPath : qmlImportPaths) + argumentList << "-importPath" << importPath; ++ + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); +- argumentList.append( "-importPath"); +- argumentList.append(qmlImportsPath); ++ if (QFile::exists(qmlImportsPath)) { ++ argumentList.append( "-importPath"); ++ argumentList.append(qmlImportsPath); ++ } + + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch new file mode 100644 index 0000000000..1d60684e07 --- /dev/null +++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch @@ -0,0 +1,45 @@ +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 29 Mar 2023 11:51:33 +0800 +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH + +1. find qt's tools in `QTTOOLSPATH` env + qt assumes that all components use the same install prefix + we can't get the real prefix for qttools when build qtbase + we will add /libexec to `QTTOOLSPATH` in qtToolsHook + find_path will also search in 'PATH' by default + see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` + +2. disable tool_dependencies_enabled + We can guarantee the build order of qt components in nixpkgs + tools in qttools always build before qtdoc + qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` +--- + cmake/QtDocsHelpers.cmake | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake +index 48ed5a324bf..91d8d41fb1f 100644 +--- a/cmake/QtDocsHelpers.cmake ++++ b/cmake/QtDocsHelpers.cmake +@@ -47,9 +47,14 @@ function(qt_internal_add_docs) + set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") + endif() + +- set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") +- set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") +- set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") ++ set(tool_dependencies_enabled FALSE) ++ ++ find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH) ++ find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH) ++ find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH) ++ set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") + + get_target_property(target_type ${target} TYPE) + if (NOT target_type STREQUAL "INTERFACE_LIBRARY") +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch new file mode 100644 index 0000000000..7bf2193bc2 --- /dev/null +++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -0,0 +1,30 @@ +From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:12:56 -0400 +Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH + +--- + src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp +index 2ae4f998944..ba10ae02bcd 100644 +--- a/src/tools/macdeployqt/shared/shared.cpp ++++ b/src/tools/macdeployqt/shared/shared.cpp +@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + argumentList.append( "-importPath"); + argumentList.append(qmlImportsPath); + ++ // In a modularized installation of qt as we have in Nix, instead, we will ++ // read the paths from the environment, as they are spread in multiple ++ // locations and normally set in the environment like this ++ auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':'); ++ for (const QString &importPath : envQmlImportPaths) ++ argumentList << "-importPath" << importPath; ++ + // run qmlimportscanner + QProcess qmlImportScanner; + qmlImportScanner.start(qmlImportScannerPath, argumentList); +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch new file mode 100644 index 0000000000..53f226254a --- /dev/null +++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -0,0 +1,26 @@ +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Fri, 14 Apr 2023 09:34:46 +0800 +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config + +--- + qmake/generators/makefile.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +index 11d2f0ff7df..c78ed0d3485 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() + << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") + // << varGlue("DEFINES","-D"," -D"," ") + ; +- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) +- t << "-I${includedir}"; ++ t << "-I${includedir}"; + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") + && libDir != QLatin1String("/Library/Frameworks")) { + t << " -F${libdir}"; +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch deleted file mode 100644 index 98bf7493e9..0000000000 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 -From: Edward Welbourne -Date: Mon, 11 Sep 2023 11:41:39 +0200 -Subject: [PATCH] Support the TZDIR environment variable - -On Linux / glibc, this overrides the default system location for the -zone info. So check for files there first. Break out a function to -manage the trying of (now three) zoneinfo directories when opening a -file by name relative to there. - -Pick-to: 6.6 6.5 -Task-number: QTBUG-116017 -Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 ---- -* Rebased on top of v6.5.2. - - src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- - 1 file changed, 49 insertions(+), 24 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 067191d816..a8b2fc894e 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,17 +51,41 @@ typedef QHash QTzTimeZoneHash; - - static bool isTzFile(const QString &name); - -+// Open a named file under the zone info directory: -+static bool openZoneInfo(QString name, QFile *file) -+{ -+ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system -+ // default location for zone info: -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ if (!tzdir.isEmpty()) { -+ file->setFileName(QDir(tzdir).filePath(name)); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Try modern system path first: -+ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; -+ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Fall back to legacy system path: -+ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; -+ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ return false; -+} -+ - // Parse zone.tab table for territory information, read directories to ensure we - // find all installed zones (many are omitted from zone.tab; even more from - // zone1970.tab). - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -- if (!QFile::exists(path)) -- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -- -- QFile tzif(path); -- if (!tzif.open(QIODevice::ReadOnly)) -+ QFile tzif; -+ if (!openZoneInfo("zone.tab"_L1, &tzif)) - return QTzTimeZoneHash(); - - QTzTimeZoneHash zonesHash; -@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() - } - } - -+ const QString path = tzif.fileName(); - const qsizetype cut = path.lastIndexOf(u'/'); - Q_ASSERT(cut > 0); - const QDir zoneDir = QDir(path.first(cut)); -@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) - tzif.setFileName(QStringLiteral("/etc/localtime")); - if (!tzif.open(QIODevice::ReadOnly)) - return ret; -- } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- auto check = validatePosixRule(ianaId); -- if (check.isValid) { -- ret.m_hasDst = check.hasDst; -- ret.m_posixRule = ianaId; -- } -- return ret; -- } -+ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ auto check = validatePosixRule(ianaId); -+ if (check.isValid) { -+ ret.m_hasDst = check.hasDst; -+ ret.m_posixRule = ianaId; -+ return ret; - } - } - -@@ -1317,7 +1335,8 @@ private: - { - // On most distros /etc/localtime is a symlink to a real file so extract - // name from the path -- const auto zoneinfo = "/zoneinfo/"_L1; -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ constexpr auto zoneinfo = "/zoneinfo/"_L1; - QString path = QStringLiteral("/etc/localtime"); - long iteration = getSymloopMax(); - // Symlink may point to another symlink etc. before being under zoneinfo/ -@@ -1325,9 +1344,15 @@ private: - // symlink, like America/Montreal pointing to America/Toronto - do { - path = QFile::symLinkTarget(path); -- int index = path.indexOf(zoneinfo); -- if (index >= 0) // Found zoneinfo file; extract zone name from path: -- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); -+ // If it's a zoneinfo file, extract the zone name from its path: -+ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); -+ if (index >= 0) { -+ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); -+ return tail.startsWith(u'/') ? tail.sliced(1) : tail; -+ } -+ index = path.indexOf(zoneinfo); -+ if (index >= 0) -+ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); - } while (!path.isEmpty() && --iteration > 0); - - return QByteArray(); - -base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 --- -2.41.0 - diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index 5f06ec53b4..df76fab910 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -1,16 +1,31 @@ Retrieved from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..9e6131f585 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Yash Tiwari ;;; Copyright © 2023 Sharlatan Hellseher -;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Herman Rimm ;;; ;;; This file is part of GNU Guix. @@ -67,6 +67,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages crypto) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -654,27 +655,28 @@ (define-public qtbase (package (inherit qtbase-5) (name "qtbase") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) + "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(with-directory-excursion "src/3rdparty" (for-each delete-file-recursively - ;; The bundled pcre2 copy is kept, as its headers - ;; are required by some internal bootstrap target - ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" + "pcre2" "md4c" "libpng" "libjpeg" + "sqlite" "xcb" "zlib")))) + (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" - "qtbase-qmake-use-libname.patch")))) + "qtbase-qmake-use-libname.patch" + "qtbase-find-tools-in-PATH.patch" + "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch" + "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch" + "qtbase-check-in-the-QML-folder-of-this-library-does-.patch")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) @@ -749,7 +751,8 @@ (define-public qtbase (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) (substitute* '("mkspecs/features/qt_functions.prf" - "qmake/library/qmakebuiltins.cpp") + "qmake/library/qmakebuiltins.cpp" + "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp") (("/bin/sh") (search-input-file inputs "bin/bash"))) (substitute* "src/corelib/CMakeLists.txt" @@ -814,6 +817,16 @@ (define-public qtbase (string-join (append (list + ;; with expansion: + ;; false + ;; with messages: + ;; test := "keyboard" + ;; arguments := QList("-o", "-,tap") + ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8. + ;; Qt depends on a UTF-8 locale, but has failed to switch to one. + ;; If this causes problems, reconfigure your locale. See the locale(1) manual + ;; for more information. + "tst_selftests" ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". "tst_moc" @@ -984,6 +997,7 @@ (define-public qtbase bash-minimal coreutils-minimal md4c + libb2 libice libsm libxcb @@ -1074,13 +1088,13 @@ (define-public qt3d-5 (define-public qt5compat (package (name "qt5compat") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr")))) + "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0")))) (build-system cmake-build-system) (arguments (list @@ -1172,13 +1186,13 @@ (define-public qtsvg-5 (define-public qtsvg (package (name "qtsvg") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28")))) + "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss")))) (build-system cmake-build-system) (arguments (list @@ -1231,14 +1245,14 @@ (define-public qtimageformats-5 (define-public qtimageformats (package (name "qtimageformats") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtimageformats-5)) (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a")))) + "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i")))) (build-system cmake-build-system) (arguments (list @@ -1406,14 +1420,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.5.2") + (version "6.6.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (outputs '("out" "debug")) (build-system cmake-build-system) @@ -1483,6 +1497,8 @@ (define-public qtdeclarative "(" (string-join (list + ;; FIXME + "tst_qquickiconimage" ;; This test is marked as flaky upstream (see: ;; https://bugreports.qt.io/browse/QTBUG-101488). "tst_qquickfiledialogimpl" @@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5 (define-public qtwebsockets (package (name "qtwebsockets") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0")))) + "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0")))) (build-system cmake-build-system) (arguments (list @@ -1636,6 +1652,25 @@ (define-public qtwebsockets (license (package-license qtbase)))) (define-public qtsensors + (package + (inherit qtsvg) + (name "qtsensors") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa")))) + (native-inputs + (list qtdeclarative)) + (inputs (list qtbase)) + (synopsis "Qt Sensors module") + (description "The Qt Sensors API provides access to sensor hardware via QML +and C++ interfaces. The Qt Sensors API also provides a motion gesture +recognition API for devices."))) + +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5 (define-public qtshadertools (package (name "qtshadertools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1723,7 +1758,7 @@ (define-public qtshadertools ;; sources. (sha256 (base32 - "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya")))) + "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2")))) (build-system cmake-build-system) (arguments (list @@ -1744,13 +1779,13 @@ (define-public qtshadertools (define-public qtmultimedia (package (name "qtmultimedia") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl")) + "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572")) (modules '((guix build utils))) (snippet '(begin @@ -1775,7 +1810,10 @@ (define-public qtmultimedia ;; session bus, which requires an X11 server, and then is still ;; unhappy). (substitute* "tests/auto/CMakeLists.txt" - (("add_subdirectory\\(integration)") "")))) + (("add_subdirectory\\(integration)") "")) + ;; fail on offscreen rendering + (substitute* "tests/auto/unit/multimedia/CMakeLists.txt" + (("add_subdirectory\\(qvideoframecolormanagement\\)") "")))) (add-before 'check 'prepare-for-tests (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen"))) @@ -1865,13 +1903,13 @@ (define-public qtwayland-5 (define-public qtwayland (package (name "qtwayland") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 - (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h")))) + (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") @@ -1888,6 +1926,7 @@ (define-public qtwayland (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) (add-before 'check 'set-test-environment (lambda _ + (setenv "XDG_RUNTIME_DIR" (getcwd)) ;; Do not fail just because /etc/machine-id is missing. (setenv "DBUS_FATAL_WARNINGS" "0") ;; Make Qt render "offscreen", required for tests. @@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5 (define-public qtwebchannel (package (name "qtwebchannel") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261")))) + "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x")))) (build-system cmake-build-system) (arguments (list @@ -2080,13 +2119,13 @@ (define-public qtwebview (define-public qtlanguageserver (package (name "qtlanguageserver") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk")))) + "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2129,13 +2168,13 @@ (define-public qtlocation (define-public qtlottie (package (name "qtlottie") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0")))) + "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7")))) (build-system cmake-build-system) (arguments (list @@ -2193,13 +2232,13 @@ (define-public qttools-5 (define-public qttools (package (name "qttools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm")))) + "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76")))) (build-system cmake-build-system) (arguments (list @@ -2220,7 +2259,7 @@ (define-public qttools (native-inputs (list perl qtdeclarative vulkan-headers)) ;; Use clang-15, which is built using as a single shared library, which is ;; what the build system of qttools expects. - (inputs (list clang-15 libxkbcommon mesa qtbase)) + (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib"))) (home-page (package-home-page qtbase)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse @@ -2233,13 +2272,13 @@ (define-public qttools (define-public qttranslations (package (name "qttranslations") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k")))) + "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list qtbase qttools)) @@ -2391,13 +2430,13 @@ (define-public qtscxml (define-public qtpositioning (package (name "qtpositioning") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh")))) + "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd")))) (build-system cmake-build-system) (arguments (list @@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5 (define-public qtnetworkauth (package (name "qtnetworkauth") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f")))) + "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) (native-inputs (list perl)) @@ -2524,13 +2563,13 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (name "qtremoteobjects") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60")))) + "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa")))) (build-system cmake-build-system) (arguments (list @@ -2558,7 +2597,7 @@ (define-public qtremoteobjects (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtspeech +(define-public qtspeech-5 (package (inherit qtsvg-5) (name "qtspeech") @@ -2583,6 +2622,38 @@ (define-public qtspeech In such a scenario, the messaging application can read out the incoming message."))) +(define-public qtspeech + (package + (inherit qtspeech-5) + (name "qtspeech") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0")))) + (build-system qt-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'prepare-for-tests + (lambda* (#:key outputs #:allow-other-keys) + (setenv "QML2_IMPORT_PATH" + (string-append (assoc-ref outputs "out") + "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs '()) + (propagated-inputs (list qtmultimedia)) + (inputs (list qtbase qtdeclarative)))) + (define-public qtvirtualkeyboard-5 (package (inherit qtsvg-5) @@ -3042,14 +3113,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) @@ -3081,12 +3152,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" @@ -3118,8 +3188,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" @@ -3130,11 +3198,17 @@ (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" @@ -3177,7 +3251,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" @@ -3196,6 +3269,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 @@ -3215,6 +3289,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" @@ -3222,7 +3297,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 @@ -3292,6 +3366,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" @@ -3359,14 +3434,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 @@ -3416,7 +3494,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") @@ -3684,7 +3766,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4498,8 +4580,8 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors - qtspeech + qtsensors-5 + qtspeech-5 qtsvg-5 qttools-5 qtwebchannel-5 @@ -5086,7 +5168,7 @@ (define-public clazy (define-public qt-creator (package (name "qt-creator") - (version "12.0.1") + (version "12.0.2") (source (origin (method url-fetch) (uri (string-append @@ -5109,7 +5191,7 @@ (define-public qt-creator ((".*marketplace/marketplace.qbs.*") "")))) (sha256 (base32 - "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb")))) + "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) (build-system qt-build-system) (arguments (list diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9c8225d22b..938b786ae2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2671,7 +2671,7 @@ (define-public sdrangel qtmultimedia-5 qtquickcontrols2-5 qtserialport - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtwebsockets-5 base-commit: b0b988c41c9e0e591274495a1b2d6f27fcdae15a -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 12 10:46:50 2024 Received: (at 69628) by debbugs.gnu.org; 12 Mar 2024 14:46:50 +0000 Received: from localhost ([127.0.0.1]:43361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk3Ox-0002i8-OR for submit@debbugs.gnu.org; Tue, 12 Mar 2024 10:46:50 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:54393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk3Os-0002hh-7n for 69628@debbugs.gnu.org; Tue, 12 Mar 2024 10:46:46 -0400 Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-42eb3decd37so26336771cf.0 for <69628@debbugs.gnu.org>; Tue, 12 Mar 2024 07:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710254702; x=1710859502; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XilVwfooaeJ8Dyul9PJEzOMYbaNYwQw4/V70wlYZL3A=; b=GSzmcMAj2ueO9RR7v5AiZzDUlJxsOjC0mKTTLhlHOayinv+iaSjwtK7GeHrwaGkXta 6RfgtMOS5jEjDglHbSsY94ycjDZfrHM49nxTUc68PKc6ld5AMkTyyOj6wMb+y2ztK81v CG/0fg9Z2DVUd23prVyO9x0xhYGEl4dJMIpBL22Tvag3miNDx0EOphyFzckjBrDevyAJ j2UOAm/kL2F5dfGf5/hg5fh3hlEj/fWqiJ4XosD+qsV86N1PMVcBBMvfCer0VqdtWn5d I7fmagf/PMah9J2aMbwUuZdqrrqkqfHRoaapoRPLiWSBanXmNltDfdZSX7WKcr75yBzZ BYRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710254702; x=1710859502; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XilVwfooaeJ8Dyul9PJEzOMYbaNYwQw4/V70wlYZL3A=; b=Pg2rYz63cmUIuMdnhq4dOQ1KDAE6EFkUZP2T0PsDdTV3U5+PirFW42mbj/yvfcDTEp ZOirdARPs7h7ThipGISwQuiwngWyRObqgPgNPN4Iqfr7yprb5rAczj23YF9ixofHmzHr dtHjZZe6fsyPG9SmfjF3C1xbrcD8PzqIHCNkD9Z3iK4scHW1sjqqAbffgqrP3QeEeF3r G8brN9zSZOT2E97cqJO+/jiK5+9sN5Usgi2HuIATYq444tAI4R3YyBScj5DTwEk2avhY UR1XAIk/EuH/2sJ6MgXwPPBChI82qL0gl4VeYN1eRT93swOngs8BKfwsMGrVIgRU3/wx CyaA== X-Gm-Message-State: AOJu0YxN4qOHcJUePmdtEwR0mqwIshkC9AXZaSKMP3f2/5x5H7peDNNY 8mojiMWw+AHi1EpvUlapHFUcA234E2938yLqMsSifH+bCOprE/ty X-Google-Smtp-Source: AGHT+IGFSI4HiAnTWA9BOvogTgcWHteioPkRzY/mBWCzwzmqBe/wPttSOF/6MyGUPROqpPXIjezMhA== X-Received: by 2002:ac8:5dc7:0:b0:42f:ff7:9fcc with SMTP id e7-20020ac85dc7000000b0042f0ff79fccmr12827391qtx.43.1710254701279; Tue, 12 Mar 2024 07:45:01 -0700 (PDT) Received: from hurd (dsl-153-147.b2b2c.ca. [66.158.153.147]) by smtp.gmail.com with ESMTPSA id fu25-20020a05622a5d9900b0042f353a1fa8sm3762713qtb.18.2024.03.12.07.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 07:45:00 -0700 (PDT) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#69628] [PATCH v3] gnu: qt: Update to 6.6.2. In-Reply-To: (Zheng Junjie's message of "Mon, 11 Mar 2024 18:52:30 +0800") References: Date: Tue, 12 Mar 2024 10:44:53 -0400 Message-ID: <87sf0vbjbu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 69628 Cc: Sharlatan Hellseher , Adam Faiz , 69628@debbugs.gnu.org, Liliana Marie Prikler , =?utf-8?B?5a6L5paH5q2m?= , Andreas Enge , Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Hi Zheng, Thanks for this effort! One nitpick, which you can perhaps overlook for this time, to spare the effort of splitting everything, is that it's more customary to have one commit per package update. It's also the result you'll get if you use the following commands to do the update of Qt 6: --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix refresh -u -m etc/teams/qt/qt-manifest.scm ./etc/committer.scm --8<---------------cut here---------------end--------------->8--- Zheng Junjie writes: > * gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth, > qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools, > qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland, > qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qtwebengine): > Update to 6.6.2. nitpick: GNU ChangeLog (info '(standards) Style of Change Logs) says: Break long lists of function names by closing continued lines with `)', rather than `,', and opening the continuation with `(' as in this example: * keyboard.c (menu_bar_items, tool_bar_items) (Fexecute_extended_command): Deal with 'keymap' property. > (qt-creator): Update to 12.0.2. This could be definitely be in a separate commit. > (qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add > qtbase-find-tools-in-PATH.patch, > qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, > qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, > qtbase-check-in-the-QML-folder-of-this-library-does-.patch. > (qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test. nitpick: #:phaseS (plural); Adjust (capitalized). > (qtbase)[inputs]: add libb2. > (qttools)[inputs]: add zstd:lib. > (qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase. > (qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase. Please punctuate change logs (e.g.: "Add lib2." instead of "add libb2.") > (qtwebengine)[source]: Adjust snippet. > [arguments]<#:configure-flags>: Adjust it. > <#:phases>: Add delete-installed-tests phase. > > * gnu/packages/patches/qtbase-use-TZDIR.patch: remove this. > * gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file > * gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file > * gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file > * gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file > * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it. Another nitpick (sorry, apparently I'm a nitpicky reviewer :-)). These patches file names are a bit on the long side. It's OK to capture just the essentials, like 'qtbase-qmlimportscanner-fix.patch. There used to be a hard limit of patch file names length; I think 'guix lint' checks them now. Also, 'qtbase-check-in-the-QML-folder-of-this-library-does-.patch' is a long but non-descriptive file name (it appears truncated). > * gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch. > Regist qtbase-find-tools-in-PATH.patch, RegistER > qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch, > qtbase-qmake-fix-includedir-in-generated-pkg-config.patch, > qtbase-check-in-the-QML-folder-of-this-library-does-.patch. > > gnu: Add qtspeech-5. > * gnu/packages/qt.scm(qtspeech-5): New Variable. > (python-pyside-2): > * gnu/packages/games.scm (chessx): > * gnu/packages/kde-frameworks.scm(ktextwidgets): > * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit): > * gnu/packages/kde-utils.scm(kmouth): > * gnu/packages/kde.scm(okular): > * gnu/packages/radio.scm(sdrangel)xb The above should go to its own commit. There should be a space between the file name and the opening parens. There does not need to be trailing colon (:) when there's no message. > Adjust inputs. > > gnu: Add qtsensors-5. > * gnu/packages/qt.scm(qtspeech-5): New Variable. > (python-pyqt,python-pyside-2): > * gnu/packages/education.scm(gcompris-qt): > * gnu/packages/kde-plasma.scm(kscreen): > * gnu/packages/geo.scm(openorienteering-mapper): > Adjust inputs. Same comment as above, and this change should go to its own commit as well. > Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9 > --- > gnu/local.mk | 5 +- > gnu/packages/education.scm | 2 +- > gnu/packages/games.scm | 2 +- > gnu/packages/geo.scm | 2 +- > gnu/packages/kde-frameworks.scm | 2 +- > gnu/packages/kde-pim.scm | 4 +- > gnu/packages/kde-plasma.scm | 2 +- > gnu/packages/kde-utils.scm | 2 +- > gnu/packages/kde.scm | 2 +- > ...the-QML-folder-of-this-library-does-.patch | 35 +++ > .../patches/qtbase-find-tools-in-PATH.patch | 45 ++++ > ...mlimportscanner-the-QML2_IMPORT_PATH.patch | 30 +++ > ...x-includedir-in-generated-pkg-config.patch | 26 +++ > gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ------------ > .../qtdeclarative-disable-qmlcache.patch | 27 ++- > gnu/packages/qt.scm | 210 ++++++++++++------ > gnu/packages/radio.scm | 2 +- > 17 files changed, 317 insertions(+), 222 deletions(-) > create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch > create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch > create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch > create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch > delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 1aa413ebbe..3741cb9cd5 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1951,10 +1951,13 @@ dist_patch_DATA = \ > %D%/packages/patches/qemu-fix-agent-paths.patch \ > %D%/packages/patches/qrcodegen-cpp-make-install.patch \ > %D%/packages/patches/qtbase-absolute-runpath.patch \ > + %D%/packages/patches/qtbase-find-tools-in-PATH.patch \ > + %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \ > + %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \ > + %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \ > %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ > %D%/packages/patches/qtbase-qmake-use-libname.patch \ > %D%/packages/patches/qtbase-5-use-TZDIR.patch \ > - %D%/packages/patches/qtbase-use-TZDIR.patch \ > %D%/packages/patches/qtscript-disable-tests.patch \ > %D%/packages/patches/quagga-reproducible-build.patch \ > %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ > diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm > index 698f15678b..50d4b332ee 100644 > --- a/gnu/packages/education.scm > +++ b/gnu/packages/education.scm > @@ -192,7 +192,7 @@ (define-public gcompris-qt > qtgraphicaleffects > qtmultimedia-5 > qtquickcontrols2-5 > - qtsensors > + qtsensors-5 > qtsvg-5)) > (home-page "https://gcompris.net/index-en.html") > (synopsis "Educational games for small children") > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index 9ff08e5e74..fdc2d53a77 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -10475,7 +10475,7 @@ (define-public chessx > (native-inputs > (list qttools-5)) > (inputs > - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) > + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) > (arguments > `(#:tests? #f > #:phases > diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm > index 687effcace..63e66afdb8 100644 > --- a/gnu/packages/geo.scm > +++ b/gnu/packages/geo.scm > @@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper > qtbase-5 > qtimageformats-5 > qtlocation > - qtsensors > + qtsensors-5 > zlib)) > (native-inputs > (list doxygen > diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm > index 64e41b510d..227f9a28b1 100644 > --- a/gnu/packages/kde-frameworks.scm > +++ b/gnu/packages/kde-frameworks.scm > @@ -3249,7 +3249,7 @@ (define-public ktextwidgets > kwidgetsaddons > kwindowsystem > qtbase-5 > - qtspeech)) > + qtspeech-5)) > (home-page "https://community.kde.org/Frameworks") > (synopsis "Text editing widgets") > (description "KTextWidgets provides widgets for displaying and editing text. > diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm > index e95eac4e2f..9a1c0b8d8e 100644 > --- a/gnu/packages/kde-pim.scm > +++ b/gnu/packages/kde-pim.scm > @@ -848,7 +848,7 @@ (define-public kdepim-runtime > qtdeclarative-5 > qtkeychain > qtnetworkauth-5 > - qtspeech > + qtspeech-5 > qtwebchannel-5 > qtwebengine-5 > qtxmlpatterns)) > @@ -1993,7 +1993,7 @@ (define-public kpimtextedit > kwidgetsaddons > kxmlgui > qtbase-5 > - qtspeech > + qtspeech-5 > sonnet)) > (arguments > `(#:tests? #f)) ;; TODO - test suite hangs > diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm > index cf45fa59f7..1d41d35a56 100644 > --- a/gnu/packages/kde-plasma.scm > +++ b/gnu/packages/kde-plasma.scm > @@ -793,7 +793,7 @@ (define-public kscreen > libkscreen > libxi > plasma-wayland-protocols > - qtsensors > + qtsensors-5 > qtbase-5 > qtx11extras > xcb-util)) > diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm > index 4e665da599..6c6a669597 100644 > --- a/gnu/packages/kde-utils.scm > +++ b/gnu/packages/kde-utils.scm > @@ -874,7 +874,7 @@ (define-public kmouth > kxmlgui > breeze-icons ;; default icon set > qtbase-5 > - qtspeech)) > + qtspeech-5)) > (home-page "https://apps.kde.org/kmouth/") > (synopsis "Type-and-say frontend for speech synthesizers") > (description "KMouth is a program which enables persons that cannot speak > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm > index 8e8bb32fda..385bb42926 100644 > --- a/gnu/packages/kde.scm > +++ b/gnu/packages/kde.scm > @@ -1557,7 +1557,7 @@ (define-public okular > kio > kparts > kpty > - qtspeech > + qtspeech-5 > kwallet > kwindowsystem > libkexiv2 > diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch > new file mode 100644 > index 0000000000..ed749cb238 > --- /dev/null > +++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch > @@ -0,0 +1,35 @@ > +From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 > +From: Nick Cao > +Date: Tue, 10 Oct 2023 10:17:00 -0400 > +Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does > + actually exist > + > +In a modularized installation, this folder will be the location where > +`qtbase` itself is installed, but `qtbase` does not have any QML > +code, and `qmlimportscanner` will complain that it does not exist. This looks like a useful patch, but where does it originate from? Has it already been committed to Qt, but not yet released? Was is taken from Nix? Something else? A link to where it was retrieved would help. > + src/tools/macdeployqt/shared/shared.cpp | 7 +++++-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp > +index 320095a972d..87ba0d4e24b 100644 > +--- a/src/tools/macdeployqt/shared/shared.cpp > ++++ b/src/tools/macdeployqt/shared/shared.cpp > +@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf > + } > + for (const QString &importPath : qmlImportPaths) > + argumentList << "-importPath" << importPath; > ++ > + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); > +- argumentList.append( "-importPath"); > +- argumentList.append(qmlImportsPath); > ++ if (QFile::exists(qmlImportsPath)) { > ++ argumentList.append( "-importPath"); > ++ argumentList.append(qmlImportsPath); > ++ } > + > + // In a modularized installation of qt as we have in Nix, instead, we will > + // read the paths from the environment, as they are spread in multiple This patches a file under the source tree 'macdeployqt'. Does Guix benefit from that? We don't support Mac, so it seems it shouldn't be useful to carry it. > diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch > new file mode 100644 > index 0000000000..1d60684e07 > --- /dev/null > +++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch > @@ -0,0 +1,45 @@ > +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 > +From: rewine > +Date: Wed, 29 Mar 2023 11:51:33 +0800 > +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH > + > +1. find qt's tools in `QTTOOLSPATH` env > + qt assumes that all components use the same install prefix > + we can't get the real prefix for qttools when build qtbase > + we will add /libexec to `QTTOOLSPATH` in qtToolsHook > + find_path will also search in 'PATH' by default > + see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` > + > +2. disable tool_dependencies_enabled > + We can guarantee the build order of qt components in nixpkgs > + tools in qttools always build before qtdoc > + qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` > +--- > + cmake/QtDocsHelpers.cmake | 11 ++++++++--- > + 1 file changed, 8 insertions(+), 3 deletions(-) > + > +diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake > +index 48ed5a324bf..91d8d41fb1f 100644 > +--- a/cmake/QtDocsHelpers.cmake > ++++ b/cmake/QtDocsHelpers.cmake > +@@ -47,9 +47,14 @@ function(qt_internal_add_docs) > + set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") > + endif() > + > +- set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") > +- set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") > +- set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") > ++ set(tool_dependencies_enabled FALSE) > ++ > ++ find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH) > ++ find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH) > ++ find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH) > ++ set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") > ++ set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") > ++ set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") > + > + get_target_property(target_type ${target} TYPE) > + if (NOT target_type STREQUAL "INTERFACE_LIBRARY") > +-- > +2.42.0 > + > diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch > new file mode 100644 > index 0000000000..7bf2193bc2 > --- /dev/null > +++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch > @@ -0,0 +1,30 @@ > +From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 > +From: Nick Cao > +Date: Tue, 10 Oct 2023 10:12:56 -0400 > +Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH > + > +--- > + src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ > + 1 file changed, 7 insertions(+) > + > +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp > +index 2ae4f998944..ba10ae02bcd 100644 > +--- a/src/tools/macdeployqt/shared/shared.cpp > ++++ b/src/tools/macdeployqt/shared/shared.cpp That's also probably useless for Guix (macdeployqt), unless 'mac' here has nothing to do with the fruit company computer. Did it fix an actual problem for you? [...] > diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch > new file mode 100644 > index 0000000000..53f226254a > --- /dev/null > +++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch > @@ -0,0 +1,26 @@ > +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 > +From: Nick Cao > +Date: Fri, 14 Apr 2023 09:34:46 +0800 > +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config > + > +--- > + qmake/generators/makefile.cpp | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp > +index 11d2f0ff7df..c78ed0d3485 100644 > +--- a/qmake/generators/makefile.cpp > ++++ b/qmake/generators/makefile.cpp > +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() > + << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") > + // << varGlue("DEFINES","-D"," -D"," ") > + ; > +- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) > +- t << "-I${includedir}"; > ++ t << "-I${includedir}"; > + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") > + && libDir != QLatin1String("/Library/Frameworks")) { > + t << " -F${libdir}"; [...] > diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch > index 5f06ec53b4..df76fab910 100644 > --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch > +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch > @@ -1,16 +1,31 @@ > Retrieved from > https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch > > +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 > +From: Nick Cao > +Date: Tue, 10 Oct 2023 11:12:27 -0400 > +Subject: [PATCH] qtdeclarative: disable qml disk cache > + > +--- > + src/qml/jsruntime/qv4engine.cpp | 6 +----- > + 1 file changed, 1 insertion(+), 5 deletions(-) > + > diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp > -index 852cde9e..165f1b57 100644 > +index d1b4c4fff6..50f8a07420 100644 > --- a/src/qml/jsruntime/qv4engine.cpp > +++ b/src/qml/jsruntime/qv4engine.cpp > -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul > - > - bool ExecutionEngine::diskCacheEnabled() const > +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const > { > -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); > > -+ return forceDiskCache(); > + if (forceDiskCache()) > + return DiskCache::Enabled; > +- if (disableDiskCache() || debugger()) > +- return DiskCache::Disabled; > +- static const DiskCacheOptions options = qmlGetConfigOption< > +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); > +- return options; > ++ return DiskCache::Disabled; > } > > void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, > +-- > +2.42.0 > > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm > index 9df49d7fb3..9e6131f585 100644 > --- a/gnu/packages/qt.scm > +++ b/gnu/packages/qt.scm > @@ -28,7 +28,7 @@ > ;;; Copyright © 2022 Petr Hodina > ;;; Copyright © 2022 Yash Tiwari > ;;; Copyright © 2023 Sharlatan Hellseher > -;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> > +;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> > ;;; Copyright © 2023 Herman Rimm > ;;; > ;;; This file is part of GNU Guix. > @@ -67,6 +67,7 @@ (define-module (gnu packages qt) > #:use-module (gnu packages bash) > #:use-module (gnu packages base) > #:use-module (gnu packages bison) > + #:use-module (gnu packages crypto) > #:use-module (gnu packages check) > #:use-module (gnu packages cmake) > #:use-module (gnu packages compression) > @@ -654,27 +655,28 @@ (define-public qtbase > (package > (inherit qtbase-5) > (name "qtbase") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (inherit (package-source qtbase-5)) > (uri (qt-url name version)) > (sha256 > (base32 > - "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) > + "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq")) > (modules '((guix build utils))) > (snippet > ;; corelib uses bundled harfbuzz, md4, md5, sha3 > '(with-directory-excursion "src/3rdparty" > (for-each delete-file-recursively > - ;; The bundled pcre2 copy is kept, as its headers > - ;; are required by some internal bootstrap target > - ;; used for the tools. > (list "double-conversion" "freetype" "harfbuzz-ng" > - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) > - (patches (search-patches "qtbase-use-TZDIR.patch" > - "qtbase-moc-ignore-gcc-macro.patch" > + "pcre2" "md4c" "libpng" "libjpeg" > + "sqlite" "xcb" "zlib")))) > + (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" > "qtbase-absolute-runpath.patch" > - "qtbase-qmake-use-libname.patch")))) > + "qtbase-qmake-use-libname.patch" > + "qtbase-find-tools-in-PATH.patch" > + "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch" > + "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch" > + "qtbase-check-in-the-QML-folder-of-this-library-does-.patch")))) To stick to the 80 chars limit, the '(origin ...' could be broken on its own line below '(source ...', same for '(patches (search-patches ...' > (build-system cmake-build-system) > (arguments > (substitute-keyword-arguments (package-arguments qtbase-5) > @@ -749,7 +751,8 @@ (define-public qtbase > (("\"xdg-open\"") > (format #f "~s" (search-input-file inputs "bin/xdg-open")))) > (substitute* '("mkspecs/features/qt_functions.prf" > - "qmake/library/qmakebuiltins.cpp") > + "qmake/library/qmakebuiltins.cpp" > + "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp") > (("/bin/sh") > (search-input-file inputs "bin/bash"))) The patching of the tests/... file should be in a different substitute* call which substitutes it to (which "bash"); this is because when cross compiling, native-inputs are not merged into inputs and thus bash wouldn't be found. > (substitute* "src/corelib/CMakeLists.txt" > @@ -814,6 +817,16 @@ (define-public qtbase > (string-join > (append > (list This would read better if you provided context, like so: "The 'tst_selftests' fails with the following error: " > + ;; with expansion: > + ;; false > + ;; with messages: > + ;; test := "keyboard" > + ;; arguments := QList("-o", "-,tap") > + ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8. > + ;; Qt depends on a UTF-8 locale, but has failed to switch to one. > + ;; If this causes problems, reconfigure your locale. See the locale(1) manual > + ;; for more information. > + "tst_selftests" This issue was reported here: , and it seems to have to do with the environment lacking UTF-8 locale data in its environment. I suspect this may not happen anymore on core-updates, where a C.UTF-8 locale is always made available by glibc, but in the meantime, have you checked if adding the 'glibc-utf8-locales' package to its native-inputs helped? > ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". > "tst_moc" > > @@ -984,6 +997,7 @@ (define-public qtbase > bash-minimal > coreutils-minimal > md4c > + libb2 > libice > libsm > libxcb > @@ -1074,13 +1088,13 @@ (define-public qt3d-5 > (define-public qt5compat > (package > (name "qt5compat") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr")))) > + "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0")))) > (build-system cmake-build-system) > (arguments > (list > @@ -1172,13 +1186,13 @@ (define-public qtsvg-5 > (define-public qtsvg > (package > (name "qtsvg") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28")))) > + "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss")))) > (build-system cmake-build-system) > (arguments > (list > @@ -1231,14 +1245,14 @@ (define-public qtimageformats-5 > (define-public qtimageformats > (package > (name "qtimageformats") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (inherit (package-source qtimageformats-5)) > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a")))) > + "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i")))) > (build-system cmake-build-system) > (arguments > (list > @@ -1406,14 +1420,14 @@ (define-public qtdeclarative-5 > (define-public qtdeclarative > (package > (name "qtdeclarative") > - (version "6.5.2") > + (version "6.6.2") > ;; TODO: Package 'masm' and unbundle from sources. > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) > + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) > (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) > (outputs '("out" "debug")) > (build-system cmake-build-system) > @@ -1483,6 +1497,8 @@ (define-public qtdeclarative > "(" > (string-join > (list > + ;; FIXME > + "tst_qquickiconimage" > ;; This test is marked as flaky upstream (see: > ;; https://bugreports.qt.io/browse/QTBUG-101488). > "tst_qquickfiledialogimpl" > @@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5 > (define-public qtwebsockets > (package > (name "qtwebsockets") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0")))) > + "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0")))) > (build-system cmake-build-system) > (arguments > (list > @@ -1636,6 +1652,25 @@ (define-public qtwebsockets > (license (package-license qtbase)))) > > (define-public qtsensors > + (package > + (inherit qtsvg) > + (name "qtsensors") > + (version "6.6.2") > + (source (origin > + (method url-fetch) > + (uri (qt-url name version)) > + (sha256 > + (base32 > + "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa")))) > + (native-inputs > + (list qtdeclarative)) > + (inputs (list qtbase)) > + (synopsis "Qt Sensors module") > + (description "The Qt Sensors API provides access to sensor hardware via QML > +and C++ interfaces. The Qt Sensors API also provides a motion gesture > +recognition API for devices."))) > + > +(define-public qtsensors-5 > (package > (inherit qtsvg-5) > (name "qtsensors") > @@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5 > (define-public qtshadertools > (package > (name "qtshadertools") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > @@ -1723,7 +1758,7 @@ (define-public qtshadertools > ;; sources. > (sha256 > (base32 > - "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya")))) > + "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2")))) > (build-system cmake-build-system) > (arguments > (list > @@ -1744,13 +1779,13 @@ (define-public qtshadertools > (define-public qtmultimedia > (package > (name "qtmultimedia") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl")) > + "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572")) > (modules '((guix build utils))) > (snippet > '(begin > @@ -1775,7 +1810,10 @@ (define-public qtmultimedia > ;; session bus, which requires an X11 server, and then is still > ;; unhappy). > (substitute* "tests/auto/CMakeLists.txt" > - (("add_subdirectory\\(integration)") "")))) > + (("add_subdirectory\\(integration)") "")) > + ;; fail on offscreen rendering For long-term maintenance, I like to mention the name of the failing test in the message, as when more such tests are skipped later, it becomes unclear. E.g.: 'The "qvideoframecolormanagement" tests fail with an 'offscreen rendering' error. > + (substitute* "tests/auto/unit/multimedia/CMakeLists.txt" > + (("add_subdirectory\\(qvideoframecolormanagement\\)") "")))) > (add-before 'check 'prepare-for-tests > (lambda _ > (setenv "QT_QPA_PLATFORM" "offscreen"))) > @@ -1865,13 +1903,13 @@ (define-public qtwayland-5 > (define-public qtwayland > (package > (name "qtwayland") > - (version "6.5.2") > + (version "6.6.2") > (source > (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > - (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h")))) > + (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv")))) > (build-system cmake-build-system) > (arguments > (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") > @@ -1888,6 +1926,7 @@ (define-public qtwayland > (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) > (add-before 'check 'set-test-environment > (lambda _ > + (setenv "XDG_RUNTIME_DIR" (getcwd)) > ;; Do not fail just because /etc/machine-id is missing. > (setenv "DBUS_FATAL_WARNINGS" "0") > ;; Make Qt render "offscreen", required for tests. > @@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5 > (define-public qtwebchannel > (package > (name "qtwebchannel") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261")))) > + "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x")))) > (build-system cmake-build-system) > (arguments > (list > @@ -2080,13 +2119,13 @@ (define-public qtwebview > (define-public qtlanguageserver > (package > (name "qtlanguageserver") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk")))) > + "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3")))) > (build-system cmake-build-system) > (arguments > (list #:phases #~(modify-phases %standard-phases > @@ -2129,13 +2168,13 @@ (define-public qtlocation > (define-public qtlottie > (package > (name "qtlottie") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0")))) > + "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7")))) > (build-system cmake-build-system) > (arguments > (list > @@ -2193,13 +2232,13 @@ (define-public qttools-5 > (define-public qttools > (package > (name "qttools") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm")))) > + "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76")))) > (build-system cmake-build-system) > (arguments > (list > @@ -2220,7 +2259,7 @@ (define-public qttools > (native-inputs (list perl qtdeclarative vulkan-headers)) > ;; Use clang-15, which is built using as a single shared library, which is > ;; what the build system of qttools expects. > - (inputs (list clang-15 libxkbcommon mesa qtbase)) > + (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib"))) > (home-page (package-home-page qtbase)) > (synopsis "Qt Tools and Designer modules") > (description "The Qt Tools module provides a set of applications to browse > @@ -2233,13 +2272,13 @@ (define-public qttools > (define-public qttranslations > (package > (name "qttranslations") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k")))) > + "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna")))) > (build-system cmake-build-system) > (arguments (list #:tests? #f)) > (native-inputs (list qtbase qttools)) > @@ -2391,13 +2430,13 @@ (define-public qtscxml > (define-public qtpositioning > (package > (name "qtpositioning") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh")))) > + "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd")))) > (build-system cmake-build-system) > (arguments > (list > @@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5 > (define-public qtnetworkauth > (package > (name "qtnetworkauth") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f")))) > + "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j")))) > (build-system cmake-build-system) > (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) > (native-inputs (list perl)) > @@ -2524,13 +2563,13 @@ (define-public qtnetworkauth > (define-public qtremoteobjects > (package > (name "qtremoteobjects") > - (version "6.5.2") > + (version "6.6.2") > (source (origin > (method url-fetch) > (uri (qt-url name version)) > (sha256 > (base32 > - "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60")))) > + "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa")))) > (build-system cmake-build-system) > (arguments > (list > @@ -2558,7 +2597,7 @@ (define-public qtremoteobjects > (home-page (package-home-page qtbase)) > (license (package-license qtbase)))) The above LGTM. > -(define-public qtspeech > +(define-public qtspeech-5 > (package > (inherit qtsvg-5) > (name "qtspeech") > @@ -2583,6 +2622,38 @@ (define-public qtspeech > In such a scenario, the messaging application can read out the incoming > message."))) > > +(define-public qtspeech > + (package > + (inherit qtspeech-5) > + (name "qtspeech") > + (version "6.6.2") > + (source (origin > + (method url-fetch) > + (uri (qt-url name version)) > + (sha256 > + (base32 > + "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0")))) > + (build-system qt-build-system) > + (arguments > + (list #:phases > + #~(modify-phases %standard-phases > + (delete 'check) ;move after the install phase > + (add-after 'install 'check > + (assoc-ref %standard-phases 'check)) > + (add-before 'check 'prepare-for-tests > + (lambda* (#:key outputs #:allow-other-keys) > + (setenv "QML2_IMPORT_PATH" > + (string-append (assoc-ref outputs "out") > + "/lib/qt6/qml:" > + (getenv "QML2_IMPORT_PATH"))))) > + (add-after 'install 'delete-installed-tests > + (lambda _ > + (delete-file-recursively > + (string-append #$output "/tests"))))))) > + (native-inputs '()) > + (propagated-inputs (list qtmultimedia)) > + (inputs (list qtbase qtdeclarative)))) This Qt 6 package inherits from its Qt 5 variant. I think it should be the other way around, so that when the time comes, Qt 5 packages can be simply removed without further complications. > (define-public qtvirtualkeyboard-5 > (package > (inherit qtsvg-5) > @@ -3042,14 +3113,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) > @@ -3081,12 +3152,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" > @@ -3118,8 +3188,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" > @@ -3130,11 +3198,17 @@ (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" This line is too long; it can be broken with a backslash escape in the middle of the string. > + "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" > @@ -3177,7 +3251,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" > @@ -3196,6 +3269,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 > @@ -3215,6 +3289,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" > @@ -3222,7 +3297,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 > @@ -3292,6 +3366,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" > @@ -3359,14 +3434,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 > @@ -3416,7 +3494,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") > @@ -3684,7 +3766,7 @@ (define-public python-pyqt > ("qtdeclarative-5" ,qtdeclarative-5) > ("qtlocation" ,qtlocation) > ("qtmultimedia-5" ,qtmultimedia-5) > - ("qtsensors" ,qtsensors) > + ("qtsensors" ,qtsensors-5) > ("qtserialport" ,qtserialport) > ("qtsvg-5" ,qtsvg-5) > ("qttools-5" ,qttools-5) > @@ -4498,8 +4580,8 @@ (define-public python-pyside-2 > qtquickcontrols2-5 > qtscript > qtscxml > - qtsensors > - qtspeech > + qtsensors-5 > + qtspeech-5 > qtsvg-5 > qttools-5 > qtwebchannel-5 That LGTM. In a separate commit, we could modernize webengine to remove legacy input labels, unless they are used in the phases (and this can't be expressed in a new way such as via 'search-input-file'). > @@ -5086,7 +5168,7 @@ (define-public clazy > (define-public qt-creator > (package > (name "qt-creator") > - (version "12.0.1") > + (version "12.0.2") > (source (origin > (method url-fetch) > (uri (string-append > @@ -5109,7 +5191,7 @@ (define-public qt-creator > ((".*marketplace/marketplace.qbs.*") "")))) > (sha256 > (base32 > - "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb")))) > + "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) > (build-system qt-build-system) > (arguments > (list Can be in its own commit as mentioned earlier. Thanks for this series! It seems well crafted. My earlier comments are mostly cosmetic/nitpicks; so hopefully it's not too much work to implement. The more annoying part may be to separate your commits a bit more. For this time around, I think it's OK to group the Qt 6 upgrades together, unless you want to try the automatic updates tooling I've hinted at the beginning and re-apply the additional changes on top, but I don't think it's worth it. Thank you! I'll be expecting a v4 :-) Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:40 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:40 +0000 Received: from localhost ([127.0.0.1]:44527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSX-0001FX-Se for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:40 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34810 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSR-0001ES-Lv for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:36 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S2; Wed, 13 Mar 2024 16:58:45 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 00/24] qt: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:54 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S2 X-Coremail-Antispam: 1UD129KBjvJXoWxJr48KryftF1kZw15KF4kWFg_yoW8Zw4fpr ZIgw45uw1vk34rtrsrJr47CayrWwn7GFWYk3srZa45Kr4j9rs5J3yUJF48Cr47uryrWw4x uF4rC3y5AFy2vFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyIb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwV C2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWU JVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, This is v4 patch. Thanks for the comment. This version should fix question, and use etc/committer.scm And add missing python-{shiboken,pyside}-6. Zheng Junjie (24): gnu: qtbase: Update to 6.6.2. gnu: qt5compat: Update to 6.6.2. gnu: qtsvg: Update to 6.6.2. gnu: qtimageformats: Update to 6.6.2. gnu: qtdeclarative: Update to 6.6.2. gnu: qtwebsockets: Update to 6.6.2. gnu: qtshadertools: Update to 6.6.2. gnu: qtmultimedia: Update to 6.6.2. gnu: qtwayland: Update to 6.6.2. gnu: qtwebchannel: Update to 6.6.2. gnu: qtlanguageserver: Update to 6.6.2. gnu: qtlottie: Update to 6.6.2. gnu: qttools: Update to 6.6.2. gnu: qttranslations: Update to 6.6.2. gnu: qtpositioning: Update to 6.6.2. gnu: qtnetworkauth: Update to 6.6.2. gnu: qtremoteobjects: Update to 6.6.2. gnu: qtwebengine: Update to 6.6.2. gnu: python-{shiboken,pyside}-6: Update to 6.6.2. gnu: qtsensors: Rename package to qtsensors-5. gnu: Add qtsensors. gnu: qtspeech: Rename package to qtspeech-5. gnu: Add qtspeech. gnu: qt-creator: Update to 12.0.2. gnu/local.mk | 3 +- gnu/packages/education.scm | 3 +- gnu/packages/games.scm | 4 +- gnu/packages/geo.scm | 3 +- gnu/packages/kde-frameworks.scm | 6 +- gnu/packages/kde-pim.scm | 8 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-utils.scm | 4 +- gnu/packages/kde.scm | 2 +- .../patches/qtbase-find-tools-in-PATH.patch | 49 ++++ .../patches/qtbase-qmake-fix-includedir.patch | 29 ++ gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ---------- .../qtdeclarative-disable-qmlcache.patch | 27 +- gnu/packages/qt.scm | 251 +++++++++++++----- gnu/packages/radio.scm | 3 +- 15 files changed, 303 insertions(+), 232 deletions(-) create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir.patch delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch base-commit: 447e9c96259e8fa15a828de9b2dd3400e2ffafe6 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:41 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:41 +0000 Received: from localhost ([127.0.0.1]:44532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSa-0001G6-8i for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:41 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34836 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSR-0001EW-L7 for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:36 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S4; Wed, 13 Mar 2024 16:58:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 02/24] gnu: qt5compat: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:56 +0800 Message-ID: <571e548211612c6c59a28238890c5b15e7b0b008.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S4 X-Coremail-Antispam: 1UD129KBjvdXoWruFyfWw4rAF4xJryxurWDXFb_yoW3Zrg_Aa 43JwnayrZ5Xa4UK3yrCF1jka4Fg3WDXw47Ka47KF97tFn3Wr48XFyDur97Ja15uF48KFsa yr4FkryfWFWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3xYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvf C2KfnxnUUI43ZEXa7IU82LvtUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qt5compat): Update to 6.6.2. Change-Id: I9bdb9fbe880cabbc39d7928340e54ba2793131db --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e195df670d..ffd3539e77 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1101,13 +1101,13 @@ (define-public qt3d-5 (define-public qt5compat (package (name "qt5compat") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr")))) + "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:43 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:43 +0000 Received: from localhost ([127.0.0.1]:44535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSd-0001Gp-It for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:43 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34854 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSS-0001Ea-6r for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:36 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S5; Wed, 13 Mar 2024 16:58:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 03/24] gnu: qtsvg: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:57 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S5 X-Coremail-Antispam: 1UD129KBjvdXoW7JFy3Wr43Gw4UCryDXr15XFb_yoW3Crc_Xr y7Xwnayr4kZryUta1rKF1jyFyrWa1DXw42gr17KrWktFn3Wr17XFyDWr97Ja15WF48tFna yr4qkryfurW8ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUba8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0c7CE w4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6x kF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIE c7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I 8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCF s4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4 IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1r MI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJV WUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j 6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcS sGvfC2KfnxnUUI43ZEXa7IU8w0eJUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtsvg): Update to 6.6.2. Change-Id: Ibd80b03bb776cdbe2084e8be65ddd1ccc0edb6ad --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ffd3539e77..fa1c11b406 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1199,13 +1199,13 @@ (define-public qtsvg-5 (define-public qtsvg (package (name "qtsvg") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28")))) + "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:44 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:44 +0000 Received: from localhost ([127.0.0.1]:44537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSd-0001Gr-Rk for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:44 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34908 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001Ei-Jx for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:36 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S13; Wed, 13 Mar 2024 16:58:51 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 11/24] gnu: qtlanguageserver: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:05 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S13 X-Coremail-Antispam: 1UD129KBjvdXoWrKryxAF4fuF4xtw4rZFW5KFg_yoWfXFg_Jw 1xCFsayr4xZr4UKw4rJF4vyayrWF4xWw42ga17KF4kKFn3Wr1UWF9rWFykJa48uF48Krs3 tF4YkryfuFWxujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtlanguageserver): Update to 6.6.2. Change-Id: I08eb5329f3ee52b86002a9f3eb75f5b8672972d9 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 70d7ed7c5d..55f8424486 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2114,13 +2114,13 @@ (define-public qtwebview (define-public qtlanguageserver (package (name "qtlanguageserver") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk")))) + "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:44 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:44 +0000 Received: from localhost ([127.0.0.1]:44539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSe-0001Gy-5j for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:44 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34914 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001Ek-OT for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:37 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S9; Wed, 13 Mar 2024 16:58:50 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 07/24] gnu: qtshadertools: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:01 +0800 Message-ID: <448bf6cc5679aa930c26590dad8e2bedc4b4dfb2.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtrW7uw17Aw45try8Gry5CFg_yoWfWFc_G3 9xZw1Iyrs5Z340kw4xC3W0kayrW3Wqvr42gay3KFn7t3Z3Ww4UXFyDWrykJ3WUZw4kKFn3 Aws09ryrXryUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbaAYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV WUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_Gr UvcSsGvfC2KfnxnUUI43ZEXa7IU8AMaUUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtshadertools): Update to 6.6.2. Change-Id: Iaba081f9a576c12b9e9cb4a8002376c8326a30cb --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4888df1fe0..ffd1064223 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1744,7 +1744,7 @@ (define-public qtmultimedia-5 (define-public qtshadertools (package (name "qtshadertools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1752,7 +1752,7 @@ (define-public qtshadertools ;; sources. (sha256 (base32 - "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya")))) + "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:44 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:44 +0000 Received: from localhost ([127.0.0.1]:44541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSe-0001HA-Fx for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:44 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34928 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSV-0001En-5f for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:37 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S14; Wed, 13 Mar 2024 16:58:52 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 12/24] gnu: qtlottie: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:06 +0800 Message-ID: <59cb1720c941097f732113069f8d63d7a8e7c63a.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S14 X-Coremail-Antispam: 1UD129KBjvdXoWrKr18Jw17Wr4rtr15XF1UJrb_yoW3ZrX_Cr y7JwnIyrs7ZryUKa1rK3Wvka4rWa1DAr42krW7Kr1ktFn3Wr18XF9rWr97Ja1kua18tFna yr4akryrWrWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtlottie): Update to 6.6.2. Change-Id: I82903a9593c7536bf9f38165b596774cf88994c6 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 55f8424486..fe0992b617 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2163,13 +2163,13 @@ (define-public qtlocation (define-public qtlottie (package (name "qtlottie") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0")))) + "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:45 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:45 +0000 Received: from localhost ([127.0.0.1]:44543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSe-0001HD-Ps for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:45 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34902 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001Ef-7j for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:38 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S8; Wed, 13 Mar 2024 16:58:50 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 06/24] gnu: qtwebsockets: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:00 +0800 Message-ID: <2b41c12f27a961d7d1cf0607cdf1201fb739d6eb.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S8 X-Coremail-Antispam: 1UD129KBjvdXoWrKr4kZF18WrWkWw15ZryUGFg_yoW3uwc_A3 sxA3savrWkZrWUKw4kCF1UKayfWF1qyr42gF47Kr18tFnagr18WFyDur97J3W5WF48trn3 ArsYkr93WrWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbaAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV WUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_Gr UvcSsGvfC2KfnxnUUI43ZEXa7IU8kR67UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwebsockets): Update to 6.6.2. Change-Id: I10bfabe99fd53b47e2ec1dc50757ad89fd3f3b96 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7160beb702..4888df1fe0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1628,13 +1628,13 @@ (define-public qtwebsockets-5 (define-public qtwebsockets (package (name "qtwebsockets") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0")))) + "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:45 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:45 +0000 Received: from localhost ([127.0.0.1]:44545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSf-0001HK-1V for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:45 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34856 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSS-0001Eb-71 for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:38 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S6; Wed, 13 Mar 2024 16:58:48 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 04/24] gnu: qtimageformats: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:58 +0800 Message-ID: <94aebf96459c45b1e67f9e5166a83b3ee2d4f4a6.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S6 X-Coremail-Antispam: 1UD129KBjvdXoWrKry5trWfCr17AryDWrWkXrb_yoWfXwbEy3 s7J3sYvr4kZr4UKwsYk3W2yayfWa4DZwnagFy7KFn7tFn3Ww1UXFyDuFyxJa18GF4xtrn3 ArWS9ryfWrW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbaAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV WUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_Gr UvcSsGvfC2KfnxnUUI43ZEXa7IU822NtUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtimageformats): Update to 6.6.2. Change-Id: I111f67258116f1bd4e0e3029d38afaf0ed024435 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fa1c11b406..4bbdb53f07 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1258,14 +1258,14 @@ (define-public qtimageformats-5 (define-public qtimageformats (package (name "qtimageformats") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtimageformats-5)) (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a")))) + "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:45 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:46 +0000 Received: from localhost ([127.0.0.1]:44547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSf-0001HS-EN for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:45 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34906 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001Eg-Cy for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:38 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S10; Wed, 13 Mar 2024 16:58:50 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 08/24] gnu: qtmultimedia: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:02 +0800 Message-ID: <6671f28e215aad61998098f73e50eb46544bb4a4.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S10 X-Coremail-Antispam: 1UD129KBjvJXoW7CrWDury7uF4DKr1DArW8WFg_yoW8XF1rpF W2gF9F9w10g3WUAwn7Crn2kay5WrWxJrW7C393Zw4Skwsavry8JrWIyFWrurs2qrWIgw4j 93W0ga45Zr1agaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Sb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r 4UYxBIdaVFxhVjvjDU0xZFpf9x07jo6wZUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtmultimedia): Update to 6.6.2. [arguments]<#:phases>: Adjust 'disable-integration-tests phase. Change-Id: I8dd6e4767b40436199e4d45a0b75c4bd3136b386 --- gnu/packages/qt.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ffd1064223..ce038082e8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1773,13 +1773,13 @@ (define-public qtshadertools (define-public qtmultimedia (package (name "qtmultimedia") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl")) + "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572")) (modules '((guix build utils))) (snippet '(begin @@ -1804,7 +1804,11 @@ (define-public qtmultimedia ;; session bus, which requires an X11 server, and then is still ;; unhappy). (substitute* "tests/auto/CMakeLists.txt" - (("add_subdirectory\\(integration)") "")))) + (("add_subdirectory\\(integration)") "")) + ;; The "qvideoframecolormanagement" tests fail with an + ;; 'offscreen rendering' error. + (substitute* "tests/auto/unit/multimedia/CMakeLists.txt" + (("add_subdirectory\\(qvideoframecolormanagement\\)") "")))) (add-before 'check 'prepare-for-tests (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:46 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:46 +0000 Received: from localhost ([127.0.0.1]:44549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSf-0001HZ-Q9 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:46 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34934 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSW-0001Eq-JD for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:39 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S17; Wed, 13 Mar 2024 16:58:53 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 15/24] gnu: qtpositioning: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:09 +0800 Message-ID: <1ef3f2a00aeeb0cfb41f372480b6ce9bd075dd53.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S17 X-Coremail-Antispam: 1UD129KBjvdXoW7JrWUGF15XF4fKFWrtrW3trb_yoW3uFc_Ar yaqwnay395ZryUtw48KF40yas5u3W8ArZ2g3W3KFy8K3Za9r1kXFyDur97Ja15WF4kKrs3 CrsYkryfurW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtpositioning): Update to 6.6.2. Change-Id: I86ba435616033922d9a26f86614ffcfd0cb6ef03 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b43d9ff4cb..c2bd0ef937 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2425,13 +2425,13 @@ (define-public qtscxml (define-public qtpositioning (package (name "qtpositioning") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh")))) + "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:46 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:46 +0000 Received: from localhost ([127.0.0.1]:44551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSg-0001Hg-55 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:46 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34938 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSW-0001Et-Tx for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:39 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S16; Wed, 13 Mar 2024 16:58:52 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 14/24] gnu: qttranslations: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:08 +0800 Message-ID: <37f79676440e08c2c71e10f12a3719b7e757c394.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S16 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1xJrykKw47KF15XFy3twb_yoWfXFb_CF yxJ3WSyr4kXryDKw48GF1vyayruF4xXw1IgF47KrykK3ZxWr4UWFyDWr97J3WUWF48KFna kr4qkryfuryxujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qttranslations): Update to 6.6.2. Change-Id: I1136bf3027303ea79a872605189290ca28670ce8 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1c793cc865..b43d9ff4cb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2267,13 +2267,13 @@ (define-public qttools (define-public qttranslations (package (name "qttranslations") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k")))) + "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list qtbase qttools)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:46 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:46 +0000 Received: from localhost ([127.0.0.1]:44553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSg-0001Hn-E8 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:46 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34942 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSX-0001Ew-Sk for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:40 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S15; Wed, 13 Mar 2024 16:58:52 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 13/24] gnu: qttools: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:07 +0800 Message-ID: <0be4499312f37448571f646b4a41f1159dad37e3.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S15 X-Coremail-Antispam: 1UD129KBjvJXoW7Ary8tw1UZr1fAFW5uFyUWrg_yoW8GFy8pF 13Aryqq3W8Wry5Gwn2qwnrKay3WayIkF95C3yfAw4UG3ZIvrW8JrW7trWakr9rCrs7G342 9F1Fqa15uFyrJFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUxg4SUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qttools): Update to 6.6.2. [inputs]: Add zstd:lib. Change-Id: I8d5ea1b3135809e28e2d159e8050ee9642c66d27 Change-Id: I7b78392d11fc7d3e5e9319fd60f4fcf57b0e9c2d --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fe0992b617..1c793cc865 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2227,13 +2227,13 @@ (define-public qttools-5 (define-public qttools (package (name "qttools") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm")))) + "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76")))) (build-system cmake-build-system) (arguments (list @@ -2254,7 +2254,7 @@ (define-public qttools (native-inputs (list perl qtdeclarative vulkan-headers)) ;; Use clang-15, which is built using as a single shared library, which is ;; what the build system of qttools expects. - (inputs (list clang-15 libxkbcommon mesa qtbase)) + (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib"))) (home-page (package-home-page qtbase)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:47 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:47 +0000 Received: from localhost ([127.0.0.1]:44555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSg-0001Hv-Oo for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:47 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34948 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSY-0001Ex-IM for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:40 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S21; Wed, 13 Mar 2024 16:58:54 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 19/24] gnu: python-{shiboken, pyside}-6: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:13 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S21 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF13CrWDXFyxKF13Xry7ZFb_yoW8Zry8pF 40kF1qv3ZYkr1kJan3GF42gr90grn2krW5Aw4ay3ZrKayYvr48Xw4IkFW5ur48Wr18ua42 gw48W3W5Xa4rJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUxHUDDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (python-shiboken-6, python-pyside-6): Update to 6.6.2. (python-shiboken-6)[properties]: Set upstream-name. (python-pyside-6)[arguments]<#:phases>: Add 'set-rpath phase. Change-Id: I098481f860c3bc97a629cca719305b2d00c3eace --- gnu/packages/qt.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 053f589987..6b58fe2211 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4498,7 +4498,7 @@ (define-public python-shiboken-6 (package (inherit python-shiboken-2) (name "python-shiboken-6") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-" @@ -4506,7 +4506,7 @@ (define-public python-shiboken-6 version ".tar.xz")) (sha256 (base32 - "1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh")))) + "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl")))) (build-system cmake-build-system) (inputs (modify-inputs (package-inputs python-shiboken-2) @@ -4526,7 +4526,8 @@ (define-public python-shiboken-6 "-DCMAKE_SKIP_RPATH=TRUE" (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib") - #$flags)))))) + #$flags)))) + (properties `((upstream-name . "pyside-setup"))))) (define-public python-pyside-2 (package @@ -4668,6 +4669,11 @@ (define-public python-pyside-6 #~(modify-phases %standard-phases (add-after 'unpack 'go-to-source-dir (lambda _ (chdir "sources/pyside6"))) + (add-after 'go-to-source-dir 'set-rpath + (lambda _ + (substitute* "CMakeLists.txt" + (("CMAKE_INSTALL_RPATH") + (string-append "CMAKE_INSTALL_RPATH " #$output "/lib"))))) (add-after 'go-to-source-dir 'fix-qt-module-detection (lambda _ (substitute* "cmake/PySideHelpers.cmake" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:48 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:48 +0000 Received: from localhost ([127.0.0.1]:44557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSh-0001I2-3h for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:48 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34916 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001Ej-NR for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:41 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S3; Wed, 13 Mar 2024 16:58:45 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 01/24] gnu: qtbase: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:55 +0800 Message-ID: <8990862367504be8cc269996477d95e44713a0e8.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S3 X-Coremail-Antispam: 1UD129KBjvAXoW3Kw1fXF4rGw4UtFW8JF1xGrg_yoW8Xw1Uuo WxZa1rXaykGw4rWr10krnxZwn8ZF4vkF4fJF4qkFWDWw1kJanrJa4fuwn5XFWUZr40gFZ5 ZrWxGwn5GFW3AF1fn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYq7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87 I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r18M28lY4IEw2IIxxk0rwA2F7IY1VAK z4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7 CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY 1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCT nIWIevJa73UjIFyTuYvjxUgQeoUUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtbase): Update to 6.6.2. [source]: Unbundle pcre2, md4c. Remove qtbase-use-TZDIR.patch. Add qtbase-find-tools-in-PATH.patch, qtbase-qmake-fix-includedir.patch, [arguments]<#:phases>: Adjust 'patch-more-paths phase, skip tst_selftests test. [inputs]: Add libb2 * gnu/packages/patches/qtbase-use-TZDIR.patch: Remove this. * gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file. * gnu/packages/patches/qtbase-qmake-fix-includedir.patch: New file. * gnu/local.mk (dist_patch_DATA): Remove qtbase-use-TZDIR.patch. Register qtbase-find-tools-in-PATH.patch, qtbase-qmake-fix-includedir.patch. Change-Id: I72af9c8f2e930bcae18f36ceca18a0a53f5c3e15 --- gnu/local.mk | 3 +- .../patches/qtbase-find-tools-in-PATH.patch | 49 ++++++ .../patches/qtbase-qmake-fix-includedir.patch | 29 ++++ gnu/packages/patches/qtbase-use-TZDIR.patch | 141 ------------------ gnu/packages/qt.scm | 47 ++++-- 5 files changed, 117 insertions(+), 152 deletions(-) create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir.patch delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch diff --git a/gnu/local.mk b/gnu/local.mk index e8b0a0e7be..0d8f4d28fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1951,10 +1951,11 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-fix-agent-paths.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ + %D%/packages/patches/qtbase-find-tools-in-PATH.patch \ + %D%/packages/patches/qtbase-qmake-fix-includedir.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ %D%/packages/patches/qtbase-5-use-TZDIR.patch \ - %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch new file mode 100644 index 0000000000..d5e38b09be --- /dev/null +++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch @@ -0,0 +1,49 @@ +Patch retrieved from NixOS + +https://github.com/NixOS/nixpkgs/blob/93ecdaa1f34354c9476062dc4fe323b442c087d5/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch + +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 29 Mar 2023 11:51:33 +0800 +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH + +1. find qt's tools in `QTTOOLSPATH` env + qt assumes that all components use the same install prefix + we can't get the real prefix for qttools when build qtbase + we will add /libexec to `QTTOOLSPATH` in qtToolsHook + find_path will also search in 'PATH' by default + see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` + +2. disable tool_dependencies_enabled + We can guarantee the build order of qt components in nixpkgs + tools in qttools always build before qtdoc + qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` +--- + cmake/QtDocsHelpers.cmake | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake +index 48ed5a324bf..91d8d41fb1f 100644 +--- a/cmake/QtDocsHelpers.cmake ++++ b/cmake/QtDocsHelpers.cmake +@@ -47,9 +47,14 @@ function(qt_internal_add_docs) + set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") + endif() + +- set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") +- set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") +- set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") ++ set(tool_dependencies_enabled FALSE) ++ ++ find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH) ++ find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH) ++ find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH) ++ set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}") ++ set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}") + + get_target_property(target_type ${target} TYPE) + if (NOT target_type STREQUAL "INTERFACE_LIBRARY") +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir.patch new file mode 100644 index 0000000000..766689c4fd --- /dev/null +++ b/gnu/packages/patches/qtbase-qmake-fix-includedir.patch @@ -0,0 +1,29 @@ +Patch retrieved from NixOS +https://github.com/NixOS/nixpkgs/blob/93ecdaa1f34354c9476062dc4fe323b442c087d5/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch + +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Fri, 14 Apr 2023 09:34:46 +0800 +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config + +--- + qmake/generators/makefile.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +index 11d2f0ff7df..c78ed0d3485 100644 +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() + << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") + // << varGlue("DEFINES","-D"," -D"," ") + ; +- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) +- t << "-I${includedir}"; ++ t << "-I${includedir}"; + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") + && libDir != QLatin1String("/Library/Frameworks")) { + t << " -F${libdir}"; +-- +2.42.0 + diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch deleted file mode 100644 index 98bf7493e9..0000000000 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 -From: Edward Welbourne -Date: Mon, 11 Sep 2023 11:41:39 +0200 -Subject: [PATCH] Support the TZDIR environment variable - -On Linux / glibc, this overrides the default system location for the -zone info. So check for files there first. Break out a function to -manage the trying of (now three) zoneinfo directories when opening a -file by name relative to there. - -Pick-to: 6.6 6.5 -Task-number: QTBUG-116017 -Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 ---- -* Rebased on top of v6.5.2. - - src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- - 1 file changed, 49 insertions(+), 24 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 067191d816..a8b2fc894e 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,17 +51,41 @@ typedef QHash QTzTimeZoneHash; - - static bool isTzFile(const QString &name); - -+// Open a named file under the zone info directory: -+static bool openZoneInfo(QString name, QFile *file) -+{ -+ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system -+ // default location for zone info: -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ if (!tzdir.isEmpty()) { -+ file->setFileName(QDir(tzdir).filePath(name)); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Try modern system path first: -+ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; -+ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ // Fall back to legacy system path: -+ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; -+ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { -+ file->setFileName(zoneShare + name); -+ if (file->open(QIODevice::ReadOnly)) -+ return true; -+ } -+ return false; -+} -+ - // Parse zone.tab table for territory information, read directories to ensure we - // find all installed zones (many are omitted from zone.tab; even more from - // zone1970.tab). - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -- if (!QFile::exists(path)) -- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -- -- QFile tzif(path); -- if (!tzif.open(QIODevice::ReadOnly)) -+ QFile tzif; -+ if (!openZoneInfo("zone.tab"_L1, &tzif)) - return QTzTimeZoneHash(); - - QTzTimeZoneHash zonesHash; -@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() - } - } - -+ const QString path = tzif.fileName(); - const qsizetype cut = path.lastIndexOf(u'/'); - Q_ASSERT(cut > 0); - const QDir zoneDir = QDir(path.first(cut)); -@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) - tzif.setFileName(QStringLiteral("/etc/localtime")); - if (!tzif.open(QIODevice::ReadOnly)) - return ret; -- } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- auto check = validatePosixRule(ianaId); -- if (check.isValid) { -- ret.m_hasDst = check.hasDst; -- ret.m_posixRule = ianaId; -- } -- return ret; -- } -+ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ auto check = validatePosixRule(ianaId); -+ if (check.isValid) { -+ ret.m_hasDst = check.hasDst; -+ ret.m_posixRule = ianaId; -+ return ret; - } - } - -@@ -1317,7 +1335,8 @@ private: - { - // On most distros /etc/localtime is a symlink to a real file so extract - // name from the path -- const auto zoneinfo = "/zoneinfo/"_L1; -+ const QString tzdir = qEnvironmentVariable("TZDIR"); -+ constexpr auto zoneinfo = "/zoneinfo/"_L1; - QString path = QStringLiteral("/etc/localtime"); - long iteration = getSymloopMax(); - // Symlink may point to another symlink etc. before being under zoneinfo/ -@@ -1325,9 +1344,15 @@ private: - // symlink, like America/Montreal pointing to America/Toronto - do { - path = QFile::symLinkTarget(path); -- int index = path.indexOf(zoneinfo); -- if (index >= 0) // Found zoneinfo file; extract zone name from path: -- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); -+ // If it's a zoneinfo file, extract the zone name from its path: -+ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); -+ if (index >= 0) { -+ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); -+ return tail.startsWith(u'/') ? tail.sliced(1) : tail; -+ } -+ index = path.indexOf(zoneinfo); -+ if (index >= 0) -+ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); - } while (!path.isEmpty() && --iteration > 0); - - return QByteArray(); - -base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 --- -2.41.0 - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..e195df670d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -67,6 +67,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages crypto) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -654,27 +655,28 @@ (define-public qtbase (package (inherit qtbase-5) (name "qtbase") - (version "6.5.2") + (version "6.6.2") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x")) + "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(with-directory-excursion "src/3rdparty" (for-each delete-file-recursively - ;; The bundled pcre2 copy is kept, as its headers - ;; are required by some internal bootstrap target - ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" - "qtbase-absolute-runpath.patch" - "qtbase-qmake-use-libname.patch")))) + "pcre2" "md4c" "libpng" "libjpeg" + "sqlite" "xcb" "zlib")))) + (patches + (search-patches + "qtbase-moc-ignore-gcc-macro.patch" + "qtbase-absolute-runpath.patch" + "qtbase-qmake-use-libname.patch" + "qtbase-find-tools-in-PATH.patch" + "qtbase-qmake-fix-includedir.patch")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) @@ -752,6 +754,12 @@ (define-public qtbase "qmake/library/qmakebuiltins.cpp") (("/bin/sh") (search-input-file inputs "bin/bash"))) + + (substitute* "tests/auto/tools/qt_cmake_create/\ +tst_qt_cmake_create.cpp" + (("/bin/sh") + (which "sh"))) + (substitute* "src/corelib/CMakeLists.txt" (("/bin/ls") (search-input-file inputs "bin/ls"))))) @@ -814,6 +822,24 @@ (define-public qtbase (string-join (append (list + ;; The 'tst_selftests' fails with the following error: + ;; with expansion: + ;; false + ;; with messages: + ;; test := "keyboard" + ;; arguments := QList("-o", "-,tap") + ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8. + ;; Qt depends on a UTF-8 locale, but has failed to switch to one. + ;; If this causes problems, reconfigure your locale. See the locale(1) manual + ;; for more information. + + ;; See https://bugreports.qt.io/browse/QTBUG-113371 + ;; Add glibc-utf8-locales to native-inpus is no help. + ;; TODO: when core-updates merge, check again. + "tst_selftests" + + ;; Sometimes it fails. + "tst_qsystemsemaphore" ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". "tst_moc" @@ -984,6 +1010,7 @@ (define-public qtbase bash-minimal coreutils-minimal md4c + libb2 libice libsm libxcb -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:48 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:48 +0000 Received: from localhost ([127.0.0.1]:44559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSi-0001IA-79 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:48 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34918 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSU-0001El-Pi for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:41 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S11; Wed, 13 Mar 2024 16:58:51 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 09/24] gnu: qtwayland: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:03 +0800 Message-ID: <08fcd6df826b6ca969322aeabd1cfb4b442facb3.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S11 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar1fWrW7Ar4xKrWxWry3urg_yoW8Gry7pF yrArsxu3W09ay8Jw4kXr17Kr47Wrs7CFykA393Z3y3Kw429rWUJry3AFW3GFnrJr4xKw42 9F4xKa45Wr1rJrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Sb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r 4UYxBIdaVFxhVjvjDU0xZFpf9x07jOF4iUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwayland): Update to 6.6.2. [arguments]<#:phases>: Adjust 'set-test-environment phase. Change-Id: I9aeaed2aa2c3f4d7275ea7a516baf6ff8fbf81ca Change-Id: I106db86ced2ecfcb98892603a723f0ad11f48477 --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce038082e8..f62db76c60 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1898,13 +1898,13 @@ (define-public qtwayland-5 (define-public qtwayland (package (name "qtwayland") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 - (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h")))) + (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") @@ -1921,6 +1921,7 @@ (define-public qtwayland (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) (add-before 'check 'set-test-environment (lambda _ + (setenv "XDG_RUNTIME_DIR" (getcwd)) ;; Do not fail just because /etc/machine-id is missing. (setenv "DBUS_FATAL_WARNINGS" "0") ;; Make Qt render "offscreen", required for tests. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:49 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:49 +0000 Received: from localhost ([127.0.0.1]:44561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSi-0001IH-Ho for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:49 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34958 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSZ-0001Ez-8T for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:41 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S20; Wed, 13 Mar 2024 16:58:54 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 18/24] gnu: qtwebengine: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:12 +0800 Message-ID: <2f8cfb8dd1d8a0a46fd908486aa7afa577d4a77a.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S20 X-Coremail-Antispam: 1UD129KBjvJXoW3AF1kWFyDtFyUuF48KFW7Arb_yoWxAryfpa 18Ar1DJr1UGa4xur9IyryxCrWq9FWjyF9xG3WftF47Aa1Sqry5Jr42kF15uF4qvr47AF97 Cw1UuFy7Jr15JrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUyPrcDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 04:59:49 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 08:59:49 +0000 Received: from localhost ([127.0.0.1]:44563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSj-0001IP-3z for submit@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:49 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:34962 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKSb-0001F2-Lm for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 04:59:43 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S22; Wed, 13 Mar 2024 16:58:54 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 20/24] gnu: qtsensors: Rename package to qtsensors-5. Date: Wed, 13 Mar 2024 16:58:14 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Maxim Cournoyer , Sharlatan Hellseher , 宋文武 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S22 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOz7k0a2IF6F4UM7kC6x804xWl14x267AK xVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26r4j6ryUM28l Y4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr 1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j 6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv04 87M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY 67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y4 8IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s02 6xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr 0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v2 6ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj4 0_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8 JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0jXdUUUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5 * gnu/packages/qt.scm (python-pyqt, python-pyside-2) * gnu/packages/geo.scm (openorienteering-mapper) * gnu/packages/kde-plasma.scm (kscreen) * gnu/packages/education.scm (gcompris-qt) Adjust inputs. Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba --- gnu/packages/education.scm | 3 ++- gnu/packages/geo.scm | 3 ++- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..fb432ee844 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2022 Luis Felipe López Acevedo ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,7 +193,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..2a1bf2b935 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2575,7 +2576,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6b58fe2211..5a24b7da25 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1664,7 +1664,7 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -3730,7 +3730,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4545,7 +4545,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors + qtsensors-5 qtspeech qtsvg-5 qttools-5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:02:48 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:02:48 +0000 Received: from localhost ([127.0.0.1]:44633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVc-0001SF-94 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:48 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36146 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVa-0001Rr-Of for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:47 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqKa_Fl1U7gBQ--.45251S3; Wed, 13 Mar 2024 17:02:03 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 21/24] gnu: Add qtsensors. Date: Wed, 13 Mar 2024 17:01:53 +0800 Message-ID: <1a076458b935dfec6b04153db06a3b8a407b7c52.1710320157.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADn7nqKa_Fl1U7gBQ--.45251S3 X-Coremail-Antispam: 1UD129KBjvdXoW7GF1fXryxtr4DXrW8Zr1xuFg_yoWkXFX_uF n7Gryvyr48ZF4jgayFyF1vk3sYkrW8Cr18Ka1Yqr4vkr1fWr45XFnruFy0v3WxXFn8tr1F kr45CryrZ347ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3kYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7Jw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda VFxhVjvjDU0xZFpf9x07jeWlkUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtsensors): New variable. Change-Id: I5d5bf3902f3340d6e73dc8889e27d4e5bf28b058 --- gnu/packages/qt.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5a24b7da25..f5c63800c9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1664,6 +1664,25 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) +(define-public qtsensors + (package + (inherit qtsvg) + (name "qtsensors") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa")))) + (native-inputs + (list qtdeclarative)) + (inputs (list qtbase)) + (synopsis "Qt Sensors module") + (description "The Qt Sensors API provides access to sensor hardware via QML +and C++ interfaces. The Qt Sensors API also provides a motion gesture +recognition API for devices."))) + (define-public qtsensors-5 (package (inherit qtsvg-5) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:02:48 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:02:49 +0000 Received: from localhost ([127.0.0.1]:44635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVc-0001SH-IQ for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:48 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36144 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVa-0001Rq-Ax for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:47 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqKa_Fl1U7gBQ--.45251S5; Wed, 13 Mar 2024 17:02:04 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 23/24] gnu: Add qtspeech. Date: Wed, 13 Mar 2024 17:01:55 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADn7nqKa_Fl1U7gBQ--.45251S5 X-Coremail-Antispam: 1UD129KBjvJXoW7WF1xtw1kZF15trWkGr17Jrb_yoW8tw17pF W5Kr1YkayrGF17A39Iqa1UCF9I9an7CrWUAw17Z3W7Cw4j9FWFkry3trZ5CF1xJr47A3y5 ua18Xay3ur15XaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Ib7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv 6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c 02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE 4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4I kC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWU WwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Xr 0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWU JVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJb IYCTnIWIevJa73UjIFyTuYvjxUqaZXDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtspeech): New variable. Change-Id: I99294321514e7e3908d2f25812ceaa76d60bf060 --- gnu/packages/qt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 22d6e696c0..eea0aedcaf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2636,6 +2636,50 @@ (define-public qtspeech-5 In such a scenario, the messaging application can read out the incoming message."))) +(define-public qtspeech + (package + (name "qtspeech") + (version "6.6.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'set-display + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-before 'check 'prepare-for-tests + (lambda* (#:key outputs #:allow-other-keys) + (setenv "QML2_IMPORT_PATH" + (string-append (assoc-ref outputs "out") + "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (propagated-inputs (list qtmultimedia)) + (inputs (list qtbase qtdeclarative)) + (synopsis "Qt Speech module") + (description "The Qt Speech module enables a Qt application to support +accessibility features such as text-to-speech, which is useful for end-users +who are visually challenged or cannot access the application for whatever +reason. The most common use case where text-to-speech comes in handy is when +the end-user is driving and cannot attend the incoming messages on the phone. +In such a scenario, the messaging application can read out the incoming +message.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtvirtualkeyboard-5 (package (inherit qtsvg-5) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:02:54 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:02:54 +0000 Received: from localhost ([127.0.0.1]:44642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVh-0001Sj-EW for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:54 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36192 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVd-0001Rw-4S for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:50 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqKa_Fl1U7gBQ--.45251S6; Wed, 13 Mar 2024 17:02:04 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 24/24] gnu: qt-creator: Update to 12.0.2. Date: Wed, 13 Mar 2024 17:01:56 +0800 Message-ID: <014bf98d9c63873b411046d92de979a4f7a23405.1710320157.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADn7nqKa_Fl1U7gBQ--.45251S6 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOz7k0a2IF6F4UM7kC6x804xWl14x267AK xVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26r1Y6r1xM28l Y4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr 1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j 6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv04 87M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY 67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y4 8IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s02 6xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr 0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v2 6ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj4 0_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8 JrUvcSsGvfC2KfnxnUUI43ZEXa7IU1Mmh7UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qt-creator): Update to 12.0.2. Change-Id: Ibd753a2bafa6d4427c03d5ab657544571892b930 --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index eea0aedcaf..d46a50f130 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Yash Tiwari ;;; Copyright © 2023 Sharlatan Hellseher -;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Herman Rimm ;;; ;;; This file is part of GNU Guix. @@ -5201,7 +5201,7 @@ (define-public clazy (define-public qt-creator (package (name "qt-creator") - (version "12.0.1") + (version "12.0.2") (source (origin (method url-fetch) (uri (string-append @@ -5224,7 +5224,7 @@ (define-public qt-creator ((".*marketplace/marketplace.qbs.*") "")))) (sha256 (base32 - "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb")))) + "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) (build-system qt-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:02:58 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:02:58 +0000 Received: from localhost ([127.0.0.1]:44644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVm-0001T7-2Z for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:58 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:36214 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKVg-0001S2-LV for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:02:56 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowADn7nqKa_Fl1U7gBQ--.45251S4; Wed, 13 Mar 2024 17:02:03 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 22/24] gnu: qtspeech: Rename package to qtspeech-5. Date: Wed, 13 Mar 2024 17:01:54 +0800 Message-ID: <8493b5c163e43a6b1b08dfd029d467e6ad48b8b4.1710320157.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , Maxim Cournoyer , 宋文武 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowADn7nqKa_Fl1U7gBQ--.45251S4 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOY7k0a2IF6F4UM7kC6x804xWl14x267AK xVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2x26xkF7I0E14v26r18M28lY4IEw2II xxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjc xK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28E F7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487M2AExV AIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU GVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCj c4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr0_Jr4lx4 CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1U MIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF 4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsG vfC2KfnxnUUI43ZEXa7IU1_gA7UUUUU== X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtspeech): Rename to qtspeech-5. (python-pyside-2) * gnu/packages/games.scm (chessx) * gnu/packages/kde-frameworks.scm (ktextwidgets) * gnu/packages/kde-pim.scm (kdepim-runtime,kpimtextedit) * gnu/packages/kde-utils.scm (kmouth) * gnu/packages/kde.scm (okular) * gnu/packages/radio.scm (sdrangel): Adjust inputs. Change-Id: I65ae1f4e3601f0caa8304cea6fb12f991f8e52a1 --- gnu/packages/games.scm | 4 ++-- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-pim.scm | 8 ++++---- gnu/packages/kde-utils.scm | 4 ++-- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 3 ++- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index db8d8da0a9..b95b089ed5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,7 +75,7 @@ ;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; Copyright © 2022 Hendursaga ;;; Copyright © 2022 Parnikkapore -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic ;;; Copyright © 2023, 2024 gemmaro @@ -10472,7 +10472,7 @@ (define-public chessx (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..88ce09f59e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2021 Alexandros Theodotou ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Petr Hodina -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -1985,7 +1985,7 @@ (define-public knotifications phonon qtdeclarative-5 qtbase-5 - qtspeech + qtspeech-5 qtx11extras)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -3249,7 +3249,7 @@ (define-public ktextwidgets kwidgetsaddons kwindowsystem qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e95eac4e2f..c3f7f9a4d6 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -848,13 +848,13 @@ (define-public kdepim-runtime qtdeclarative-5 qtkeychain qtnetworkauth-5 - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtxmlpatterns)) (arguments - ;; TODO: 5/45 tests fail for quite different reasons, even with - ;; "offscreen" and dbus + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus `(#:phases (modify-phases %standard-phases (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) @@ -1993,7 +1993,7 @@ (define-public kpimtextedit kwidgetsaddons kxmlgui qtbase-5 - qtspeech + qtspeech-5 sonnet)) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..351a58687c 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Petr Hodina ;;; @@ -874,7 +874,7 @@ (define-public kmouth kxmlgui breeze-icons ;; default icon set qtbase-5 - qtspeech)) + qtspeech-5)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8e8bb32fda..385bb42926 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1557,7 +1557,7 @@ (define-public okular kio kparts kpty - qtspeech + qtspeech-5 kwallet kwindowsystem libkexiv2 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f5c63800c9..22d6e696c0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2611,7 +2611,7 @@ (define-public qtremoteobjects (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtspeech +(define-public qtspeech-5 (package (inherit qtsvg-5) (name "qtspeech") @@ -4565,7 +4565,7 @@ (define-public python-pyside-2 qtscript qtscxml qtsensors-5 - qtspeech + qtspeech-5 qtsvg-5 qttools-5 qtwebchannel-5 diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9c8225d22b..74a74f9922 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Ryan Tolboom ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2671,7 +2672,7 @@ (define-public sdrangel qtmultimedia-5 qtquickcontrols2-5 qtserialport - qtspeech + qtspeech-5 qtwebchannel-5 qtwebengine-5 qtwebsockets-5 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:07:34 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:07:34 +0000 Received: from localhost ([127.0.0.1]:44683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaE-0001bM-Eo for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:34 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:37676 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaB-0001an-I5 for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:32 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S12; Wed, 13 Mar 2024 16:58:51 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 10/24] gnu: qtwebchannel: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:04 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S12 X-Coremail-Antispam: 1UD129KBjvdXoW7Gry3Gw47Ary8ZrWDGF43trb_yoW3uwc_Xr yxXwnavrWkZrW7Kw48KF1qkayFg3W8Zr12gay3Kr4ktFnxWw1UXFyqgr97Ja1UWF48tFn3 ArsakryfuFWj9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j5DGOUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtwebchannel): Update to 6.6.2. Change-Id: If488f765e1373f2886eed2cc4e76f34350283682 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f62db76c60..70d7ed7c5d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2030,13 +2030,13 @@ (define-public qtwebchannel-5 (define-public qtwebchannel (package (name "qtwebchannel") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261")))) + "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:07:35 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:07:35 +0000 Received: from localhost ([127.0.0.1]:44685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaE-0001bS-PT for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:35 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:37680 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaB-0001ao-I4 for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:32 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S19; Wed, 13 Mar 2024 16:58:53 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 17/24] gnu: qtremoteobjects: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:11 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S19 X-Coremail-Antispam: 1UD129KBjvdXoW7JrW8ur1rCFy7Aw1xtF47urg_yoW3tFX_AF W7ta4I9r4kZryUKa18AF10ya4rWF47Aw129FZxKr4ktF9Igw4UXFyDWr97Ja1rWa18tF93 ArsakryxurW7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtremoteobjects): Update to 6.6.2. Change-Id: I8c0bf3b125dc8a2c319caf2f0b9be381e4521b8c --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 35e64e7be7..5680d5520a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2558,13 +2558,13 @@ (define-public qtnetworkauth (define-public qtremoteobjects (package (name "qtremoteobjects") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60")))) + "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa")))) (build-system cmake-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:07:35 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:07:35 +0000 Received: from localhost ([127.0.0.1]:44687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaF-0001bV-2C for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:35 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:37678 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaB-0001aq-JV for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:33 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S18; Wed, 13 Mar 2024 16:58:53 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 16/24] gnu: qtnetworkauth: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:58:10 +0800 Message-ID: <05ae809669794a30e04a92cf86d47a8ef8178cc9.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S18 X-Coremail-Antispam: 1UD129KBjvdXoWrKr4DKrW8WF15CFWfZw4fXwb_yoWfCFg_Wr W3Jw1Skr4rZr4jkw4kGw40k34ruF4UXw1IgFW3KrykKFnxWr1UXFyDuFy8JF18WF4kKFna yrsakryrXFWUujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-8YjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0 c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2 IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxV CFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r10 6r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxV W8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG 6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr 1UYxBIdaVFxhVjvjDU0xZFpf9x07j7fHUUUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (qtnetworkauth): Update to 6.6.2. Change-Id: I5fac372916ce516cd2ac3e7dbd83a32fc77024ec --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c2bd0ef937..35e64e7be7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2538,13 +2538,13 @@ (define-public qtnetworkauth-5 (define-public qtnetworkauth (package (name "qtnetworkauth") - (version "6.5.2") + (version "6.6.2") (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f")))) + "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) (native-inputs (list perl)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 13 05:07:35 2024 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:07:35 +0000 Received: from localhost ([127.0.0.1]:44689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaF-0001bd-CL for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:35 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:37682 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaB-0001ap-JQ for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:33 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S7; Wed, 13 Mar 2024 16:58:49 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH qt-team v4 05/24] gnu: qtdeclarative: Update to 6.6.2. Date: Wed, 13 Mar 2024 16:57:59 +0800 Message-ID: <340c6adc68dd92785a826909b2ffb5a07b2c19b8.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S7 X-Coremail-Antispam: 1UD129KBjvJXoWxurWxZr1rKr1DZr1xKrW7Jwb_yoWrJFWUp3 y3AFyFvay0gFy7t3Z3tw4xWF15u397JFyDC3ykJw109w4avryIqryftFWF9F4fCr45Ww42 9r10qFn3GFy5AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYY7kG6xAYrwCIc40Y0x0EwIxGrwCI42IY6x IIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUldgADUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/qt.scm (qtdeclarative): Update to 6.6.2. [arguments]<#:phases>: Adjust 'check phase. * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Adjust it. Change-Id: Ic7ddb603524ff07916d57b2ce92b7ffa407a5004 --- .../qtdeclarative-disable-qmlcache.patch | 27 ++++++++++++++----- gnu/packages/qt.scm | 8 +++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index 5f06ec53b4..df76fab910 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -1,16 +1,31 @@ Retrieved from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4bbdb53f07..7160beb702 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1433,14 +1433,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.5.2") + (version "6.6.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (outputs '("out" "debug")) (build-system cmake-build-system) @@ -1510,6 +1510,8 @@ (define-public qtdeclarative "(" (string-join (list + ;; FIXME + "tst_qquickiconimage" ;; This test is marked as flaky upstream (see: ;; https://bugreports.qt.io/browse/QTBUG-101488). "tst_qquickfiledialogimpl" @@ -1541,7 +1543,7 @@ (define-public qtdeclarative ;; fixing/applying #30948). "tst_qqmlpreview" - ;; These tests fail starting with 6.5.2 (see: + ;; These tests fail starting with 6.6.2 (see: ;; https://bugreports.qt.io/browse/QTBUG-116019). They ;; appear to fail because of attempting to load QML from ;; elsewhere than from QML2_IMPORT_PATH. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 25 11:49:26 2024 Received: (at 69628) by debbugs.gnu.org; 25 Mar 2024 15:49:26 +0000 Received: from localhost ([127.0.0.1]:35732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1romZi-0003SP-JL for submit@debbugs.gnu.org; Mon, 25 Mar 2024 11:49:26 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:51418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1romZg-0003S8-3H for 69628@debbugs.gnu.org; Mon, 25 Mar 2024 11:49:25 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6e6a9fafacdso3381839b3a.2 for <69628@debbugs.gnu.org>; Mon, 25 Mar 2024 08:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711381759; x=1711986559; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dQi1yvDykYYJ9HhgUPkfewwMyPbLX9h7MzwSi/+RHRA=; b=WTNJI05j0oNMPAEt+K2/XE/Fgu3F+L4sJKCs5qxoeSLJOUo3Kd5zVUe/llsjUXhNo3 0BdQfcvNPzk9vRenmgXvpxy188UXpm+6beYeGTsBksbk9qxLc1rweSz9E2FA4rtYrRp9 3FjzuZidK2Z2UYrJiWSXpg2yDYyzFW/elZ2X4e3NHFVafV3Kb/jTG6j/Bf66uSSQbIVX jvjCicKfKBronndLLt8PkPYE7WewEVvnDlHF5SCyIwYrIPGHDTBNpHzOnaXzULAUnpDy WMtl04NbC61ZjudDDAE7Ew4TMuOqKzFhV5ENegbLVIeIDwq04yoyUjQGNGyO4ar6m4UV IDEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711381759; x=1711986559; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dQi1yvDykYYJ9HhgUPkfewwMyPbLX9h7MzwSi/+RHRA=; b=X3Y1L2QscLDQLBnDVvXy9/tfE74GZsq0HSpZPKvZOQ9ifiFrUgTL3L3fARhSlUQlTl UGcWha/uTIMeFxOx5b6B2Zl6EQXKP/JEQVFExWuKbQ1rppxuisO//UFscsUz6xqnSdj9 6qYT+dnKxAZjF288Cos93LjHPDAv+F3oZJ9/Hfx6WTzKG5/8whBgWUDUaF8/tdInvIrc wupGFeN4SHVGIi9BJFuvMjJ+PLOmRZWf2RwpBu8BFsK1OLKKINVdMwS//2yg/sR1aEO9 Awwkk8kQ4IpRLaf3xvmjz3kG6uR3n/c1+zepuTNFEmVzHOl7P6Pl44cSx0hss0VSFwri 6vLQ== X-Gm-Message-State: AOJu0Yz9/8a2yb5m7VC3KGOxqBap93BrIineqWYrxgBnveozHK7cVXOe HymqMfcDAaDyxXVQK0hIY2YzRoan6M7x+hSHXiXoMziuVCZHZb6bDpd1f9w6 X-Google-Smtp-Source: AGHT+IGWoPAhs634DLlx1x4wat/xIPtUrBGRdQYhbBKSmJKlHtt2GIuN0bKVjWwhOdVPpUoyE482Jg== X-Received: by 2002:a05:6808:f8c:b0:3c3:cd30:b31d with SMTP id o12-20020a0568080f8c00b003c3cd30b31dmr3365210oiw.48.1711380118661; Mon, 25 Mar 2024 08:21:58 -0700 (PDT) Received: from hurd (dsl-156-189.b2b2c.ca. [66.158.156.189]) by smtp.gmail.com with ESMTPSA id gc15-20020a05622a59cf00b00430b9aecf7asm2689664qtb.40.2024.03.25.08.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 08:21:58 -0700 (PDT) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2. In-Reply-To: (Zheng Junjie's message of "Wed, 13 Mar 2024 16:57:54 +0800") References: Date: Mon, 25 Mar 2024 11:21:57 -0400 Message-ID: <87wmpqjq0a.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: 69628@debbugs.gnu.org, =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Zheng, Zheng Junjie writes: > Hello, This is v4 patch. Thanks for the comment. > This version should fix question, and use etc/committer.scm > And add missing python-{shiboken,pyside}-6. Thanks for the reworked series. I'm in the process of reviewing and building this locally. I'm investigating the new test failures that were skipped. It seems the SVG plugin is not found by qtdeclarative. I also found a new flaky test for qtbase, which I've reported. When done I'll push the series to qt-team, have it built, then merge to master if everything looks dandy. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 26 10:18:00 2024 Received: (at 69628) by debbugs.gnu.org; 26 Mar 2024 14:18:01 +0000 Received: from localhost ([127.0.0.1]:34393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7ck-0004wz-E7 for submit@debbugs.gnu.org; Tue, 26 Mar 2024 10:18:00 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:49206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7cf-0004wk-TT for 69628@debbugs.gnu.org; Tue, 26 Mar 2024 10:17:58 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-6962950c6bfso48629576d6.2 for <69628@debbugs.gnu.org>; Tue, 26 Mar 2024 07:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711462667; x=1712067467; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sIKnLvbxTkSc/yDaeEpEZABWDx5gwUWCrDjLRbFGDEs=; b=BnkvtnGTGkok/OTL1K+YJgoj9FNOZgGjaWIdYunnuVdSDeHCwoLa8t/BLnlC6zJ7fI b0JwZsqjA2EPkWiwn6mzeQk0p3mmSP2zEYxiY4PDqgCMLy0yUHE1t2Zv2Ht7Dt7Loacn dB+bYEgiIz53I8IipNylNXC4R9BJJiTZ8ZPBLk9s4w+AqY0qLf5wte+pEcgsSWeenDry LIOZdTFzatHR56VbjZS5LouGEcR/Gn/qFWn5L5pk8QAFptgAaWOYHwSK4AVZC5dSVUwz 269EVBM5QSycXhF6Kli4SwGqEWyklZGSSp9s5qe/2+VQm3NpaxB6XnbRTvzCmUu+6PSF WKkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711462667; x=1712067467; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sIKnLvbxTkSc/yDaeEpEZABWDx5gwUWCrDjLRbFGDEs=; b=ZqEx6jHJVgQ1gMNhx3XtQYW94j3dEMpxn/IBhkDdte9vbhROntTLPTAy1zLN51ut3E 0Md8kvgDCz9AM3BobA4KbAYyENLB2644ebzMKwJc/AnVWp4l9s0gFqpTEgs0GazI0uWI x5lavQYCP4EYkC6u7my5vqKv2EoJXcWTSGBmQY5AOGkwG2T/ODLJ9wHxF3+EutxhfGge nLuuz9Wwcl29D5nb9XWQWTxHVdrAKfnQq5FtbZ9nrvlqsgjMoACCc1mNf3SBjhuVBQtn 7/3SXtWbwKjWT4Uk9FEOGuMl7Q83tv/mxr5w8Eum9oaPsFhQj0T8otgIkPKa6H3MVc+7 hkYg== X-Forwarded-Encrypted: i=1; AJvYcCVzIeexZ/r3fw61nY4JWFkxLwJnLXdJXfG2bygZOMHFXkzaS6JIHg9BI1QWFFsiT9rljyRPbpN21FLbLoUl+PpF/lzeps8= X-Gm-Message-State: AOJu0Yyt8WQtHotUcPYERjlye9MZtjU0ecjhKFHPdLachA3D+w5HcLrM hMNnot9y/8GoX+cEgq1U3Q8uwJzsNQm1cklwDnt4ApCpLaTZ+bXILMYpaEY0WbU= X-Google-Smtp-Source: AGHT+IEOefVW4xSk0qwOTm8inulc6jiDL2BCuczbg70Jv1Y0wjtlT8wdJEN7GRAqpPaxAkA12hbgbg== X-Received: by 2002:ad4:5905:0:b0:696:a386:9ee with SMTP id ez5-20020ad45905000000b00696a38609eemr769853qvb.8.1711462667304; Tue, 26 Mar 2024 07:17:47 -0700 (PDT) Received: from hurd (dsl-150-224.b2b2c.ca. [66.158.150.224]) by smtp.gmail.com with ESMTPSA id im7-20020a056214246700b00696194e040esm5181727qvb.100.2024.03.26.07.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 07:17:46 -0700 (PDT) From: Maxim Cournoyer To: =?utf-8?B?5a6L5paH5q2m?= Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2. In-Reply-To: <87il19qp39.fsf@envs.net> (=?utf-8?B?IuWui+aWh+atpiIncw==?= message of "Tue, 26 Mar 2024 18:12:10 +0800") References: <87cyrhk7s5.fsf@gmail.com> <87il194k0v.fsf@iscas.ac.cn> <87il19qp39.fsf@envs.net> Date: Tue, 26 Mar 2024 10:17:45 -0400 Message-ID: <874jctjcvq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: 69628@debbugs.gnu.org, Zheng Junjie X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, =E5=AE=8B=E6=96=87=E6=AD=A6 writes: > Zheng Junjie writes: > >> Maxim Cournoyer writes: >> >>> Hi Zheng, >>> >>> For your information, I've this series (with some light changes, mostly >>> annotating new test failures with upstream reports I've prepared) to the >>> 'qt-team' branch, and re-enabled the qt-team job specification from >>> Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team >> >> Does it look like qt-team job is not compiling? > > I changed period for the qt-team jobset to 600, and it success trigger a > job to commit 4ef8806 now. Thank you! --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 26 10:26:13 2024 Received: (at 69628) by debbugs.gnu.org; 26 Mar 2024 14:26:13 +0000 Received: from localhost ([127.0.0.1]:34403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7ki-0005Fu-TM for submit@debbugs.gnu.org; Tue, 26 Mar 2024 10:26:13 -0400 Received: from mail.envs.net ([5.199.136.28]:60208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7ke-0005Fg-W7 for 69628@debbugs.gnu.org; Tue, 26 Mar 2024 10:26:11 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id A7DCB38A301D; Tue, 26 Mar 2024 10:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1711447896; bh=u4cVgWRBE+uLjFpwxtRzhm9LtELaDSFEtE9o4Wn6Rgw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=c2Vi/r+MAKdrkLQpE6DpUn9NVIAr0lsEgTekG+J7yiLkGREKa79dtUNMcWSrezAKW mBSvCa1W6xywe56ZdYNUKOUd8i6dSzgIxNbK9RBhVh2ERLI1PJciE2AfVApMDSjEvK B/qpuWCF5fig06R0jg+Ro8MSDWeGkA9KkaRv2Xglu30SasKhSZn1dMgdGbJXKMivUL cpkrTRNhVBSZIr9GqeV/mUjghagG260+eBVcsn7+qcDUHdLwq7n8DqnWNEYWCidyZh 5Zf9MBBMC6kT5BrC+CaA9mEt7YP7xd7bH/dZYJbSFWof3Z6IbEIrnYdy31fSFKPM5V 7GF5mQGdF36me3x+2XevD7zVwH3ecGrzL6EaJk5whNZ6p2cT21mkVbNLhAmrciYU+8 a/J6OoDb9z9gFiqgRzC8tJPg3i2ecpetDRFO1vLLAmj1FLhoP1a9SW3rERNDjfUNZX TtXSxirnt5bHn33vfhr2sQ+GQyGnipYyJlj79lAqvdMyNdr4zBdBIH3j2oa6RqRg5B 03aPFQxzy22HwpF2rFIfG8bTwKehfr0U887ic77nwK0f4y2vsEDRI/nkpdc3ee+FlW /SIYK+GcQgeyhHdn9Li7wdfj6bSSqljZ8aHGC3fHW+noMxKBB2x5YrbC8wP9s7RbDj w2Eg54wakOohPgaMDSRXlR40= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4cnKJCdrB5Ei; Tue, 26 Mar 2024 10:11:31 +0000 (UTC) Received: from localhost (unknown [36.170.45.227]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 26 Mar 2024 10:11:30 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 11d4ef6e; Tue, 26 Mar 2024 10:12:10 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: Zheng Junjie Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2. In-Reply-To: <87il194k0v.fsf@iscas.ac.cn> (Zheng Junjie's message of "Tue, 26 Mar 2024 13:49:55 +0800") References: <87cyrhk7s5.fsf@gmail.com> <87il194k0v.fsf@iscas.ac.cn> Date: Tue, 26 Mar 2024 18:12:10 +0800 Message-ID: <87il19qp39.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: 69628@debbugs.gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Zheng Junjie writes: > Maxim Cournoyer writes: > >> Hi Zheng, >> >> For your information, I've this series (with some light changes, mostly >> annotating new test failures with upstream reports I've prepared) to the >> 'qt-team' branch, and re-enabled the qt-team job specification from >> Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team > > Does it look like qt-team job is not compiling? I changed period for the qt-team jobset to 600, and it success trigger a job to commit 4ef8806 now. From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 26 10:28:23 2024 Received: (at 69628) by debbugs.gnu.org; 26 Mar 2024 14:28:23 +0000 Received: from localhost ([127.0.0.1]:34408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7mo-0005K2-N3 for submit@debbugs.gnu.org; Tue, 26 Mar 2024 10:28:22 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:47185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp7mj-0005Jl-Kx for 69628@debbugs.gnu.org; Tue, 26 Mar 2024 10:28:21 -0400 Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3bbbc6b4ed1so3204405b6e.2 for <69628@debbugs.gnu.org>; Tue, 26 Mar 2024 07:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711463292; x=1712068092; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=HDpa91o4vQIxdOMPMF4Jkp57jAS2DtqLzudnMijwQvY=; b=hVGcAV90+O0J2RvVecP3zIG5AKxyf956oa7RUQtLIREZq0ugKTjK6tcDa5c2Hy7apZ Jr234Oo6STJe6QOuBLJ/GB2ZL+6JmQgt1dm+4OagJQEM1cr0tSHqafwoSQ5Mo9OVd3LQ NklRcXRVw0QI+JE2Bspl1tVQU9nGMifeND+o3Aq9AwpR37LbteSgnJDh2yoBCD2qKYPg ngeMYBc5Stz56fjveuHZWEshXsHWdMhKsCxlqavHCJBZ6uimrYlwjwGgTt6kG5lV/9BE p6XXsqtVFuYSKeBcFRqr3+UAjIy8guF4jpxtXeoHIPK648gTcfQnwkuaLN/1aNW+BPFM 2Dfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711463292; x=1712068092; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HDpa91o4vQIxdOMPMF4Jkp57jAS2DtqLzudnMijwQvY=; b=S0gSuLFTp5tKTtY/VLIO59VNP/4y+Hb3G9/7cd4aR9i+/heTbuDVCgIOq0oCqSq/ml 3z7x5srYrQ6bVxnOa8VdiDK/P4KsM7tVyLd9usYrDdXb8NnqgWnbusFRXCsKDH8Gkd8C Ow25Du2MYCsGQZZASqYu1SxQh+MoW7ytkxstjEcuh+wWVRIARlD/LNKQvXyTyizXF/yk Gz/oVH9eXSAgrHirzdKD23To/ERtXSsaSaTNTfDpXDQIHt8xLQ0n/KAgBWIvZ5uenRQ5 DBUL3XbziD3F7+mjgqpzE8QWsrJu8XgjmLhv/WWDrR8rM9SQBOt659IwfVQlL82/5l5R AAMw== X-Gm-Message-State: AOJu0YzEgJmhIoi0yzj42+f6rfTsNKTarcBZVgzrFmij/aJZ57q2Veu+ 6HoizPTYrk8j0SPlJzg3OdSvJcIXQ0spvFbE+WRuDMVZt0d4x6yTJha/rFUi X-Google-Smtp-Source: AGHT+IFFGMl7Au85vATIXFocYK3/daf1EcX9eSzJYI2S96hNZya9ScYTRzg88jslLGL+0iWN61F4Dw== X-Received: by 2002:a05:620a:120c:b0:78a:4815:ceeb with SMTP id u12-20020a05620a120c00b0078a4815ceebmr17650qkj.61.1711422620531; Mon, 25 Mar 2024 20:10:20 -0700 (PDT) Received: from hurd (dsl-156-189.b2b2c.ca. [66.158.156.189]) by smtp.gmail.com with ESMTPSA id j6-20020a05620a146600b0078a1bcdf0d0sm2664361qkl.101.2024.03.25.20.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 20:10:19 -0700 (PDT) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2. In-Reply-To: (Zheng Junjie's message of "Wed, 13 Mar 2024 16:57:54 +0800") References: Date: Mon, 25 Mar 2024 23:10:18 -0400 Message-ID: <87cyrhk7s5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628 Cc: 69628@debbugs.gnu.org, =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Zheng, For your information, I've this series (with some light changes, mostly annotating new test failures with upstream reports I've prepared) to the 'qt-team' branch, and re-enabled the qt-team job specification from Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team We'll have to wait a bit to see how it built and if there is any collateral damage. If not, we can create an issue to request merging the branch per (info guix --index-search='merge requests'). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 09:08:20 2024 Received: (at 69628) by debbugs.gnu.org; 27 Mar 2024 13:08:20 +0000 Received: from localhost ([127.0.0.1]:36127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpT0t-0003nz-NM for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:08:20 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:35162 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpT0n-0003n3-Cr for 69628@debbugs.gnu.org; Wed, 27 Mar 2024 09:08:17 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-01 (Coremail) with SMTP id qwCowACnrKgwGgRmn0VVCQ--.11022S2; Wed, 27 Mar 2024 21:08:02 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH 1/2] gnu: python-sip: Update to 6.8.3. Date: Wed, 27 Mar 2024 21:07:57 +0800 Message-ID: <9e80e2972a2bfbabd20cc8ef3c96d886271debe4.1711544878.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: qwCowACnrKgwGgRmn0VVCQ--.11022S2 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFWfuFyrWFW8JFW3Jry7Wrg_yoW8XrW5pF s5Cw15Ca1rKr18Jw4kGw1293W5XFs7tayFka17Aa1UCa1jv3yUWryayFZ8WrnrJryxu3Wj gF18X3W5WFyrAFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUy2b7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j 6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jOb18UUUUU= X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/qt.scm (python-sip): Update to 6.8.3. [build-system]: Switch to pyproject-build-system. [propagated-inputs]: Add python-tomli. Remove python-toml, python-ply. Change-Id: I03fcec79a8124a545c9bb5fcfe0d0bb9de88434e --- gnu/packages/qt.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 86a8eed33e..8b0371681c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3737,7 +3737,7 @@ (define-public pyotherside-for-qt5 (define-public python-sip (package (name "python-sip") - (version "6.7.7") + (version "6.8.3") (source (origin (method url-fetch) @@ -3747,13 +3747,14 @@ (define-public python-sip "/sip-" version ".tar.gz"))) (sha256 (base32 - "1qm9q9lhfky5zvxxkssf4zdfv5k1zikji4hz80d48vdfm1pw1sfy")) + "0b3n237lbggz3b6bfmdsl1m4qgai7qyyj6fmvrmc695v32q4g1c8")) (patches (search-patches "python-sip-include-dirs.patch")))) - (build-system python-build-system) + (build-system pyproject-build-system) (native-inputs (list python-wrapper)) (propagated-inputs - (list python-toml python-packaging python-ply)) + (list python-tomli + python-packaging)) (home-page "https://www.riverbankcomputing.com/software/sip/intro") (synopsis "Python binding creator for C and C++ libraries") (description base-commit: cd32d5b66ea0440644e480fa7733243a42438fa7 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 09:08:20 2024 Received: (at 69628) by debbugs.gnu.org; 27 Mar 2024 13:08:20 +0000 Received: from localhost ([127.0.0.1]:36129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpT0u-0003o1-1k for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:08:20 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:35164 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpT0n-0003n5-Ds for 69628@debbugs.gnu.org; Wed, 27 Mar 2024 09:08:17 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-01 (Coremail) with SMTP id qwCowACnrKgwGgRmn0VVCQ--.11022S3; Wed, 27 Mar 2024 21:08:03 +0800 (CST) From: Zheng Junjie To: 69628@debbugs.gnu.org Subject: [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1. Date: Wed, 27 Mar 2024 21:07:58 +0800 Message-ID: <55d5d12676ccb101c9c19aaca673e445af5f11b3.1711544878.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9e80e2972a2bfbabd20cc8ef3c96d886271debe4.1711544878.git.zhengjunjie@iscas.ac.cn> References: <9e80e2972a2bfbabd20cc8ef3c96d886271debe4.1711544878.git.zhengjunjie@iscas.ac.cn> MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-CM-TRANSID: qwCowACnrKgwGgRmn0VVCQ--.11022S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw1ftFy3Zr4DArW5Wr1fXrb_yoWDXrg_AF 97Xr1IyrWxZF1jgayFkF1vyryruF1Dur4qgF17tr97KF13Wr43XFnrWryxJF1rGa10yFn3 Arsakr9xWFW29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb38YjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x02 67AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I 80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj c4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4 AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE 17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMI IF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4l IxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWI evJa73UjIFyTuYvjxU4OJ5UUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69628 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/qt.scm (python-pyqt-6): Update to 6.6.1. Change-Id: Ie2de2267eca8a164a3bda86c69b41b9371d758a1 --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8b0371681c..841a8b4fd3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3882,14 +3882,14 @@ (define-public python-pyqt (define-public python-pyqt-6 (package (inherit python-pyqt) - (version "6.5.2") + (version "6.6.1") (source (origin (method url-fetch) (uri (pypi-uri "PyQt6" version)) (file-name (string-append "PyQt6-" version ".tar.gz")) (sha256 - (base32 "100jh1iiz5gx821qzgicfrqv7hjjj98pchdbc1nvdzzra1ryx1ql")))) + (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz")))) (inputs ;Qt5 dependencies only in python-pyqt: ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns. (list python-wrapper -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 29 22:34:56 2024 Received: (at 69628-done) by debbugs.gnu.org; 30 Mar 2024 02:34:56 +0000 Received: from localhost ([127.0.0.1]:43683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqOYZ-0002va-JN for submit@debbugs.gnu.org; Fri, 29 Mar 2024 22:34:56 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:42408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqOYX-0002ur-3B for 69628-done@debbugs.gnu.org; Fri, 29 Mar 2024 22:34:54 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-6963c0c507eso23992856d6.1 for <69628-done@debbugs.gnu.org>; Fri, 29 Mar 2024 19:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711766085; x=1712370885; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=YCX53Qi72K5y2CQ1Eh6l25RpM5vI/K/S9piyp4oppsI=; b=ahgPzYFRU0o4cIeaqjPkNy6TkxxXvtutzZtLxgx1zknVwTwtZBPTBE0HVTkhKEsio+ cfbRbayGqYBq2vTDxSJ/NfCjNvK8SL5ZXSt1rEvwt7yJ+Tv3/MMDxBrq7OYTK167FaIB KMZRVfMSjQHqYkv+AMf8AT5P5rpUsFBEgDq1WMJEhMghcIa9MGiWgFKABxn8RD/uKMCy o8Jgz3TN8hdUfKxu2eqV2uDYV5e91QFehB3zY9ha8aSKi0jVRXS+KnhG65kxto6xhO3R xO53+wSj7Gcfru76qxLSwl8R1AZq90qfjznkEidE8HEw3alenHw0shyHYL5lAmhXQd7W CJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711766085; x=1712370885; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YCX53Qi72K5y2CQ1Eh6l25RpM5vI/K/S9piyp4oppsI=; b=R1Xg5XgOedjQDqn4l6YYxWPLHv0GIvkfAj7MRVdJcTdfVkw22CwurT8Np2mGbysKcy oU2+B6JfMZnvQw7xZmH3WvgGEZIdAslIgKbsaC6op4GBY97UO0fiucO1Ef65tDCRWGoi P5PEmkQupKSDVqbKUmBIlekxH4XwXYYhMoWru7Ba3Mo53Yw2wBoOoET07iEOpAXjoyLo 9+0Bhs07GMKKpRRYLE1ne1+UyfQ2A13l6LJPaj/IzS9WQ74Wc4sedQwmwx8TuJrvPZfd tUt8qjJlcmU2wY4SZOPgEpE0ecZgZOC3OBkEePzEnxsKnLoI2tDpFwbnH9jXc5oiR6Ej A1VA== X-Gm-Message-State: AOJu0YyB/Sgsv5v+MLHH+y6WAyS7xwWmWi7UE3it7JYtSe6QbRMmZImN uYbJYS6cWkjn2p2uBwKpq812z1AC3AAzbd7we6DbG+elWqi8jrPR97QBiry4Uds= X-Google-Smtp-Source: AGHT+IH2Jvs6ivzgJM/UDTP6d+PguLXNZ0jkHX7oOOyStA4OjlpxbfWpVWFwDroo3z8/t1pU5X3VyA== X-Received: by 2002:a05:6214:174a:b0:691:3cf5:b7ad with SMTP id dc10-20020a056214174a00b006913cf5b7admr7228677qvb.12.1711766085513; Fri, 29 Mar 2024 19:34:45 -0700 (PDT) Received: from hurd (dsl-10-141-225.b2b2c.ca. [72.10.141.225]) by smtp.gmail.com with ESMTPSA id gd21-20020a05622a5c1500b00432d1c9b8eesm36443qtb.64.2024.03.29.19.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 19:34:44 -0700 (PDT) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#69628] [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1. In-Reply-To: <55d5d12676ccb101c9c19aaca673e445af5f11b3.1711544878.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Wed, 27 Mar 2024 21:07:58 +0800") References: <9e80e2972a2bfbabd20cc8ef3c96d886271debe4.1711544878.git.zhengjunjie@iscas.ac.cn> <55d5d12676ccb101c9c19aaca673e445af5f11b3.1711544878.git.zhengjunjie@iscas.ac.cn> Date: Fri, 29 Mar 2024 22:34:43 -0400 Message-ID: <87a5mgzbuk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69628-done Cc: 69628-done@debbugs.gnu.org, =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Zheng Junjie writes: > * gnu/packages/qt.scm (python-pyqt-6): Update to 6.6.1. > > Change-Id: Ie2de2267eca8a164a3bda86c69b41b9371d758a1 > --- > gnu/packages/qt.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm > index 8b0371681c..841a8b4fd3 100644 > --- a/gnu/packages/qt.scm > +++ b/gnu/packages/qt.scm > @@ -3882,14 +3882,14 @@ (define-public python-pyqt > (define-public python-pyqt-6 > (package > (inherit python-pyqt) > - (version "6.5.2") > + (version "6.6.1") > (source > (origin > (method url-fetch) > (uri (pypi-uri "PyQt6" version)) > (file-name (string-append "PyQt6-" version ".tar.gz")) > (sha256 > - (base32 "100jh1iiz5gx821qzgicfrqv7hjjj98pchdbc1nvdzzra1ryx1ql")))) > + (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz")))) > (inputs ;Qt5 dependencies only in python-pyqt: > ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns. > (list python-wrapper I've applied these two to the qt-team branch. Closing. -- Thanks, Maxim From unknown Wed Jun 25 02:09:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 27 Apr 2024 11:24:33 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator