From patchwork Tue Dec 26 14:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 58081 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 37A8627BBEA; Tue, 26 Dec 2023 17:20:30 +0000 (GMT) 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_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 2D70527BBE9 for ; Tue, 26 Dec 2023 17:20:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIB6E-0001hw-0E; Tue, 26 Dec 2023 12:20:14 -0500 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 1rIB64-0001hZ-LG for guix-patches@gnu.org; Tue, 26 Dec 2023 12:20:04 -0500 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 1rIB64-0003C7-9K for guix-patches@gnu.org; Tue, 26 Dec 2023 12:20:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIB62-0000g3-C9 for guix-patches@gnu.org; Tue, 26 Dec 2023 12:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68038] [PATCH 2/2] gnu : python-poppler-qt5: Remove no longer needed patch Resent-From: Marco Rimoldi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 17:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68038@debbugs.gnu.org Received: via spool by 68038-submit@debbugs.gnu.org id=B68038.17036111662553 (code B ref 68038); Tue, 26 Dec 2023 17:20:02 +0000 Received: (at 68038) by debbugs.gnu.org; 26 Dec 2023 17:19:26 +0000 Received: from localhost ([127.0.0.1]:34876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIB5R-0000f6-KO for submit@debbugs.gnu.org; Tue, 26 Dec 2023 12:19:26 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:40591 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIB5P-0000er-Gb for 68038@debbugs.gnu.org; Tue, 26 Dec 2023 12:19:24 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id I8EzrrpwWUvUzI8F0rDLew; Tue, 26 Dec 2023 15:17:06 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1703600226; bh=g3OKHkmRb24HnB5Rco8PucuCfeTKl+UN01qpezsIDUQ=; h=From; b=nUhUBXdqiy7/uaqgf51FMeaYQ5il5+YS6cYkViuOobjQTa6j2CBEDrwReh5gEwk1/ E4dqXfYLCzT1qPa08FUDhX17zJUhYzZyoVN8GU9T24MeSC55mnUBsFBu9GLMk23qLZ l5WbHJgrcMEgfxt14mWv4Gdo30uDQCUoOrlfK4JZiAnGcreuGy+Udv+zAuD/MfiHXI iIGKZPxdMcfeANE4fu2mvflCVR+pJdxzvFHgbjbIG412m3rMesNYEPi8PbRyNs07zJ vPhxXdgxICMjiGpRLv1pu9d+ybUyJosq/2kd424Dvm3gvYtBqICufiNC4djjke9Aku uh7vhqMEbxfFQ== X-CNFS-Analysis: v=2.4 cv=MvuUqUWe c=1 sm=1 tr=0 ts=658ae062 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=kj9zAlcOel0A:10 a=NEAV23lmAAAA:8 a=WBDXT6l-fv67wi_S36MA:9 a=CjuIK1q_8ugA:10 Date: Tue, 26 Dec 2023 15:17:04 +0100 Message-ID: <32f6fa9d4a9ec6dc4932a04901788a3e6789055c.1703599790.git.rimarko@libero.it> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CMAE-Envelope: MS4xfCPIYtkn2xMpSph0yixRNn6Flb4jJ2VK84bf15wwXf4aLYW4uowLjL548OcwDnSY2KUOLXTzI36E+voV+46046cQFtwbCF+Sw9sNtMbh16MS+b//ZHqb 757fKJ/JeSEqkovsHwWIQaVLBaepXC4CA5CuS5JCmtZYXc4G1swW905ys6LVNNl/6bqJqQq9qOhJKw== 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: Marco Rimoldi X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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 Change-Id: Ie5f6039dcfd8e6d1315e969dc12dafb158a8cc10 --- .../python-poppler-qt5-fix-build.patch | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 gnu/packages/patches/python-poppler-qt5-fix-build.patch - /* kate: indent-width 4; space-indent on; hl c++; indent-mode cstyle; */ diff --git a/gnu/packages/patches/python-poppler-qt5-fix-build.patch b/gnu/packages/patches/python-poppler-qt5-fix-build.patch deleted file mode 100644 index 099bb86d2f..0000000000 --- a/gnu/packages/patches/python-poppler-qt5-fix-build.patch +++ /dev/null @@ -1,116 +0,0 @@ -Patch taken from the upstream repository -https://github.com/frescobaldi/python-poppler-qt5/issues/43 - -From 92e5962ec3751ab051d0b655fd61afc7a1cf709e Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Thu, 4 Mar 2021 17:02:51 +0100 -Subject: [PATCH] map type QVector< QPair > for - FormFieldChoice::choicesWithExportValues() (#45) - ---- - types.sip | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 93 insertions(+) - -diff --git a/types.sip b/types.sip -index 239b8c9..81cb283 100644 ---- a/types.sip -+++ b/types.sip -@@ -331,5 +331,98 @@ template - }; - - -+/** -+ * Convert QVector< QPair > -+ * from and to a Python list of a 2-item tuple -+ */ -+ -+template -+%MappedType QVector< QPair > -+{ -+%TypeHeaderCode -+#include -+#include -+%End -+ -+%ConvertFromTypeCode -+ // Create the list. -+ PyObject *l; -+ -+ if ((l = PyList_New(sipCpp->size())) == NULL) -+ return NULL; -+ -+ // Set the list elements. -+ for (int i = 0; i < sipCpp->size(); ++i) -+ { -+ QPair* p = new QPair(sipCpp->at(i)); -+ PyObject *ptuple = PyTuple_New(2); -+ PyObject *pfirst; -+ PyObject *psecond; -+ -+ TYPE *sfirst = new TYPE(p->first); -+ if ((pfirst = sipConvertFromType(sfirst, sipType_TYPE, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ Py_DECREF(ptuple); -+ return NULL; -+ } -+ PyTuple_SET_ITEM(ptuple, 0, pfirst); -+ -+ TYPE *ssecond = new TYPE(p->second); -+ if ((psecond = sipConvertFromType(ssecond, sipType_TYPE, sipTransferObj)) == NULL) -+ { -+ Py_DECREF(l); -+ Py_DECREF(ptuple); -+ Py_DECREF(pfirst); -+ return NULL; -+ } -+ PyTuple_SET_ITEM(ptuple, 1, psecond); -+ -+ PyList_SET_ITEM(l, i, ptuple); -+ } -+ -+ return l; -+%End -+ -+%ConvertToTypeCode -+ const sipTypeDef* qpair_type = sipFindType("QPair"); -+ -+ // Check the type if that is all that is required. -+ if (sipIsErr == NULL) -+ { -+ if (!PySequence_Check(sipPy)) -+ return 0; -+ -+ for (int i = 0; i < PySequence_Size(sipPy); ++i) -+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qpair_type, SIP_NOT_NONE)) -+ return 0; -+ -+ return 1; -+ } -+ -+ -+ QVector< QPair > *qv = new QVector< QPair >; -+ -+ for (int i = 0; i < PySequence_Size(sipPy); ++i) -+ { -+ int state; -+ QPair * p = reinterpret_cast< QPair * >(sipConvertToType(PySequence_ITEM(sipPy, i), qpair_type, >sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ -+ if (*sipIsErr) -+ { -+ sipReleaseType(p, qpair_type, state); -+ delete qv; -+ return 0; -+ } -+ qv->append(*p); -+ sipReleaseType(p, qpair_type, state); -+ } -+ -+ *sipCppPtr = qv; -+ return sipGetState(sipTransferObj); -+%End -+ -+}; -+ -