* [bug#53836] [PATCH 0/6] gnu: calibre: Update to 5.36.0. @ 2022-02-07 2:04 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley 2022-02-19 0:10 ` bug#53836: [PATCH 0/6] gnu: calibre: Update to 5.36.0 Nicolas Goaziou 0 siblings, 2 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:04 UTC (permalink / raw) To: 53836 I only did some very brief testing. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18. 2022-02-07 2:04 [bug#53836] [PATCH 0/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10 Brendan Tildesley ` (4 more replies) 2022-02-19 0:10 ` bug#53836: [PATCH 0/6] gnu: calibre: Update to 5.36.0 Nicolas Goaziou 1 sibling, 5 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * gnu/packages/python-xyz.scm (python-regex): Update to 2022.1.18. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c1b5e8ed3..5a33dc05bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20074,13 +20074,13 @@ (define-public python2-smmap (define-public python-regex (package (name "python-regex") - (version "2020.6.8") + (version "2022.1.18") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "1b3k0zi1pd99q5mk7ri7vcx2y1mq5inm9hk8dryqyhrpkmh4xdp9")))) + "05ir92d0cmv8wkafn3r05j5q47l6shg7cpdblp2a8m407b02vwwp")))) (build-system python-build-system) (arguments '(#:phases -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10. 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 3/6] gnu: python-apsw: Enable extension loading Brendan Tildesley ` (3 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * gnu/packages/python-web.scm (python-html5-parser): Update to 0.4.10. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 408d7f6571..3bcacdb19f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1279,13 +1279,13 @@ (define-public python2-html5lib-0.9 (define-public python-html5-parser (package (name "python-html5-parser") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (pypi-uri "html5-parser" version)) (sha256 (base32 - "13yl3vnf3sxl05m0nhpngnrz3g1jvyahd33lys3m3hfb91l8zzi5")))) + "195wgxls3df7djry9cz3p2k9644l6bfd66fczbaw55fsq0c48agr")))) (build-system python-build-system) (native-inputs (list pkg-config)) -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 3/6] gnu: python-apsw: Enable extension loading. 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10 Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 4/6] gnu: python-css-parser: Update to 1.0.7 Brendan Tildesley ` (2 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * gnu/packages/databases.scm (python-apsw): Enable extension loading. It is required by calibre. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f6c1046a51..c71f208f2b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3554,7 +3554,8 @@ (define-public python-apsw (modify-phases %standard-phases (replace 'build (lambda _ - (invoke "python" "setup.py" "build" "--enable-all-extensions") + (invoke "python" "setup.py" "build" "--enable-all-extensions" + "--enable=load_extension") #t)) (add-after 'build 'build-test-helper (lambda _ -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 4/6] gnu: python-css-parser: Update to 1.0.7. 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 3/6] gnu: python-apsw: Enable extension loading Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 6/6] gnu: Remove python-dukpy, python2-dukpy Brendan Tildesley 4 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * gnu/packages/python-web.scm (python-css-parser): Update to 1.0.7. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3bcacdb19f..81fb931189 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1472,13 +1472,13 @@ (define-public python-css-parser (package (inherit python-cssutils) (name "python-css-parser") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "css-parser" version ".tar.gz")) (sha256 - (base32 "0bmg4kiiir6pj9x3sd12x4dz2c1xpp2bn5nn60fxnbk2lnl4im2f")))) + (base32 "1ldv9s3an4pgk7b5x6z07rw9b5fdrasdldnf22829pb26b39dq15")))) (home-page "https://github.com/ebook-utils/css-parser") (synopsis "Fork of cssutils modified for parsing ebooks") (description -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0. 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley ` (2 preceding siblings ...) 2022-02-07 2:05 ` [bug#53836] [PATCH 4/6] gnu: python-css-parser: Update to 1.0.7 Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 6/6] gnu: Remove python-dukpy, python2-dukpy Brendan Tildesley 4 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * 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_) - -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 6/6] gnu: Remove python-dukpy, python2-dukpy. 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley ` (3 preceding siblings ...) 2022-02-07 2:05 ` [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley @ 2022-02-07 2:05 ` Brendan Tildesley 4 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-07 2:05 UTC (permalink / raw) To: 53836 * gnu/packages/python-xyz.scm: Remove unused packages python-dukpy, python2-dukpy. This is actually not the 'dukpy' package in pypi either but something else made for calibre. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a33dc05bb..3410a5c5a8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20495,32 +20495,6 @@ (define-public python-ratelimiter (define-public python2-ratelimiter (package-with-python2 python-ratelimiter)) -(define-public python-dukpy - (package - (name "python-dukpy") - (version "0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kovidgoyal/dukpy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "13h21nqzasv4zj32xs61brmc106pr2cx243672crcmwxxnjgaxls")))) - (build-system python-build-system) - (home-page "https://github.com/kovidgoyal/dukpy") - (synopsis "Run JavaScript in python") - (description - "dukpy is a JavaScript runtime environment for Python using the duktape -embeddable JavaScript engine.") - ;; Dukpy is licensed under MIT like the embedded duktape library, - ;; with 'errors.c' as GPL3. - (license (list license:expat license:gpl3)))) - -(define-public python2-dukpy - (package-with-python2 python-dukpy)) - (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix") -- 2.34.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#53836: [PATCH 0/6] gnu: calibre: Update to 5.36.0. 2022-02-07 2:04 [bug#53836] [PATCH 0/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley @ 2022-02-19 0:10 ` Nicolas Goaziou 2022-02-19 9:10 ` [bug#53836] " Brendan Tildesley 1 sibling, 1 reply; 9+ messages in thread From: Nicolas Goaziou @ 2022-02-19 0:10 UTC (permalink / raw) To: Brendan Tildesley; +Cc: 53836-done Hello, Brendan Tildesley <mail@brendan.scot> writes: > I only did some very brief testing. I also tested it quickly and it seems to work. Besides, tests are enabled so we know something is working at least! I've separated update from inputs labels removal. I also added G-expressions all over the place. All applied. Thank you! Regards, -- Nicolas Goaziou P.S: Calibre 5.37 is out, if you feel like upgrading it. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#53836] [PATCH 0/6] gnu: calibre: Update to 5.36.0. 2022-02-19 0:10 ` bug#53836: [PATCH 0/6] gnu: calibre: Update to 5.36.0 Nicolas Goaziou @ 2022-02-19 9:10 ` Brendan Tildesley 0 siblings, 0 replies; 9+ messages in thread From: Brendan Tildesley @ 2022-02-19 9:10 UTC (permalink / raw) To: Nicolas Goaziou; +Cc: 53836@debbugs.gnu.org > On 02/19/2022 1:10 AM Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote: > > > Hello, > > Brendan Tildesley <mail@brendan.scot> writes: > > > I only did some very brief testing. > > I also tested it quickly and it seems to work. Besides, tests are > enabled so we know something is working at least! > > I've separated update from inputs labels removal. I also added > G-expressions all over the place. > Thanks. I hadn't touched Guix in a few months so I'm still getting used to the G-Expression style. > All applied. Thank you! > > Regards, > -- > Nicolas Goaziou > P.S: Calibre 5.37 is out, if you feel like upgrading it. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-02-19 9:11 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-07 2:04 [bug#53836] [PATCH 0/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 3/6] gnu: python-apsw: Enable extension loading Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 4/6] gnu: python-css-parser: Update to 1.0.7 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0 Brendan Tildesley 2022-02-07 2:05 ` [bug#53836] [PATCH 6/6] gnu: Remove python-dukpy, python2-dukpy Brendan Tildesley 2022-02-19 0:10 ` bug#53836: [PATCH 0/6] gnu: calibre: Update to 5.36.0 Nicolas Goaziou 2022-02-19 9:10 ` [bug#53836] " Brendan Tildesley
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).