From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SKwJKgzEYmBC2QAAgWs5BA (envelope-from ) for ; Tue, 30 Mar 2021 08:24:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id NhLuIwzEYmDfBAAAB5/wlQ (envelope-from ) for ; Tue, 30 Mar 2021 06:24:12 +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 338F6201CF for ; Tue, 30 Mar 2021 08:24:12 +0200 (CEST) Received: from localhost ([::1]:36616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lR7nO-0000Wi-QE for larch@yhetil.org; Tue, 30 Mar 2021 02:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lR7nG-0000Ur-Hw for guix-patches@gnu.org; Tue, 30 Mar 2021 02:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lR7nG-0007he-9x for guix-patches@gnu.org; Tue, 30 Mar 2021 02:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lR7nG-0007DX-6b for guix-patches@gnu.org; Tue, 30 Mar 2021 02:24: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: Tue, 30 Mar 2021 06:24: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: 42885@debbugs.gnu.org Cc: Leo Famulari Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161708543827730 (code B ref 42885); Tue, 30 Mar 2021 06:24:02 +0000 Received: (at 42885) by debbugs.gnu.org; 30 Mar 2021 06:23:58 +0000 Received: from localhost ([127.0.0.1]:50163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR7nB-0007DC-KH for submit@debbugs.gnu.org; Tue, 30 Mar 2021 02:23:58 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:47484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lR7n9-0007Cx-BN for 42885@debbugs.gnu.org; Tue, 30 Mar 2021 02:23:56 -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 4F8fXj03BBzQjnZ; Tue, 30 Mar 2021 08:23:49 +0200 (CEST) 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=1617085427; 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=zj7l/cvGKb9ssJgpGXoyowqgAjMP1dW5bJj7QSf1tGg=; b=FJ95C/tXyNX8m6kN4LScXdeOPJsWWLHuqGsAjgx12PYqh8imYvPo/35QJPqFPe4H3ndSPf a/C33dyQZpAORo0N77eBJTC3cG+CpRGyRVBnPNIJGID/bNdNSf4JL+qUQGe5KDmE28wt1T qhsVGj/jDZjwQ9z3wvZPvSPZDB6nWY+sn66orvc7WusqpD5UBD4c7O7LPvooGRMMMi2zfu BOgQ+Th3ot2YwSUT8TO3EuMaNnh0Pk5GatPE8GaqjajOLtaWYi+4OAiCVUC+0gTy7SGAHm J9JlUxEftKju/o3YvFxsQii8xmY8U2JJxT4MVOcimevHA6abyL/sdx/J615hSQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id JxVAqorNuY-m; Tue, 30 Mar 2021 08:23:44 +0200 (CEST) Date: Tue, 30 Mar 2021 08:23:43 +0200 (CEST) From: Brendan Tildesley Message-ID: <327102377.27084.1617085423564@office.mailbox.org> In-Reply-To: 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=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -6.47 / 15.00 / 15.00 X-Rspamd-Queue-Id: AF1BF17F1 X-Rspamd-UID: 56a981 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=1617085452; 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=zj7l/cvGKb9ssJgpGXoyowqgAjMP1dW5bJj7QSf1tGg=; b=ENNfDYIhPiPNCNOnoH7KvdLFcvmDzuZ0E7irg0diani4uNUy1Oq7/kNsm2ZC4KGMhGWpTv zeqRFAq82FvNs1RIc680fjmD8GEpjiRAraKTFGUpTd/Xukzj254pc8O/+xcfC5RXUQHJ8x aQdlfVcVtSbgSb8SKDokn0nNtXJLYUCArP8S7onlSempN2NbKN6wHrkZcOjgCpErxKYspB 30lQiuDELUh/fXEeUQCd5oOM6MSBcV1q2oU3SkPpvTCKi5i1v19BBKQJU1z+X/15H5M8YC WF7bKMAL0upPSs6tQmENdhItBrG0BpuJHS8sdLCQbEbZym7NWVNjeBYuT4P8OA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617085452; a=rsa-sha256; cv=none; b=Fafd+UJgIYZA9Iax0/ZHB87EHZLVFsaa9GLgoEZFrCqTgxWUSdtOp0psR4cfegu1KcCQXO 0/mDCP8v+/43WN/6iHCOwLOkJgbDopqZc0I67jyzON8AKLPnsaENjr2vJET6XJlbG7l/b4 CzLW3Tr8jTe9+8EhyinGOS4ttq2hExDfxuQ7GRTSDNsS6dJOcF10harrp4VeNcvG3sbT6x dSYsPw67feFgB6g1g1tbiH7V5tCYQZzGF/2Bm0nPNpeOn9MbuwzW15REMmVGjSv+ryw0me R2BxkfD+Do9tIPPqlldPn+YKZ35EjHwLasRSTeHvHlulrwKi7rXkZRpavxPgdA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="FJ95C/tX"; 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="FJ95C/tX"; 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: 338F6201CF X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: iIPLdvcSlpnu > On 03/30/2021 1:05 AM Leo Famulari wrote: > > > 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? 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. 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. > 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? 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. 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. On a distribution with a traditional filesystem layout, that would not be necessary, you just have the -sip module as a dependency to pyqt5 and its then its available at a global path to be found. On Nix/Guix that doesn't work so it has to be added every time, or linked in like this. Actually I'm not sure if there is ever any case where one /doesn't/ need the sip modules, but they're only 200KiB. The Nix developers chose to just link it like this so I copied their way. Do you think it's fine? > 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? 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... > 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. All good I think. My descriptions were much worse than I realised. 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: "cChardet is a character encoding detector, binding to the C library uchardet for speed." ? I fixed another one of my typos 'statical' -> 'statistical', and removed the python-pyqt-builder input from python-pyqt https://notabug.org/Brendan/guix/src/wip-update-calibre