From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6KJRN2JdYmAyJQAAgWs5BA (envelope-from ) for ; Tue, 30 Mar 2021 01:06:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id CE09MWJdYmAJUAAAB5/wlQ (envelope-from ) for ; Mon, 29 Mar 2021 23:06:10 +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 8BDC1E19E for ; Tue, 30 Mar 2021 01:06:10 +0200 (CEST) Received: from localhost ([::1]:48152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lR0xV-0007nS-Pa for larch@yhetil.org; Mon, 29 Mar 2021 19:06:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR0xP-0007lv-BM for guix-patches@gnu.org; Mon, 29 Mar 2021 19:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lR0xP-0007i7-47 for guix-patches@gnu.org; Mon, 29 Mar 2021 19:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lR0xO-0004gx-W1 for guix-patches@gnu.org; Mon, 29 Mar 2021 19:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Mar 2021 23:06: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: Brendan Tildesley Cc: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161705914918002 (code B ref 42885); Mon, 29 Mar 2021 23:06:02 +0000 Received: (at 42885) by debbugs.gnu.org; 29 Mar 2021 23:05:49 +0000 Received: from localhost ([127.0.0.1]:49834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR0xA-0004gI-KB for submit@debbugs.gnu.org; Mon, 29 Mar 2021 19:05:48 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR0x6-0004g0-7I for 42885@debbugs.gnu.org; Mon, 29 Mar 2021 19:05:47 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id D149E5C0150; Mon, 29 Mar 2021 19:05:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 29 Mar 2021 19:05:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=xsHd0ako3SHhmS4JJQb5xQx+ uwjqM4+HIax48xI+2Io=; b=BSlRGr0Rbx1qUhePhfEBaVXHuWJKUDiX4RW8Vl7a 75m0JdHdXSZ6IvxJKj3KsYonOiMJSAaOGfxfIzzxI6SV2aKWulgoQed6aJPXeQ2G OqsA/NHX/miTWtwQstrbgC22VL71e2ArEvw5eb205ptThb3sWf0CWis0Uk9Bnkrf tFw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=xsHd0a ko3SHhmS4JJQb5xQx+uwjqM4+HIax48xI+2Io=; b=flVU5iB75g9NiML9HiIe3d viMmYAZ1AT55SHK+MpIjUsdohNJU2j/dTK/i13q9DR3ebmi9CDa50rt8SUoYFFhp 8LG+vFJpzL8SFKgt0OOzfvqqNNLvMWwUPa8U5nzTT2hB6E+Ewue/57WbrvROx7Z+ iDlLaBOTeKWCGfpTu4RMWpgKmhxj9GkvwQiwoWCZVcEVlNSTC3j0TmppCaTUd3bk OWVROoIr2OdzLBYHcVfDYK9IC/C1MHI96tn/7yRkY057QKcrlGzTMk+u9Jptke7N /SnorHdp8TPl0EevN65tTCaLnZ+y408yRCafnIa6K/PjO4qXOKqRS3nohygVpjGg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudehledgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesthdtre dttddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepheduheejfefhveeikeehffefleektd ffieelledvgeefudeghfelffdvieevvdelnecuffhomhgrihhnpehnohhtrggsuhhgrdho rhhgpdhgnhhurdhorhhgnecukfhppedutddtrdduuddrudeiledruddukeenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhl rghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 5C8D824005D; Mon, 29 Mar 2021 19:05:38 -0400 (EDT) Date: Mon, 29 Mar 2021 19:05:35 -0400 From: Leo Famulari Message-ID: References: <20210310090053.21612-1-mail@brendan.scot> <20210310090053.21612-23-mail@brendan.scot> <1277129883.83284.1616552006895@office.mailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1277129883.83284.1616552006895@office.mailbox.org> 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=1617059170; 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: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=xsHd0ako3SHhmS4JJQb5xQx+uwjqM4+HIax48xI+2Io=; b=Vm+GxreDEf9YQqjqjX4uZPOGgAZDpyWHvpkvy60Vty3A7I64qRbY/dWRSzVdjJxNEcyT1o tSbp3hUJu/TEvZOdpN4xzhf8pQNSS0Cd8yKKT0wpHJNfj5niz+uj0/U/LV18ncjHzPG9Vg KBY0A7fQ9fHX7/NSl58r2nU9eZR7ur0ETJJdch7UKJF7821qjm1GXOGpEEatX766pRC/JQ EYXkmELBwhSNlSqXdUyGbdr9fxPqL5JkOyy2DbQz176fVRE0Pvkg/5NPHKkwtJO4HIB188 giHmEE1DZBDrBl7z+80l66M+cmnIpXeQUu8awYuQgk5iLT7/UwDGf/poCm3x2A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617059170; a=rsa-sha256; cv=none; b=ELvNuXEaqU9vkvkzE13hVOKicI9yCQkyicF+P25tF4+CyZDSf3ig+/NJxVQ4g58acpNYU4 vctAgY+5JMjDmzSGT2ZNFMCb96zZ9YzuFDH3NkN3M8CTocXwnUk+PPfGPQ2yC/wya0s1w8 /szuiTcOAmTaypTqC7EjOzBm1a8F8SzEDh2y8tb3KL7gd+8kuJvIzPYzR4+XuqYAuc/vn1 1CoLWEA681BcPtTd3Nu/L1xwfHFoUgDmfI+eZX/XDcRCmA+yi7A5Y6xX7LJnFbGs6wkUT4 5cTyHFZNMNkriDihE8REnKoXL5shp9ktxoPIlTWOy3z/iAtcuxeR8w8ph3ZE9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=BSlRGr0R; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=flVU5iB7; 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: 0.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=BSlRGr0R; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=flVU5iB7; 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: 8BDC1E19E X-Spam-Score: 0.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: lArIS/+5/ER3 On Wed, Mar 24, 2021 at 03:13:26AM +0100, Brendan Tildesley wrote: > https://notabug.org/Brendan/guix/src/calibre-5.13.0 Can you clarify some things about the commit "gnu: python-pyqt: Fix build for new python-sip"? First, python-pyqt before applying this commit; if it's broken, can you say how? Also, there is a comment "Linking here means the sip module can be found without python-pyqt5-sip needing to be added as an input". But, python-pyqt5-sip is an input to this package. Can you explain what you mean? I think we should drop the commit "gnu: calibre: Add qtsvg as input.", since it adds a dependency but for what seems to be no reason. What do you think? Based on your branch, I've made the following changes and pushed the branch at . Can you take a look and tell me what you think? I squashed the first two commits, so that there is no commit where python2-sip fails to build. It's not always easy to avoid intermediate breakage in complicated package upgrades like this, but it's worth trying. At least, it can improve the utility of `git bisect`. I also squashed the "fix veusz" commit into that one, for the same reason. And all the rest of the commits that are adjusting to that change. For the "Fix build for new python-sip" commit, I removed the hardcoding of "python3.8" in the 'pyqt5-sip' phase, and instead used the python-version procedure. I squashed the remaining cleanup-type commits into the Calibre update. I pushed the commit 'gnu: python-poppler-qt5: Update to 21.1.0.' as 02f664a0a3dd3a936213e687802bdc62f2a10983 I corrected the license of python-pychm from gpl3 to gpl2+. I made many other changes to satisfy `guix lint`, and improved synopses and descriptions.