diff options
| author | Leo Famulari <leo@famulari.name> | 2022-01-14 14:17:47 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2022-01-14 14:45:17 -0500 |
| commit | 873fda504c74115c2d0333687a6723b134257dac (patch) | |
| tree | f3645d3bcded0cd9d4d991f1f738d1bc76b87214 /gnu/packages/patches/calibre-fix-zeroconf.patch | |
| parent | 3a555a93a9f8e15095da8c79c7fa415ed21bf5b7 (diff) | |
| download | guix-873fda504c74115c2d0333687a6723b134257dac.tar.gz guix-873fda504c74115c2d0333687a6723b134257dac.zip | |
gnu: Calibre: Fix a build failure with recent zeroconf.
Fixes <https://issues.guix.gnu.org/53247>.
* gnu/packages/patches/calibre-fix-zeroconf.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ebook.scm (calibre)[source]: Use it.
Diffstat (limited to 'gnu/packages/patches/calibre-fix-zeroconf.patch')
| -rw-r--r-- | gnu/packages/patches/calibre-fix-zeroconf.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/gnu/packages/patches/calibre-fix-zeroconf.patch b/gnu/packages/patches/calibre-fix-zeroconf.patch new file mode 100644 index 0000000000..d7d0f18667 --- /dev/null +++ b/gnu/packages/patches/calibre-fix-zeroconf.patch @@ -0,0 +1,38 @@ +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_) + |