From patchwork Wed Mar 10 09:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27575 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 F1B7127BC51; Wed, 10 Mar 2021 09:02:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AC29827BC50 for ; Wed, 10 Mar 2021 09:02:38 +0000 (GMT) Received: from localhost ([::1]:48572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujl-0004CH-Sk for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujK-0003pA-74 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0007U1-UR for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujJ-00048h-Rp for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691015681 (code B ref 42885); Wed, 10 Mar 2021 09:02:09 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:50 +0000 Received: from localhost ([127.0.0.1]:48683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj0-00044m-27 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:50 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuix-00043a-5k for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:47 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwR0554CtzQjx7 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:41 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6B95hzByIG5YEgKfrmvsSPVq84aiQXbYdtHDVb+tLZU=; b=TEgHOONHqOZ526RqdS2JpSBnoVJ5eB/0hht5BwOANFe1jA3Mrt8JDg7F9tXasnXZc1oCTZ TAYiDCmtIOXwWVK1zWfIhLZTlaEHLKqFVR/5qDusiWHNGUs1elvFIok4mhLgPihJz9NeXn qIbIfJyWXek+hUJ406JAL49/4AhkcvGjrJsR3Rjq6DARZ6gOrAPNDoZbTb7AhqbqCdOMpL YDJp5oRRFynvDdVjZlxO13nnN/hMwJbSS23RsLqC6SXy6Xk/Wygn0GX7nd733eUUaNM5sK /WrFMeLkubAbT++Uvx1BnW7+H29VzYSpne1LVKTXn7vL/ElcNrUwezQ724G77A== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id t_jQqMSs-hX4 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:38 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:44 +1100 Message-Id: <20210310090053.21612-18-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: B2A241857 X-Rspamd-UID: 14fa7a 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pdf.scm (python-poppler-qt5): Keep using python-sip 4 since it doesn't work with 5. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e81c3caf87..a931f04ff7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -346,7 +346,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python-sip" ,python-sip) + `(("python-sip" ,python-sip-4) ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase)))