From patchwork Mon Feb 7 02:05:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37040 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 461A327BBEC; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 85A8727BBE9 for ; Mon, 7 Feb 2022 02:08:18 +0000 (GMT) Received: from localhost ([::1]:44442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtRw-0001Xw-OH for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:08:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQs-0001VT-2R for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQl-00080P-T2 for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQl-0008KM-Of for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419957931922 (code B ref 53836); Mon, 07 Feb 2022 02:07:03 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:19 +0000 Received: from localhost ([127.0.0.1]:40508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPy-0008Ij-JJ for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:19 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPt-0008He-Av for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:13 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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-202.mailbox.org (Postfix) with ESMTPS id 4JsTyM4wgrz9sT1 for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:06:03 +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=1644199561; 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=CzUtRkvf6fr82OLCHCXmH+IerPDqh61/Pa12Sy/ZqYY=; b=hgN7Ou24tiTL7BowvoT9qEydFmkkZpcGhgU/CzSRtonl0G5M0hXtX339YHxXAwJj0HjB4n AfpKmSw5aZrh0Qazi+Uak9R49b+jUw3vvYVDOq2cJvf0mfmCxPxqgIcJbscnEhtNoUHs/2 Xs6DEM68NyR5U6QmdxwS0b5OTDySSdRCEXi/PY/S7wwaog6BoqSMtKX/xANCxZYTI5iOgw 9x3LRFYN9zNQIW8j92/6xFiKR+HNFeLuyMXEnxJAQ9c7JpcO5/5rSAcXdFJnnsyGgIfcaS nI1s/gZvs8tgdJ5dqcUFBezNgSGiYVVv800ukltbjPac3ykm883wV9D7ccTOgg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:41 +1100 Message-Id: <20220207020542.29004-5-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 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/ebook.scm (calibre): Update to 5.36.0. Remove no longer needed zeroconf patch. [inputs]: Use new inputs style. Remove python-dbus, python-dukpy, python-pycryptodome. Add python-jeepney, libstemmer. * gnu/packages/patches/calibre-fix-zeroconf.patch: Delete patch. * gnu/local.mk: Remove reference to patch. --- gnu/local.mk | 1 - gnu/packages/ebook.scm | 103 +++++++++--------- .../patches/calibre-fix-zeroconf.patch | 38 ------- 3 files changed, 51 insertions(+), 91 deletions(-) delete mode 100644 gnu/packages/patches/calibre-fix-zeroconf.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3ae66803f2..06f906e75e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -918,7 +918,6 @@ dist_patch_DATA = \ %D%/packages/patches/cabal-install-ghc8.10.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \ %D%/packages/patches/cairo-CVE-2020-35492.patch \ - %D%/packages/patches/calibre-fix-zeroconf.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 0875dae190..2cc1ae8ddb 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -56,6 +56,7 @@ (define-module (gnu packages ebook) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages javascript) + #:use-module (gnu packages language) #:use-module (gnu packages libusb) #:use-module (gnu packages libreoffice) #:use-module (gnu packages music) @@ -120,7 +121,7 @@ (define-public python-pychm (define-public calibre (package (name "calibre") - (version "5.21.0") + (version "5.36.0") (source (origin (method url-fetch) @@ -129,7 +130,7 @@ (define-public calibre version ".tar.xz")) (sha256 (base32 - "0mq2w8blq6ykaml812axakwkqcw85qcpfwijdikn7kvbrhnnp2s5")) + "1c036qmn7lxq0899c2xzzs6whz7z0557frnfqisbvfxa13b2sadk")) (modules '((guix build utils))) (snippet '(begin @@ -145,8 +146,7 @@ (define-public calibre (delete-file "resources/calibre-portable.bat") (delete-file "resources/calibre-portable.sh") #t)) - (patches (search-patches "calibre-fix-zeroconf.patch" - "calibre-no-updates-dialog.patch" + (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-sqlite.patch" ; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) @@ -157,54 +157,53 @@ (define-public calibre python-pyqt-builder xdg-utils)) (inputs - `(("fontconfig" ,fontconfig) - ("font-liberation" ,font-liberation) - ("glib" ,glib) - ("hunspell" ,hunspell) - ("hyphen" ,hyphen) - ("icu4c" ,icu4c) - ("libmtp" ,libmtp) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("libjxr" ,libjxr) - ("libusb" ,libusb) - ("openssl" ,openssl) - ("optipng" ,optipng) - ("podofo" ,podofo) - ("poppler" ,poppler) - ("python-apsw" ,python-apsw) - ("python-beautifulsoup4" ,python-beautifulsoup4) - ("python-cchardet" ,python-cchardet) - ("python-css-parser" ,python-css-parser) - ("python-cssselect" ,python-cssselect) - ("python-dateutil" ,python-dateutil) - ("python-dbus" ,python-dbus) - ("python-dnspython" ,python-dnspython-1.16) - ("python-dukpy" ,python-dukpy) - ("python-feedparser" ,python-feedparser) - ("python-html2text" ,python-html2text) - ("python-html5-parser" ,python-html5-parser) - ("python-html5lib" ,python-html5lib) - ("python-lxml" ,python-lxml) - ("python-markdown" ,python-markdown) - ("python-mechanize" ,python-mechanize) - ;; python-msgpack is needed for the network content server to work. - ("python-msgpack" ,python-msgpack) - ("python-netifaces" ,python-netifaces) - ("python-odfpy" ,python-odfpy) - ("python-pillow" ,python-pillow) - ("python-psutil" ,python-psutil) - ("python-py7zr" ,python-py7zr) - ("python-pychm" ,python-pychm) - ("python-pycryptodome" ,python-pycryptodome) - ("python-pygments" ,python-pygments) - ("python-pyqt-without-qtwebkit" ,python-pyqt-without-qtwebkit) - ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-regex" ,python-regex) - ("python-speechd" ,speech-dispatcher) - ("python-zeroconf" ,python-zeroconf) - ("qtwebengine" ,qtwebengine) - ("sqlite" ,sqlite))) + (list fontconfig + font-liberation + glib + hunspell + hyphen + icu4c + libmtp + libpng + libjpeg-turbo + libjxr + libstemmer + libusb + openssl + optipng + podofo + poppler + python-apsw + python-beautifulsoup4 + python-cchardet + python-css-parser + python-cssselect + python-dateutil + python-dnspython-1.16 + python-feedparser + python-html2text + python-html5-parser + python-html5lib + python-jeepney + python-lxml + python-markdown + python-mechanize + ;; python-msgpack is needed for the network content server to work. + python-msgpack + python-netifaces + python-odfpy + python-pillow + python-psutil + python-py7zr + python-pychm + python-pygments + python-pyqt-without-qtwebkit + python-pyqtwebengine + python-regex + speech-dispatcher + python-zeroconf + qtwebengine + sqlite)) (arguments `(;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. diff --git a/gnu/packages/patches/calibre-fix-zeroconf.patch b/gnu/packages/patches/calibre-fix-zeroconf.patch deleted file mode 100644 index d7d0f18667..0000000000 --- a/gnu/packages/patches/calibre-fix-zeroconf.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix a build failure when upgrading zeroconf from 0.28.8 to 0.38.1: - -https://issues.guix.gnu.org/53247 - -Patch copied from Gentoo: - -https://bugs.gentoo.org/800233#c5 - -diff --color -Naru a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py ---- a/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:32:03.104016444 +0200 -+++ b/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:33:30.699018403 +0200 -@@ -2040,13 +2040,6 @@ - # Function to monkeypatch zeroconf to remove the 15 character name length restriction. - # Copied from https://github.com/jstasiak/python-zeroconf version 0.28.1 - -- --from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -- _HAS_ASCII_CONTROL_CHARS, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -- -- - def service_type_name(type_: str, *, allow_underscores: bool = False) -> str: - """ - Validate a fully qualified service name, instance or subtype. [rfc6763] -@@ -2087,6 +2080,12 @@ - :param type_: Type, SubType or service name to validate - :return: fully qualified service name (eg: _http._tcp.local.) - """ -+ -+ from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -+ _HAS_ASCII_CONTROL_CHARS, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -+ - if not (type_.endswith('._tcp.local.') or type_.endswith('._udp.local.')): - raise BadTypeInNameException("Type '%s' must end with '._tcp.local.' or '._udp.local.'" % type_) -