01/02: gnu: calibre: Fix build with python-msgpack >= 1.0.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 3e4ce1cc3eb7b35405c4d2c4f837e53ec9952c99
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 3 15:28:14 2020 +0200

    gnu: calibre: Fix build with python-msgpack >= 1.0.
    
    * gnu/packages/patches/calibre-msgpack-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/ebook.scm (calibre)[source](patches): Add it.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/ebook.scm                            |  1 +
 gnu/packages/patches/calibre-msgpack-compat.patch | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index dd0169a..8328165 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -776,6 +776,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/blender-2.79-python-3.7-fix.patch       \
   %D%/packages/patches/bluez-CVE-2020-0556.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
+  %D%/packages/patches/calibre-msgpack-compat.patch            \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-remove-test-bs4.patch           \
   %D%/packages/patches/calibre-remove-test-sqlite.patch                \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 5ac0fb1..37be173 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -104,6 +104,7 @@
              (delete-file "resources/calibre-portable.sh")
              #t))
         (patches (search-patches "calibre-no-updates-dialog.patch"
+                                 "calibre-msgpack-compat.patch"
                                  "calibre-remove-test-bs4.patch" ; TODO: fix 
test.
                                  "calibre-remove-test-sqlite.patch" ; TODO: 
fix test.
                                  "calibre-remove-test-unrar.patch"))))
diff --git a/gnu/packages/patches/calibre-msgpack-compat.patch 
b/gnu/packages/patches/calibre-msgpack-compat.patch
new file mode 100644
index 0000000..9920103
--- /dev/null
+++ b/gnu/packages/patches/calibre-msgpack-compat.patch
@@ -0,0 +1,18 @@
+Fix deserialization with msgpack 1.0.
+
+Patch copied from upstream source repository:
+https://github.com/kovidgoyal/calibre/commit/0ff41ac64994ec11b7859fc004c94d08769e3af3
+
+diff --git a/src/calibre/utils/serialize.py b/src/calibre/utils/serialize.py
+index f5d560c468..c35ae53849 100644
+--- a/src/calibre/utils/serialize.py
++++ b/src/calibre/utils/serialize.py
+@@ -110,7 +110,7 @@ def msgpack_decoder(code, data):
+ def msgpack_loads(dump, use_list=True):
+     # use_list controls whether msgpack arrays are unpacked as lists or tuples
+     import msgpack
+-    return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, 
use_list=use_list)
++    return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, 
use_list=use_list, strict_map_key=False)
+ 
+ 
+ def json_loads(data):