[pkgsrc/trunk]: pkgsrc/misc/calibre misc/calibre: update to 4.11.0.

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/923031d97681
branches:  trunk
changeset: 371339:923031d97681
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sun Jan 09 15:43:51 2022 +0000

description:
misc/calibre: update to 4.11.0.

It is still an old version, but this is an intermediate step until it can be
updated to 5.x for Python 3.x.
The major change that kept this update from happening was that calibre now
requires QtWebEngine instead of QtWebKit.
A changlog from such an old version seems not easily available.

diffstat:

 misc/calibre/Makefile                                                     |   25 +-
 misc/calibre/PLIST                                                        |  173 ++++-----
 misc/calibre/distinfo                                                     |   24 +-
 misc/calibre/patches/patch-setup_build.py                                 |   40 +-
 misc/calibre/patches/patch-setup_build__environment.py                    |   17 -
 misc/calibre/patches/patch-setup_extensions.json                          |   22 +
 misc/calibre/patches/patch-setup_install.py                               |   16 +
 misc/calibre/patches/patch-src_calibre_constants.py                       |   15 +
 misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py            |   25 +
 misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp   |    7 +-
 misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp |   20 -
 misc/calibre/patches/patch-src_calibre_linux.py                           |   10 +-
 misc/calibre/patches/patch-src_calibre_utils_icu.c                        |   28 +-
 misc/calibre/patches/patch-src_calibre_utils_matcher.c                    |   70 +---
 14 files changed, 248 insertions(+), 244 deletions(-)

diffs (truncated from 1157 to 300 lines):

diff -r 62e003b30af3 -r 923031d97681 misc/calibre/Makefile
--- a/misc/calibre/Makefile     Sun Jan 09 15:42:37 2022 +0000
+++ b/misc/calibre/Makefile     Sun Jan 09 15:43:51 2022 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.258 2022/01/04 20:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.259 2022/01/09 15:43:51 rhialto Exp $
 
-DISTNAME=      calibre-3.40.1
-PKGREVISION=   32
+DISTNAME=      calibre-4.11.0
 CATEGORIES=    misc
-#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=  http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -14,7 +12,7 @@
 LICENSE=       gnu-gpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
-DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
+DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup-[0-9]*:../../www/py-beautifulsoup
 DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
 DEPENDS+=      ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
@@ -30,6 +28,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments25
+DEPENDS+=      ${PYPKGPREFIX}-qt5-webengine-[0-9]*:../../x11/py-qt5-webengine
 DEPENDS+=      ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve
@@ -37,11 +36,10 @@
 # for installation
 BUILD_DEPENDS+=        xdg-utils>=1.0.2:../../misc/xdg-utils
 
-PYTHON_VERSIONED_DEPENDENCIES+=        markdown
-
 EXTRACT_USING= bsdtar
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 3.16.0
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown
 
 USE_LANGUAGES=                 c99 c++
 USE_LIBTOOL=                   yes
@@ -70,7 +68,8 @@
 
 # This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
 SUBST_CLASSES+=                path
-SUBST_SED.path=                -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
+SUBST_SED.path+=       -e "s,\#! */usr/bin/env *python2,\#!${PYTHONBIN},"
+SUBST_SED.path+=       -e "s,\#! */usr/bin/env *python[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=    Fixing path to python.
 SUBST_STAGE.path=      pre-configure
 SUBST_FILES.path=      ${FIX_PYTHON_FILES}
@@ -86,8 +85,6 @@
 REPLACE_PYTHON+=       src/calibre/utils/*.py
 REPLACE_PYTHON+=       src/odf/*.py
 
-MAKE_ENV+=             FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
-MAKE_ENV+=             FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
 MAKE_ENV+=             PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
 MAKE_ENV+=             PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 MAKE_ENV+=             SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
@@ -107,7 +104,9 @@
        cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
            COPYRIGHT INSTALL.rst LICENSE.* \
            ${DESTDIR}${PREFIX}/share/doc/calibre
-       ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
+
+do-test:
+       cd ${WRKSRC} && ${PYTHONBIN} ./setup.py test
 
 .include "../../lang/python/application.mk"
 .include "../../archivers//bzip2/buildlink3.mk"
@@ -119,7 +118,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
 .include "../../mk/libusb.buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -129,6 +127,7 @@
 # Get rid of --root=${DESTDIR}, use our own version from above instead.
 # because the setup.py is not the standard one and behaves differently.
 _PYSETUPINSTALLARGS=   ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
+BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
 .include "../../print/podofo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=0.20.2
 .include "../../print/poppler-includes/buildlink3.mk"
@@ -138,6 +137,8 @@
 .include "../../sysutils/hal/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-dbus+=        ${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../textproc/hyphen/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../x11/py-sip/buildlink3.mk"
diff -r 62e003b30af3 -r 923031d97681 misc/calibre/PLIST
--- a/misc/calibre/PLIST        Sun Jan 09 15:42:37 2022 +0000
+++ b/misc/calibre/PLIST        Sun Jan 09 15:43:51 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.92 2019/03/25 13:11:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.93 2022/01/09 15:43:51 rhialto Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -19,6 +19,8 @@
 bin/lrs2lrf
 bin/markdown-calibre
 bin/web2disk
+lib/calibre/backports/__init__.py
+lib/calibre/backports/functools_lru_cache.py
 lib/calibre/calibre/__init__.py
 lib/calibre/calibre/constants.py
 lib/calibre/calibre/customize/__init__.py
@@ -129,7 +131,6 @@
 lib/calibre/calibre/devices/kobo/books.py
 lib/calibre/calibre/devices/kobo/driver.py
 lib/calibre/calibre/devices/kobo/kobotouch_config.py
-lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
 lib/calibre/calibre/devices/misc.py
 lib/calibre/calibre/devices/mtp/__init__.py
@@ -173,7 +174,6 @@
 lib/calibre/calibre/devices/usbms/device.py
 lib/calibre/calibre/devices/usbms/deviceconfig.py
 lib/calibre/calibre/devices/usbms/driver.py
-lib/calibre/calibre/devices/usbobserver/test.py
 lib/calibre/calibre/devices/user_defined/__init__.py
 lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/devices/utils.py
@@ -292,7 +292,6 @@
 lib/calibre/calibre/ebooks/hyphenate.py
 lib/calibre/calibre/ebooks/iterator/__init__.py
 lib/calibre/calibre/ebooks/lit/__init__.py
-lib/calibre/calibre/ebooks/lit/from_any.py
 lib/calibre/calibre/ebooks/lit/lzx.py
 lib/calibre/calibre/ebooks/lit/maps/__init__.py
 lib/calibre/calibre/ebooks/lit/maps/html.py
@@ -305,9 +304,7 @@
 lib/calibre/calibre/ebooks/lrf/html/__init__.py
 lib/calibre/calibre/ebooks/lrf/html/color_map.py
 lib/calibre/calibre/ebooks/lrf/html/convert_from.py
-lib/calibre/calibre/ebooks/lrf/html/convert_to.py
 lib/calibre/calibre/ebooks/lrf/html/table.py
-lib/calibre/calibre/ebooks/lrf/html/table_as_image.py
 lib/calibre/calibre/ebooks/lrf/input.py
 lib/calibre/calibre/ebooks/lrf/lrfparser.py
 lib/calibre/calibre/ebooks/lrf/lrs/__init__.py
@@ -428,8 +425,6 @@
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/display/__init__.py
-lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
-lib/calibre/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py
 lib/calibre/calibre/ebooks/oeb/display/webview.py
 lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
 lib/calibre/calibre/ebooks/oeb/iterator/book.py
@@ -441,6 +436,7 @@
 lib/calibre/calibre/ebooks/oeb/polish/cascade.py
 lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
 lib/calibre/calibre/ebooks/oeb/polish/check/base.py
+lib/calibre/calibre/ebooks/oeb/polish/check/css.py
 lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
 lib/calibre/calibre/ebooks/oeb/polish/check/images.py
 lib/calibre/calibre/ebooks/oeb/polish/check/links.py
@@ -455,6 +451,7 @@
 lib/calibre/calibre/ebooks/oeb/polish/embed.py
 lib/calibre/calibre/ebooks/oeb/polish/errors.py
 lib/calibre/calibre/ebooks/oeb/polish/fonts.py
+lib/calibre/calibre/ebooks/oeb/polish/hyphenation.py
 lib/calibre/calibre/ebooks/oeb/polish/images.py
 lib/calibre/calibre/ebooks/oeb/polish/import_book.py
 lib/calibre/calibre/ebooks/oeb/polish/jacket.py
@@ -524,22 +521,20 @@
 lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
 lib/calibre/calibre/ebooks/pdf/__init__.py
-lib/calibre/calibre/ebooks/pdf/from_comic.py
-lib/calibre/calibre/ebooks/pdf/outline_writer.py
+lib/calibre/calibre/ebooks/pdf/develop.py
+lib/calibre/calibre/ebooks/pdf/html_writer.py
+lib/calibre/calibre/ebooks/pdf/image_writer.py
 lib/calibre/calibre/ebooks/pdf/pageoptions.py
 lib/calibre/calibre/ebooks/pdf/pdftohtml.py
 lib/calibre/calibre/ebooks/pdf/reflow.py
 lib/calibre/calibre/ebooks/pdf/render/__init__.py
 lib/calibre/calibre/ebooks/pdf/render/common.py
-lib/calibre/calibre/ebooks/pdf/render/engine.py
 lib/calibre/calibre/ebooks/pdf/render/fonts.py
-lib/calibre/calibre/ebooks/pdf/render/from_html.py
 lib/calibre/calibre/ebooks/pdf/render/gradients.py
 lib/calibre/calibre/ebooks/pdf/render/graphics.py
 lib/calibre/calibre/ebooks/pdf/render/links.py
 lib/calibre/calibre/ebooks/pdf/render/serialize.py
-lib/calibre/calibre/ebooks/pdf/render/test.py
-lib/calibre/calibre/ebooks/pdf/render/toc.py
+lib/calibre/calibre/ebooks/pdf/test_html_writer.py
 lib/calibre/calibre/ebooks/pml/__init__.py
 lib/calibre/calibre/ebooks/pml/pmlconverter.py
 lib/calibre/calibre/ebooks/pml/pmlml.py
@@ -552,6 +547,7 @@
 lib/calibre/calibre/ebooks/readability/debug.py
 lib/calibre/calibre/ebooks/readability/htmls.py
 lib/calibre/calibre/ebooks/readability/readability.py
+lib/calibre/calibre/ebooks/render_html.py
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/preprocess.py
@@ -605,7 +601,6 @@
 lib/calibre/calibre/ebooks/rtf2xml/table.py
 lib/calibre/calibre/ebooks/rtf2xml/table_info.py
 lib/calibre/calibre/ebooks/rtf2xml/tokenize.py
-lib/calibre/calibre/ebooks/sgmllib.py
 lib/calibre/calibre/ebooks/snb/__init__.py
 lib/calibre/calibre/ebooks/snb/snbfile.py
 lib/calibre/calibre/ebooks/snb/snbml.py
@@ -790,7 +785,6 @@
 lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
-lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
 lib/calibre/calibre/gui2/dialogs/comments_dialog.py
 lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
@@ -849,6 +843,7 @@
 lib/calibre/calibre/gui2/font_family_chooser.py
 lib/calibre/calibre/gui2/gestures.py
 lib/calibre/calibre/gui2/icon_theme.py
+lib/calibre/calibre/gui2/image_popup.py
 lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/job_indicator.py
 lib/calibre/calibre/gui2/jobs.py
@@ -882,6 +877,7 @@
 lib/calibre/calibre/gui2/metadata/single_download.py
 lib/calibre/calibre/gui2/notify.py
 lib/calibre/calibre/gui2/open_with.py
+lib/calibre/calibre/gui2/palette.py
 lib/calibre/calibre/gui2/pin_columns.py
 lib/calibre/calibre/gui2/preferences/__init__.py
 lib/calibre/calibre/gui2/preferences/adding.py
@@ -1019,9 +1015,8 @@
 lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
 lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
 lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
-lib/calibre/calibre/gui2/store/web_control.py
+lib/calibre/calibre/gui2/store/web_store.py
 lib/calibre/calibre/gui2/store/web_store_dialog.py
-lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
 lib/calibre/calibre/gui2/tag_browser/__init__.py
 lib/calibre/calibre/gui2/tag_browser/model.py
 lib/calibre/calibre/gui2/tag_browser/ui.py
@@ -1095,24 +1090,21 @@
 lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
-lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
-lib/calibre/calibre/gui2/viewer/config.py
-lib/calibre/calibre/gui2/viewer/config_ui.py
-lib/calibre/calibre/gui2/viewer/documentview.py
-lib/calibre/calibre/gui2/viewer/fake_net.py
-lib/calibre/calibre/gui2/viewer/flip.py
-lib/calibre/calibre/gui2/viewer/footnote.py
-lib/calibre/calibre/gui2/viewer/gestures.py
-lib/calibre/calibre/gui2/viewer/image_popup.py
-lib/calibre/calibre/gui2/viewer/inspector.py
-lib/calibre/calibre/gui2/viewer/javascript.py
-lib/calibre/calibre/gui2/viewer/keys.py
+lib/calibre/calibre/gui2/viewer/annotations.py
+lib/calibre/calibre/gui2/viewer/bookmarks.py
+lib/calibre/calibre/gui2/viewer/convert_book.py
+lib/calibre/calibre/gui2/viewer/lookup.py
 lib/calibre/calibre/gui2/viewer/main.py
-lib/calibre/calibre/gui2/viewer/position.py
+lib/calibre/calibre/gui2/viewer/mathjax.py
+lib/calibre/calibre/gui2/viewer/overlay.py
 lib/calibre/calibre/gui2/viewer/printing.py
-lib/calibre/calibre/gui2/viewer/table_popup.py
+lib/calibre/calibre/gui2/viewer/search.py
+lib/calibre/calibre/gui2/viewer/shortcuts.py
 lib/calibre/calibre/gui2/viewer/toc.py
+lib/calibre/calibre/gui2/viewer/toolbars.py
 lib/calibre/calibre/gui2/viewer/ui.py
+lib/calibre/calibre/gui2/viewer/web_view.py
+lib/calibre/calibre/gui2/webengine.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
 lib/calibre/calibre/gui2/win_file_dialogs.py
@@ -1154,11 +1146,15 @@
 lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
-lib/calibre/calibre/plugins/html.so
+lib/calibre/calibre/plugins/html_as_json.so
+lib/calibre/calibre/plugins/html_syntax_highlighter.so
 lib/calibre/calibre/plugins/hunspell.so
+lib/calibre/calibre/plugins/hyphen.so