From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ONVcExdsa2D2WwAAgWs5BA (envelope-from ) for ; Mon, 05 Apr 2021 21:59:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 2LFKDRdsa2AIMgAAbx9fmQ (envelope-from ) for ; Mon, 05 Apr 2021 19:59:19 +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 C0FE7115AD for ; Mon, 5 Apr 2021 21:59:18 +0200 (CEST) Received: from localhost ([::1]:60308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTVNV-0006Iv-Ti for larch@yhetil.org; Mon, 05 Apr 2021 15:59:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTVNF-0006IE-Rf for guix-patches@gnu.org; Mon, 05 Apr 2021 15:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTVNF-0004io-K7 for guix-patches@gnu.org; Mon, 05 Apr 2021 15:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lTVNF-0003fY-JM for guix-patches@gnu.org; Mon, 05 Apr 2021 15:59:01 -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, 05 Apr 2021 19:59:01 +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.161765270314051 (code B ref 42885); Mon, 05 Apr 2021 19:59:01 +0000 Received: (at 42885) by debbugs.gnu.org; 5 Apr 2021 19:58:23 +0000 Received: from localhost ([127.0.0.1]:38658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTVMc-0003eY-UL for submit@debbugs.gnu.org; Mon, 05 Apr 2021 15:58:23 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:33741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTVMb-0003eK-80 for 42885@debbugs.gnu.org; Mon, 05 Apr 2021 15:58:21 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 3AD651AC6; Mon, 5 Apr 2021 15:58:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 05 Apr 2021 15:58:15 -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=rvUcy5wrgj27+iuKhpAo/X9F Sb1lUdyi7YAaGgWS+5M=; b=U38r2o1+UE1HS5khE/1V6RffIIOrrgMEkdH37uZU jFWh0bWQe8XniBq6EhDe7WpByU7+jSoxYdgTvqo3trF8MS3FW1SV/4PjVwVBe4jR zSgcI7unDk9VHSvvOmvXYL5TS3jyxWymv8z8HMfbbuCyFjrWslRD49tYPJbXS3QW puw= 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=rvUcy5 wrgj27+iuKhpAo/X9FSb1lUdyi7YAaGgWS+5M=; b=gBTtBcLBTVwnlU7s6pufPl irO8n3SrfCBlOvkyYFQWbyDDYEi6x9r5bB+7awpZhAHtaBlU8M1iduBrmbopNkZM 2WexMXHoe1wIpGybssMsa3ShYgxe+afVJKo9xoc3yFAS1iWARJ2S5FyU0yN8kLbE 8xNSG+IpgF80JwUyWXTDQYgfgdZ/EkVnJk0LcaMHAR6G0eHxUKJ1vHdF1zd2ezwG guS0EmdG4YvJopUbS/mgggaom/jBIts95OnWAax0RsDEKEwlEjNrYQqsfyROiWI8 okU1lptygBJm7z3iMRcn64h7XSeS3dTmr9OGxzLQDBbaqbkloE6gGqYr7OK6eSMw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejvddgudeghecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehgtd erredttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedvveegkeduiedvieeludevkeeugf euueelhedtffegffdtfeekveelffeufedukeenucffohhmrghinhepghhnuhdrohhrghen ucfkphepuddttddruddurdduieelrdduudeknecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg 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 31623240054; Mon, 5 Apr 2021 15:58:14 -0400 (EDT) Date: Mon, 5 Apr 2021 15:58:12 -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> <327102377.27084.1617085423564@office.mailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TX0yeVifDdh5eev/" Content-Disposition: inline In-Reply-To: <327102377.27084.1617085423564@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=1617652759; 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=rvUcy5wrgj27+iuKhpAo/X9FSb1lUdyi7YAaGgWS+5M=; b=X5p3wBh9dhPZVxtoXlQAA56vp4yMNOqYY48pd/7leXkRYbr/PS95TKKLdfd127d+W/Sx3L Tawc5bXAeIY6mESRfrdYO+/IaUUuHAIR4+rrwoWE85CaZKqBNsVn5jzQlm28Adr7aiZOfm hS7vh8XqWaPlTq6cwDJVFMsP6Butw8GoQzKWseZvFK4xBvS100gf/vPy5hTYnFUngMjQax 8vyySiZ31VqGCcZNjhoF+7LW/40PJDbeyOFErIVv41PHPWJkAM5Vs/V6nLXd8cl5AV9POH oU9iuOn4NUAR5wBCr/tJcIkLp0gYy5tW42fzrXHl6c7PhYgB30BGzvZHl7Camw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617652759; a=rsa-sha256; cv=none; b=BkRnRxjo5R3ALv6nGqvZb7nagmpPkW9YECmOjTvAcADvM4rV4bp57QQbsfpdkcon+Vk/LO yNMsc+sFCsSWlTJWN/K/xlwjXsR16HLgyyQqPrRCq4zXcUsJtTdgSqJxHCMZE6qulpgaGN cCrYT9tXBKB66fwqhb2YcfcWLFXQ6g6F0hIbl6ugfkRGKi+5/Yl5UGKd+NNc8ClxlTTxoF 5K6Z5/+HMNYVD0KAm1eIpxm63TjRFLUPIK1RFxSaLGSJ60O0Em4QsJiIPn+acG3hSpirQU wMSyvnUsJDTwZLtp9d3HKa6dLb/tjBuNwShDdva11v09AeiKgtg60vigZzrYAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=U38r2o1+; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=gBTtBcLB; 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: -3.54 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=U38r2o1+; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=gBTtBcLB; 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: C0FE7115AD X-Spam-Score: -3.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: fvq3VF15oe6r --TX0yeVifDdh5eev/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 30, 2021 at 08:23:43AM +0200, Brendan Tildesley wrote: > Me adding python-pyqt-builder here looks like a mistake. I left it > there while experimenting. When I was Upgrading SIP, I experimented > with switching to the new 'sip-build' tool introduced in SIP 5. SIP > 6's main change is to delete obsoleted code, so the old 'python > configure.py' won't work. I never got it working so I just went back > to the old way with SIP 5. python-pyqt-builder is still needed by > Calibre however. >=20 > The only other functional change in this patch is to remove the patch > pyqt-public-sip.patch. The introduction of python-pyqt5-sip as a > separate module means means that with this patch, the module is not > found at all. Removing it fixes it. I don't understand it in any great > depth but it seems the patch may only really relevant to SIP 4. Okay. I adjusted the commit message to match your revision. > > On 03/30/2021 1:05 AM Leo Famulari wrote: > > 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? >=20 > Upstream for whatever reason chose to move the sip module part out in > to a separate source package python-pyqt5-sip. It's broken without > removing the pyqt-public-sip. >=20 > The linking can be removed, but it would mean for every input that > requires python-pyqt5 as an input, you also need to add > python-pyqt5-sip so the sip module can be found.=20 If I understand correctly, the issue that any package that uses python-pyqt5 also needs to be able to find python-pyqt5-sip. Is that right? If so, it sounds like a case for propagated-inputs [0]. Concretely, I made python-pyqt5-sip a propagated-input of python-pyqt and removed the 'pyqt5-sip' phase, and Calibre built successfully. Does that seem like the right approach? > The reason I added qtsvg was to try fix the Qt test. If you remove the > line (setenv "SKIP_QT_BUILD_TEST" "true"), this test fails for > multiple reasons. One of them was qtsvg missing. Another was the > get_exe_path bit. But a third reason I that its call to printtopdf in > pyqtwebegine returns an empty string instaed of b'Skia/PDF'. I had no > idea how to proceed with fixing that so I left it for now. But at > least fixed the other errors. I assume some SVG related functionality > will fail without it... That's a good point. However, I checked if the built Calibre refers to qtsvg, and it doesn't [1]. So, it's unlikely that Calibre will be able to find and use qtsvg, regardless of whether or not it's an input. So, I'd prefer to leave it out until we understand what it's for and how to make sure that Calibre can use it. > All good I think. My descriptions were much worse than I realised. No worries. Writing the synopses and descriptions is a completely different type of work from packaging or programming. I often "finish" some packages, but need to go back later to write the descriptions. I'm happy to finish these tasks as part of the code review process. > python-cchardet differs from in python-chardet in that its not written > /in/ python, but links to a fast C library to do it, but your > description/synopsis changes make it look like its all in > Python. Maybe make the description: > =20 > "cChardet is a character encoding detector, binding to the C > library uchardet for speed." ? Thanks, that helps. I amended the synopses and description based on this. I pushed my revisions of your updated branch, rebased on the current master branch, to Savannah: https://git.savannah.gnu.org/cgit/guix.git/log/?h=3Dwip-update-calibre [0] https://guix.gnu.org/manual/en/html_node/package-Reference.html [1] This command be used: $ guix gc --references $(./pre-inst-env guix build --no-grafts calibre) | g= rep qtsvg --TX0yeVifDdh5eev/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmBra9QACgkQJkb6MLrK fwh9+xAAgEDFUZnBWEg7n+lYBeIijPpKK43oDb0wqk2tg1lmovUkYXEKNTM5terE dg1ZnbS+vPSgiHjAFxOi3wc4fmMxjQvJrNcnESbyVhtHz1g30QnOF7nhN2x+22Zp YTZEbPZHTZnnGwhZ/ZBX+hSThf7czLzMara4I/LBVcNZuPOTLdVFYXoQlnc4nMuF bK4NHIAho9LcjVvC4rBa1dL+paAKCBVLen0azdSUnKSNQEeH5cwlVhB/huTo8xV6 qnmRoXF/MesrZYxGSZgG5tdZy8OpDrYGx5uTwFgePPxRXpZlmtSmBBdJWytyleHf jUr/DD4bSLEp1ymc35GKLU45/eY5e4M3hxwfm7dhvvqq00Jq+xqtyX20dS+tgoQg aeDA7QNaPH7mt9U4pjbpxY4ViDOE72MTE55s4G15cglmxDI2aKzww5YWEwSfOwti +uC/E/82Rj3E6LPeJOhA3kLgi9nf/7nz/PmF50e4NfnQIGCbDlHyJMFx5F0zGo0d Li4YefIYxr68xPyH6PyziVB/VlRP3HxjFBh0o3ogqvwJkd0jKNQqMLOdb5ZNQrAj uB0i7TsYgWYn73YBDeEBncAsLB36vUBp4PBJVJNVnCsGeHM9slL3bfvYns6VszTL s/eSkoczMuf9WT/9MbEy26kTJ/5JNvpIcX6YLOSjL/139LmQKc8= =mCQM -----END PGP SIGNATURE----- --TX0yeVifDdh5eev/--