From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ypwOO3OgWmBvRQAA0tVLHw (envelope-from ) for ; Wed, 24 Mar 2021 02:14:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2HOCNnOgWmB/CgAA1q6Kng (envelope-from ) for ; Wed, 24 Mar 2021 02:14:11 +0000 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 802CC122D8 for ; Wed, 24 Mar 2021 03:14:11 +0100 (CET) Received: from localhost ([::1]:60824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOt2A-0005yO-FI for larch@yhetil.org; Tue, 23 Mar 2021 22:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOt22-0005xd-JG for guix-patches@gnu.org; Tue, 23 Mar 2021 22:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOt22-0002SB-Az for guix-patches@gnu.org; Tue, 23 Mar 2021 22:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOt22-00079h-79 for guix-patches@gnu.org; Tue, 23 Mar 2021 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Mar 2021 02:14:02 +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: Leo Famulari Cc: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161655202427469 (code B ref 42885); Wed, 24 Mar 2021 02:14:02 +0000 Received: (at 42885) by debbugs.gnu.org; 24 Mar 2021 02:13:44 +0000 Received: from localhost ([127.0.0.1]:33514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOt1k-00078x-7M for submit@debbugs.gnu.org; Tue, 23 Mar 2021 22:13:44 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:62584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOt1e-00078f-Vv for 42885@debbugs.gnu.org; Tue, 23 Mar 2021 22:13:42 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2: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-102.mailbox.org (Postfix) with ESMTPS id 4F4sGh4LrczQjfH; Wed, 24 Mar 2021 03:13:32 +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=1616552010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sVmMceK2ap2EHhsoWBlH/dZRNxckprgYS+PhApnuVE0=; b=RAvFcXMn7oeQ/X86KGbBUgQCI5RouIKYYpyeP6hXVnbZe3ayrvz37e64rYgyXwAx8AWXKZ oY8wc5dtNHzui21eJhqkIa7Dc1RWOjZDLAnV6vSm0xtls7BhgskzwrDhVE5D+d86F/B9dc vGe06Mal1wBEqU8Gd4plreW11TWd3Pi6fx0n1oT2vdR4cLZnyl9auH+jBtJj8ORULCl/zF +yUMfTozSG0YW4OmBbTEwtn23SJy7jjodNRWDPoFIEqHZ8koumg7VJzqCVFQJUzZokEzSE TdjAofgMa4iD29iAPMHIrpHfScE9W9098Qc5018t/z3glKKkvK9bhhpI7ORPNw== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id nt8APt2COiqt; Wed, 24 Mar 2021 03:13:28 +0100 (CET) Date: Wed, 24 Mar 2021 03:13:26 +0100 (CET) From: Brendan Tildesley Message-ID: <1277129883.83284.1616552006895@office.mailbox.org> In-Reply-To: References: <20210310090053.21612-1-mail@brendan.scot> <20210310090053.21612-23-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -6.56 / 15.00 / 15.00 X-Rspamd-Queue-Id: 49EC917DF X-Rspamd-UID: 4aa7f1 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616552051; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=sVmMceK2ap2EHhsoWBlH/dZRNxckprgYS+PhApnuVE0=; b=mcrQs/ZBpzBKUMrdr+YKgjI4au09LD83cXvwT+Bkh6d8MoQEHItmrdJLfr2nYE/UhnlbB5 ivXrqycJutiFfcJvlviX2TCn+FxN18p6M6NI1PifsiKGSdhaVNhsVosXEDYPTqeb2LlZvB KUrbxv1AUQjO+F1D1rsYT3/hM/KvX6X4W2YaTSYgvU2paqnA7XgJCEXpxY1Dy7n8d5FMKU 6hucsHUW0jv4Z2tR87h4jPVQxrD24E8/Rs9S6ojVADQp/p5dUsXxuNiNOX0/Xop/6Whh1/ qz2aezQoMOpmW5FGXM2FDBo87EloJ7AOxnRFXjP15oZ6QKLd9+VOR9p7vIfRTA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616552051; a=rsa-sha256; cv=none; b=BnG8zX/RGNlIg9M7VAbcwVOTG7xl08hPbZUNqqWgBT9DWSdaboYQGc3WwD+sQBRnyEjINP hkYeff6L/K5sTTwPMRFewXa7/70PTbzU+8rrq/hnyFeVWbn2pQNq+hV8j8YgIwQbyzO+91 mD7/m5iUcvgyLN03ksQBTtBwgeUwIBcvJF+oaTNYJn8BaCp9NDBf8ByaGTUVReaoxohvOw OK3mRp/BgSa+InU/LySL9KywBLQDMDjIFOS8GfkQdaa9I7fWOlkPpUzvoWd+79dCwqXAwI 0qUH11oQaVLA/FXwupL1YAAnxbTdHwwdT2NNRggxiMCT3QsZtNuktByEHmBShg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=RAvFcXMn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=RAvFcXMn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 802CC122D8 X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: PtdAEaLi6RXX > On 03/23/2021 7:36 PM Leo Famulari wrote: > > > On Wed, Mar 10, 2021 at 08:00:49PM +1100, Brendan Tildesley wrote: > > * gnu/packages/ebook.scm (calibre): Update to 5.13.0. > > > > Switch all Python 2 inputs to their Python 3 equivalents. > > Alright, the patches are aleady stale, even at patch 2 of 27. > > To make this easier, can you either put this work online in a Git repo > somewhere? It's easier to clone a repo with a custom branch to rebase > the patches. > > Alternatively, can you say which older Guix Git commit these patches > apply to? > > Thansk! https://notabug.org/Brendan/guix/src/calibre-5.13.0 I fixed the conflict updated to latest master here. Also, a minor change, I oved the "gnu: veusz: Fix build" until after "gnu: python-pyqt: Fix build for new python-sip." since it doesn't actually work until that ones applied.