CVS commit: pkgsrc/misc/calibre

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Dec 24 09:10:16 UTC 2023

Modified Files:
        pkgsrc/misc/calibre: Makefile distinfo
Added Files:
        pkgsrc/misc/calibre/patches: patch-src_calibre_ebooks_chardet.py

Log Message:
calibre: make conversion of books from plain text to epub work


To generate a diff of this commit:
cvs rdiff -u -r1.295 -r1.296 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_chardet.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.295 pkgsrc/misc/calibre/Makefile:1.296
--- pkgsrc/misc/calibre/Makefile:1.295  Wed Nov 15 09:25:52 2023
+++ pkgsrc/misc/calibre/Makefile        Sun Dec 24 09:10:16 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.295 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.296 2023/12/24 09:10:16 spz Exp $
 
 # Needs update to 6.9.0
 DISTNAME=      calibre-5.44.0
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    misc
 MASTER_SITES=  https://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.115 pkgsrc/misc/calibre/distinfo:1.116
--- pkgsrc/misc/calibre/distinfo:1.115  Sat Aug 27 11:38:13 2022
+++ pkgsrc/misc/calibre/distinfo        Sun Dec 24 09:10:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.115 2022/08/27 11:38:13 rhialto Exp $
+$NetBSD: distinfo,v 1.116 2023/12/24 09:10:16 spz Exp $
 
 BLAKE2s (calibre-5.44.0.tar.xz) = 536482fd1b06589adf1af036a55e81c718a7a4713293a281825e10315418e249
 SHA512 (calibre-5.44.0.tar.xz) = 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
@@ -7,5 +7,6 @@ SHA1 (patch-setup_build.py) = 32cd46adf8
 SHA1 (patch-setup_extensions.json) = 6ac0a6a7e80dc4a01cb18a61c733ee375085ad06
 SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
 SHA1 (patch-src_calibre_constants.py) = e35f904d075ddb2cf2256895b564a55490fb5897
+SHA1 (patch-src_calibre_ebooks_chardet.py) = da1163e97b1f22425af2fc2837173eb528681743
 SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
 SHA1 (patch-src_calibre_utils_icu.c) = 219257d68925b5c4a0df897d89324457f2ff7289

Added files:

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_chardet.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_chardet.py:1.1
--- /dev/null   Sun Dec 24 09:10:16 2023
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_chardet.py     Sun Dec 24 09:10:16 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_calibre_ebooks_chardet.py,v 1.1 2023/12/24 09:10:16 spz Exp $
+
+cchardet is a speed-optimized version of the chardet module; we don't have
+a cchardet module but a chardet one, so use chardet instead.
+This patch is needed for conversion of books from plain text to epub to work.
+
+--- ./src/calibre/ebooks/chardet.py.orig       2022-06-17 02:35:27.000000000 +0000
++++ ./src/calibre/ebooks/chardet.py
+@@ -103,7 +103,7 @@ _CHARSET_ALIASES = {"macintosh" : "mac-r
+ 
+ 
+ def detect(bytestring):
+-    from cchardet import detect as implementation
++    from chardet import detect as implementation
+     ans = implementation(bytestring)
+     enc = ans.get('encoding')
+     if enc: