From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QJxGHqdTRmSW6AAASxT56A (envelope-from ) for ; Mon, 24 Apr 2023 12:02:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OIRmHqdTRmSYuwAA9RJhRA (envelope-from ) for ; Mon, 24 Apr 2023 12:02:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4203A2A899 for ; Mon, 24 Apr 2023 12:02:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqt1Q-0005FL-E1; Mon, 24 Apr 2023 06:02:12 -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 1pqt1J-00059e-Mj for guix-devel@gnu.org; Mon, 24 Apr 2023 06:02:09 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqt1H-0004zm-Pk for guix-devel@gnu.org; Mon, 24 Apr 2023 06:02:05 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 13D1F184F2B; Mon, 24 Apr 2023 10:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682330517; 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: in-reply-to:in-reply-to:references:references; bh=TLkY0cPCg/nz7bZPSH+XV7DGm12iklo5UeWhu5n9ad4=; b=JnECOWL5iRjjker4I90URjrxxddNpV1+ECyk2/5dW3IdtysUh768kdHRn7fTYuuT5FGip5 djAQi2NaQw4gyxpJ5FOIC7zG56lkzAxkDp/bzKGOC4yS11akAg7NFTsNMpaTugyi+H7Dyd UCxJn75wePbr+pNQ1EqyBx+hLGF2Ytx9RdY+4mCr+1cN2bsrRIRyT3mG2UEUTOQQzinKJE GhoUlJYljAAzNSADyH10YvJ2q3hyYvhZClXh2z4N50Ylr2TrW2xfq3p4SymZb14p97m5ft HqPWx7dkG+V+WAbbUAR4m32q1G0hwmG5JQES9RUzYrpa5v0jlayXAYhP+LSjdg== From: Josselin Poiret To: Josselin Poiret , John Kehayias , Guillaume Le Vaillant Cc: Andreas Enge , guix-devel@gnu.org Subject: [PATCH] gnu: python-shiboken-2: Do not rely on _Py_Mangle being available. Date: Mon, 24 Apr 2023 12:01:51 +0200 Message-Id: <1ae76f128cba0775de2e2a4a2f4b05d23d44ca37.1682330511.git.dev@jpoiret.xyz> In-Reply-To: <87o7ndvbu5.fsf@jpoiret.xyz> References: <87o7ndvbu5.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz 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_PASS=-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: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682330535; a=rsa-sha256; cv=none; b=aVOoU+RxiU3wtl05/01mkbc6rBw7SQ6nuXABlh7pecXTT5+C+77Jlh1MM6VyTcD8Kf7//B BmJTFNBD4ik74SHqu9l7Qc8dXaUkbfBR0JIt87dp1cZAJoxNywS6u/0JevR+WnlnZsOMXz 5Wz/YYQ8qSPDgTwacgsVHdto9c/bDMy6s8A9+2CCtFlQCRPMw3yk/WhAjz5twmisKJMD2D Ui+Lu7Sg5CGRYA6WV1dEMgfgV3MX3f9pXbzr+9WeEOc5Gh1h2HWcTtZQ06cT/OelwkQTbo IkzFE/H748dqsmu4ExQUKlp/2myiKJLXrQW6XCmFqjHB/TTJ3ESdByFqk21h3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=JnECOWL5; dmarc=pass (policy=reject) header.from=jpoiret.xyz; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682330535; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=TLkY0cPCg/nz7bZPSH+XV7DGm12iklo5UeWhu5n9ad4=; b=s5IM8cQ+E8lh/DlYd4wy6qXZCbsik5nCSk9ZSVo9zRyTWhAdLneEZjH+5LnL4xHzV/rxTA gg4r4SrooAiVHfcHxOl3AyzPexIlqWY/OK0lvChjXoUoA8xzF1QWHIFMbEbkq1ttNkvUbL GaVpWJuIP6YZNHQIQpniVEvhZ8sBH3Zg68EQOPFlNx7eYp+vX6pdtdCEN0eGl/r8XgvElY kuMEsgZlaDtwFREEpiImU7KozpLLrdvBIDemKH6ePNCT3Gyv1IZHOQU/1sRCw7anQ5KrLl FxOIuZXXfHCnzrMPGKp8DHc5dfLG6WaES4VH7q+p9HmsMPkKbvdAyrvn+xpy4Q== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=jpoiret.xyz header.s=dkim header.b=JnECOWL5; dmarc=pass (policy=reject) header.from=jpoiret.xyz; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.78 X-Spam-Score: -4.78 X-Migadu-Queue-Id: 4203A2A899 X-TUID: nqiBEOUPNga9 * gnu/packages/patches/python-shiboken-2-compat.patch: Fix the patch according to upstream. --- .../patches/python-shiboken-2-compat.patch | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/patches/python-shiboken-2-compat.patch b/gnu/packages/patches/python-shiboken-2-compat.patch index 0c7de64395..48aa74173b 100644 --- a/gnu/packages/patches/python-shiboken-2-compat.patch +++ b/gnu/packages/patches/python-shiboken-2-compat.patch @@ -1,16 +1,15 @@ -Provide a declaration that's missing in Python 3.10. +Backport a fix from 5.15.9, mentioned in [1]. ---- pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/sbkpython.h 2023-04-19 23:14:11.415337435 +0200 -+++ pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/sbkpython.h 2023-04-19 23:18:09.055605606 +0200 -@@ -108,6 +108,11 @@ extern "C" { - #if PY_MAJOR_VERSION >= 3 - #define IS_PY3K - -+extern "C" { -+ /* In Python 3.10 this declaration is not provided by . */ -+ extern PyObject* _Py_Mangle(PyObject *p, PyObject *name); -+} -+ - #define PyInt_Type PyLong_Type - #define PyInt_Check PyLong_Check - #define PyInt_CheckExact PyLong_CheckExact +[1] https://bugreports.qt.io/browse/PYSIDE-2176 + +--- pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp 2023-04-24 11:05:48.770934499 +0200 ++++ pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp 2023-04-24 11:04:51.566943936 +0200 +@@ -751,7 +751,7 @@ + #endif // IS_PY2 + Shiboken::AutoDecRef privateobj(PyObject_GetAttr( + reinterpret_cast(Py_TYPE(self)), Shiboken::PyMagicName::name())); +-#ifndef Py_LIMITED_API ++#ifdef IS_PY2 + return _Py_Mangle(privateobj, name); + #else + // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always. base-commit: 827df9d1dde4f4a06e1789ec17cf0586602aa121 -- 2.39.2