From patchwork Tue Jul 25 00:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52180 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 D3D2227BBEA; Tue, 25 Jul 2023 01:19:36 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 795A827BBE2 for ; Tue, 25 Jul 2023 01:19:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qO5le-0004Xw-1T; Mon, 24 Jul 2023 20:19:10 -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 1qO5lc-0004Xn-Aw for guix-patches@gnu.org; Mon, 24 Jul 2023 20:19:08 -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 1qO5lc-0005Yy-2g for guix-patches@gnu.org; Mon, 24 Jul 2023 20:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qO5lV-0003gc-VD; Mon, 24 Jul 2023 20:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64841] [PATCH] gnu: python-shiboken-6: Remove inherited workaround. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 25 Jul 2023 00:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64841 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64841@debbugs.gnu.org Cc: Hilton Chain , Formbi , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.169024428314102 (code B ref -1); Tue, 25 Jul 2023 00:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2023 00:18:03 +0000 Received: from localhost ([127.0.0.1]:44355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO5kZ-0003fN-HT for submit@debbugs.gnu.org; Mon, 24 Jul 2023 20:18:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO5kV-0003er-MS for submit@debbugs.gnu.org; Mon, 24 Jul 2023 20:18:02 -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 1qO5kQ-0004On-4l for guix-patches@gnu.org; Mon, 24 Jul 2023 20:17:54 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qO5kO-0005R0-Fb for guix-patches@gnu.org; Mon, 24 Jul 2023 20:17:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1690244001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=y7sSz2trWlVpCq5zHFbO2CFsPvtafEfRI35y/zrcwmg=; b=lgOgyBZzp38nBMcCAKtvxR2y2Sy6/xER3aoz0ir+G3HoxxFw84ghxuCriSA+j+EekJCVMM X1F9A+6iAfTHnscFlkB7Hhy0HyQMw5VpbTxC3SjB5qmh8V8Csudy4o3bsp0Fror7IX7K9X nWuZpey+twt4TXpXRmLFX8vw4NL3XqeFOa33MrimAn7cp+r+K+UGj1gfNR/d5Wjv3aoMrD TTPHjOdcXnXfp8xdOxTbCDJohYmmn1i/XRdzoIlWMjFdGZA4SSMsGMZbYtIrO1aR2YhxhF pqjAObYn6wlo/Y9CeYL4iCV9dwo6wUug0XusVD5qvBSdl934cPMYQ9N3Ny7UHA== Date: Tue, 25 Jul 2023 08:16:11 +0800 Message-ID: MIME-Version: 1.0 X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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: . The importlib workaround inherited from python-shiboken-2 is not required for building python-pyside-6, and will cause a build issue on the identation. * gnu/packages/qt.scm (python-shiboken-6)[arguments]<#:phases>: Delete 'workaround-importlib-error. Reported-by: Formbi --- gnu/packages/qt.scm | 1 + 1 file changed, 1 insertion(+) base-commit: 76e041f9eef85bb039c5251d3350c62ee2066883 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a79338f84e..e8654eee44 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4005,6 +4005,7 @@ (define-public python-shiboken-6 (substitute-keyword-arguments (package-arguments python-shiboken-2) ((#:phases p) #~(modify-phases #$p + (delete 'workaround-importlib-error) (replace 'use-shiboken-dir-only (lambda _ (chdir "sources/shiboken6"))))) ((#:configure-flags flags)