From patchwork Wed Sep 13 16:58:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53787 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 40ED127BBE9; Wed, 13 Sep 2023 17:59:16 +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 AECFA27BBE2 for ; Wed, 13 Sep 2023 17:59:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgTCi-0002aO-5S; Wed, 13 Sep 2023 12:59: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 1qgTCb-0002SO-W4 for guix-patches@gnu.org; Wed, 13 Sep 2023 12:58:59 -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 1qgTCb-0004rj-NM for guix-patches@gnu.org; Wed, 13 Sep 2023 12:58:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgTCg-0002Sj-D7; Wed, 13 Sep 2023 12:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65922] [qt-team PATCH 1/4] gnu: qtbase: Do not capture Python (again). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Sep 2023 16:59: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 , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 65922-submit@debbugs.gnu.org id=B65922.16946243319426 (code B ref 65922); Wed, 13 Sep 2023 16:59:02 +0000 Received: (at 65922) by debbugs.gnu.org; 13 Sep 2023 16:58:51 +0000 Received: from localhost ([127.0.0.1]:35841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgTCT-0002Rg-Bs for submit@debbugs.gnu.org; Wed, 13 Sep 2023 12:58:51 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:54493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgTCK-0002RE-FU for 65922@debbugs.gnu.org; Wed, 13 Sep 2023 12:58:47 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-655cee6f752so365766d6.0 for <65922@debbugs.gnu.org>; Wed, 13 Sep 2023 09:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694624309; x=1695229109; 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=qAf92JelB4PDVyacHvCNSAbgjfRCxpxhdNloRvYDPwo=; b=N+40NI1OmRv4U6ih9i3OWrjz36E4U8KKh8Enh4n+BwJoWAB1lx6G7hacNCF28jbYIU 4/O4BXn5nYMVBy/FgsmuTt/m7FEIyvpL9Lp1gEKpmo/En4wMiy7bBSILQdIZ0g0D3jbK tokJrjLQzpNsvNYe8kpL0JJca62LtzLU5eD9xwEff7Zv58jTxCMmkauWkNFAuf0ny76p ZX/pWoGXEFi57ZUX+15leXTQjV407njW7wxwhg8pctEgNDoznsgA9mlU+556MAWfatBe EJPUNryGwuRM+80HFNcLvdvWHemwR7iixsWx+FV1VF5bdKononmVzYOzsdqioMaxXrB2 itzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694624309; x=1695229109; 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=qAf92JelB4PDVyacHvCNSAbgjfRCxpxhdNloRvYDPwo=; b=nl6eYmiZ6ZOwTQqFkROZEp5eZan69qLIuch7W/zGSSx9yl9Nmf7Wh246I5MKXy8OLJ 92BNPJE+HWNTVTW2hSo7wBXE4ea8kMdXd+SjWm3wL2DrC0NB6HrzHBxokAc6OnNBRbqx QjodGCbmX76FjGULwx/yIoL5jDIxeb1oFTMskCCNUWKgNoGNge2Ap+0IWJXiN43SjE60 qttb/Sgg48eY1NHEEwPbFLLQ/OGRrq/N3vENjv+BOjQYV8st2TK0SD8Y8fmdAdava0uN Uk5OABl3Iz+U9/RxtkvoyRhxsZAChjyTYakvZj/EuKZ5egM/fbwfXYHNGnWcW5K6YTXc KrPA== X-Gm-Message-State: AOJu0YxE8oUSD76in6AHPpe9MDblyX3fhlRK/s5QhIsCdNwUvTmp/eid ghumbUK+OxeXpvq0VYU/IqDH8c4sYys= X-Google-Smtp-Source: AGHT+IFrhjcZ2FCp+NmbcAWXTuB7DCgdWamTCYHmFElYmJJlRfmQfaxWwfsQtxU8APZ5uMcy5pAGYw== X-Received: by 2002:a05:6214:459d:b0:651:679b:d35f with SMTP id op29-20020a056214459d00b00651679bd35fmr3305072qvb.43.1694624309262; Wed, 13 Sep 2023 09:58:29 -0700 (PDT) Received: from localhost.localdomain (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id d13-20020a0cf0cd000000b0063fbfbde4adsm4526644qvl.129.2023.09.13.09.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:58:28 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 13 Sep 2023 12:58:21 -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. --- Changes in v2: - Also apply fix to qtbase-5 package. 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