From patchwork Wed Sep 18 01:43:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 68049 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C23F527BBE9; Wed, 18 Sep 2024 02:47:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 822F727BBE2 for ; Wed, 18 Sep 2024 02:47:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqjmR-0004mK-0H; Tue, 17 Sep 2024 21:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqjmL-0004gF-RC for guix-patches@gnu.org; Tue, 17 Sep 2024 21:46:49 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sqjmL-0008Ki-GD for guix-patches@gnu.org; Tue, 17 Sep 2024 21:46:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZSF9K9e/VSKSV8usccXsav9DECPqh9IDl7TN6BRtbsE=; b=r71maEAFn6QfMAu6ZxWKPxKnV72g8eYdf1aKg3OIs0KrzUOwhQLH333ZSOtncPB1Fzh63E0hI0/aMkG5YBkgR2tCsZJ7Hfy4fiLtbjsb78OawZqhRAfUFhUmYMJv3mFIqfy2GJOmYu8FwIhsrDYDhnCn4c8sTWkxemZSIykyyjaDb6y17IEK/t8A/khpRWmHymMJ3D2SJAE3w2VRrdR7n2heE1t0FlSAQneCox5wRhNMS2O5tkRyfzVvlXLXUBLWO/yGmfXRUx1l9oQUNkC3UxN7pPS5ZydxH6i/MiJ1L9mDQeKcvpEHMzubVpGp40w49mHT0oRSfAE2WXIwIxWB7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqjma-0004Eh-Pv; Tue, 17 Sep 2024 21:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72835] [PATCH qt-team v2 23/74] gnu: qt-creator: Update to 14.0.1. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 18 Sep 2024 01:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72835@debbugs.gnu.org Cc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 72835-submit@debbugs.gnu.org id=B72835.172662399216096 (code B ref 72835); Wed, 18 Sep 2024 01:47:04 +0000 Received: (at 72835) by debbugs.gnu.org; 18 Sep 2024 01:46:32 +0000 Received: from localhost ([127.0.0.1]:56403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqjm3-0004BY-JS for submit@debbugs.gnu.org; Tue, 17 Sep 2024 21:46:31 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:57740 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqjm0-0004Am-Tq for 72835@debbugs.gnu.org; Tue, 17 Sep 2024 21:46:29 -0400 Received: from m.tailaa68d.ts.net (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowABHTn7QMOpmRJVWBA--.240S5; Wed, 18 Sep 2024 09:46:05 +0800 (CST) From: Zheng Junjie Date: Wed, 18 Sep 2024 09:43:05 +0800 Message-ID: <7f9bb1202d6ff416c5879b6f4affdd6116a441f5.1726567073.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABHTn7QMOpmRJVWBA--.240S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tw1DWFW8Cr43Jw1rWF4Durg_yoW8Zrykpa yfAwn7WF48KFyrJws3KF4Iyw13WF4xXFWvvw4xZw43tw15Ar97XryakFW5uFnxXayxJayU WFy8K3WUWF1fGrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9qb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2 jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUqNeoUUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qt-creator): Update to 14.0.1. [source]: Adjust snippet. [arguments]<#:phases>: adjust patch-paths phase. Change-Id: Ideafcf3a7c0ce9c85025472d41fb72527cc4b9fb --- gnu/packages/qt.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c8fd0ae5c7..83dc8519a9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5558,7 +5558,7 @@ (define-public clazy (define-public qt-creator (package (name "qt-creator") - (version "12.0.2") + (version "14.0.1") (source (origin (method url-fetch) (uri (string-append @@ -5575,13 +5575,21 @@ (define-public qt-creator ;; Marketplace recommends nonfree extensions; ;; remove it. "src/plugins/marketplace")) + ;; qt-creator installation attempts to install the + ;; yaml-cpp LICENSE file, but we removed the bundled + ;; yaml-cpp, so create an empty file to allow it to + ;; install properly. + (mkdir-p "src/libs/3rdparty/yaml-cpp") + (call-with-output-file "src/libs/3rdparty/yaml-cpp/LICENSE" + (lambda (port) + (const #t))) (substitute* "src/plugins/CMakeLists.txt" (("add_subdirectory\\(marketplace).*") "")) (substitute* "src/plugins/plugins.qbs" ((".*marketplace/marketplace.qbs.*") "")))) (sha256 (base32 - "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22")))) + "0zc9z4zzypqd1q49p4ckwbgxqcnnsc11jgsys6wli1ppmvzmn2zn")))) (outputs '("out" "debug")) (build-system qt-build-system) (arguments @@ -5631,7 +5639,7 @@ (define-public qt-creator "src/libs/utils/deviceshell.cpp") (("/bin/sh") (search-input-file inputs "bin/sh"))) - (substitute* "src/libs/utils/process.cpp" + (substitute* "src/libs/utils/qtcprocess.cpp" (("/usr/bin/env") (search-input-file inputs "bin/env"))) (substitute* '("tests/auto/utils/process/tst_process.cpp"