From patchwork Wed Sep 13 17:33:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53792 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 A467927BBEC; Wed, 13 Sep 2023 18:35:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CFEF027BBE2 for ; Wed, 13 Sep 2023 18:35:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgTlX-00085Q-Pl; Wed, 13 Sep 2023 13:35:04 -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 1qgTlV-000839-7V for guix-patches@gnu.org; Wed, 13 Sep 2023 13:35:01 -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 1qgTlU-0007r8-VM for guix-patches@gnu.org; Wed, 13 Sep 2023 13:35:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgTlW-000628-Nv; Wed, 13 Sep 2023 13:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH v2 1/4] gnu: qtbase: Do not capture Python (again). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Sep 2023 17:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65922@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.169462646723106 (code B ref 65922); Wed, 13 Sep 2023 17:35:02 +0000 Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 17:34:27 +0000 Received: from localhost ([127.0.0.1]:35910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgTkw-00060a-Pk for submit@debbugs.gnu.org; Wed, 13 Sep 2023 13:34:27 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:53441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgTku-000607-7C for 65922@debbugs.gnu.org; Wed, 13 Sep 2023 13:34:24 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-76ef935abaeso5507385a.2 for <65922@debbugs.gnu.org>; Wed, 13 Sep 2023 10:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694626453; x=1695231253; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=szRhqIY7GU9Kvyu33izFUWxTrCXBLF7VOUD3PPk+BeM=; b=osKxVdGV59kuouEExawLPHFHgQugcsmW7hiqXRXxijyIbuw5JtGkXT/wiPZ0qoP5+8 zpxzCn5bBrE0Q3YIRgOdd10UYRak2vw0/k7GrxBagwNdcJSOkHoHrq6cMDE9IygBNOSt Fw4nUFnW17nBRcVrLKlcePbcS/bImVIkQXT5oQfIAX3AaAcLebGooxucDFvVtnyPOlUe z9FxFCXQB75d37gFKMIsLaiM76TKhRkrs1OMwuqzhvsUWGx1IDQK3+f1TfQXzCkr2J3R hHBDuegpMM8wvtYQa6IGxMfuCl5CN1pfFBgog4pBtAsVlDuwe+1kVF8CDPksjMO4d1La Xa6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694626453; x=1695231253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=szRhqIY7GU9Kvyu33izFUWxTrCXBLF7VOUD3PPk+BeM=; b=cIBW5hcG8KXJqbBixXucEIswT9YFAs9Rok2fjFO7J7dOOXwQuufDFk3FHeX7C8Ufmb Uv7JYp5JTW8AuKyMR53u3ye9rLC8YtF0YnPnViwMM8rH+0hqXmOpcDvXOqbWmvR5FB1c mVg/MOZ1DHDYtSgKQn/RU/BSV4pUk6aB/ryo7mDHxvi7eSiSNjDucO9iZHm5y7pefpb5 /vtzCv6ZlCirs41vRQaeRLB5G7T75Jt1caRHlp50k44xP/Qen0R0XcgWIJAB40R/cQrb fy0edvbynQXcaajnFgSbpPidXJp08JM8ZEu5H+xzMYKb6WCInwqQP1sgAylm9sqZb7A6 4oDw== X-Gm-Message-State: AOJu0YwVHe1cB3xqOdGzZ3eYLpJxJypckzEteLgFiYBzChBOF7MQrbpe BVUXpPhoQBbtRhdeSirTutlvuNvNBO8= X-Google-Smtp-Source: AGHT+IEuhi6bJFKmbuP58RLvw7aVFF5LgAvucpSZ0vScxINnchyjJANOK51GmOz3faKKrvrLLI+K6g== X-Received: by 2002:a05:620a:a03:b0:767:954:a752 with SMTP id i3-20020a05620a0a0300b007670954a752mr2904718qka.73.1694626453113; Wed, 13 Sep 2023 10:34:13 -0700 (PDT) Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id d5-20020a05620a136500b0076f206cf16fsm4035194qkl.89.2023.09.13.10.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 10:34:12 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 13 Sep 2023 13:33:13 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 Fixes . * gnu/packages/qt.scm (qtbase-5) [arguments]: Add #:disallowed-references argument to guard against the problem reoccurring in the future. Add do-not-capture-python phase. (qtbase) [arguments]: Update do-not-capture-python phase. --- (no changes since v1) gnu/packages/qt.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b7e394d663c..a158f8114fe 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -392,7 +392,7 @@ (define-public qtbase-5 fontconfig freetype glib - gtk+ ;for GTK theme support + gtk+ ;for GTK theme support harfbuzz icu4c libinput-minimal @@ -437,7 +437,8 @@ (define-public qtbase-5 vulkan-headers ruby-2.7)) (arguments - `(#:configure-flags + `(#:disallowed-references ,(list python) + #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list "-verbose" "-prefix" out @@ -583,7 +584,16 @@ (define-public qtbase-5 (("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b) (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)) (("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))))))) + (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))))) + (add-after 'install 'do-not-capture-python + (lambda* (#:key outputs #:allow-other-keys) + ;; For some reason, patching the file after the + ;; patch-source-shebangs phase doesn't work for Qt 5. + (substitute* + (search-input-file + outputs "lib/qt5/mkspecs/features/uikit/devices.py") + (((which "python3")) + "/usr/bin/env python3"))))))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH") @@ -724,10 +734,12 @@ (define-public qtbase (substitute* "src/corelib/CMakeLists.txt" (("/bin/ls") (search-input-file inputs "bin/ls"))))) + (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ (substitute* '("mkspecs/features/uikit/devices.py" - "util/testrunner/qt-testrunner.py") + "util/testrunner/qt-testrunner.py" + "util/testrunner/sanitizer-testrunner.py") (((which "python3")) "/usr/bin/env python3")))) (replace 'configure