CVS commit: pkgsrc/misc/calibre

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/misc/calibre
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sun, 9 Jan 2022 15:43:52 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jan  9 15:43:52 UTC 2022

Modified Files:
        pkgsrc/misc/calibre: Makefile PLIST distinfo
        pkgsrc/misc/calibre/patches: patch-setup_build.py
            patch-src_calibre_headless_fontconfig_database.cpp
            patch-src_calibre_linux.py patch-src_calibre_utils_icu.c
            patch-src_calibre_utils_matcher.c
Added Files:
        pkgsrc/misc/calibre/patches: patch-setup_extensions.json
            patch-setup_install.py patch-src_calibre_constants.py
            patch-src_calibre_ebooks_BeautifulSoup.py
Removed Files:
        pkgsrc/misc/calibre/patches: patch-setup_build__environment.py
            patch-src_calibre_headless_headless__integration.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/misc/calibre/PLIST
cvs rdiff -u -r1.108 -r1.109 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/calibre/patches/patch-setup_build.py
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/misc/calibre/patches/patch-setup_extensions.json \
    pkgsrc/misc/calibre/patches/patch-setup_install.py
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_constants.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp \
    pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c \
    pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/misc/calibre/patches/patch-src_calibre_linux.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.258 pkgsrc/misc/calibre/Makefile:1.259
--- pkgsrc/misc/calibre/Makefile:1.258  Tue Jan  4 20:54:18 2022
+++ pkgsrc/misc/calibre/Makefile        Sun Jan  9 15:43:51 2022
@@ -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 @@ COMMENT=      E-book library management appli
 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}-netifaces>=0.8:
 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 @@ DEPENDS+=   ${PYPKGPREFIX}-sqlite3-[0-9]*:
 # 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 @@ SUBST_FILES.prefix=   setup/build_environm
 
 # 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/ebooks/meta
 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 @@ post-install:
        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 @@ BUILDLINK_API_DEPENDS.libmtp+=      libmtp>=1
 .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 @@ _PYSETUPTOOLSINSTALLARGS=   # empty
 # 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 @@ BUILDLINK_API_DEPENDS.poppler+=     poppler>
 .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"

Index: pkgsrc/misc/calibre/PLIST
diff -u pkgsrc/misc/calibre/PLIST:1.92 pkgsrc/misc/calibre/PLIST:1.93
--- pkgsrc/misc/calibre/PLIST:1.92      Mon Mar 25 13:11:56 2019
+++ pkgsrc/misc/calibre/PLIST   Sun Jan  9 15:43:51 2022
@@ -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/lrfviewer
 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/bookmar
 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/cli.py
 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/htmlz/oeb2htm
 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/fonts.py
 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/odt/input.py
 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/__
 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/do
 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/__in
 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/c
 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/style
 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_
 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/filename_patter
 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
 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/wh
 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/tweak_book/widg
 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/cPalmdoc.so
 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
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/imageops.so
 lib/calibre/calibre/plugins/libheadless.so
+lib/calibre/calibre/plugins/libmtp.so
+lib/calibre/calibre/plugins/libusb.so
 lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/matcher.so
@@ -1167,7 +1163,6 @@ lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pictureflow.so
 lib/calibre/calibre/plugins/podofo.so
 lib/calibre/calibre/plugins/progress_indicator.so
-lib/calibre/calibre/plugins/qt_hack.so
 lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/plugins/tokenizer.so
@@ -1230,7 +1225,6 @@ lib/calibre/calibre/translations/dynamic
 lib/calibre/calibre/translations/msgfmt.py
 lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
-lib/calibre/calibre/utils/apsw_shell.py
 lib/calibre/calibre/utils/bibtex.py
 lib/calibre/calibre/utils/browser.py
 lib/calibre/calibre/utils/certgen.py
@@ -1243,7 +1237,6 @@ lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/dbus_service.py
 lib/calibre/calibre/utils/exim.py
-lib/calibre/calibre/utils/file_associations.py
 lib/calibre/calibre/utils/file_type_icons.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
@@ -1266,6 +1259,7 @@ lib/calibre/calibre/utils/fonts/sfnt/hea
 lib/calibre/calibre/utils/fonts/sfnt/kern.py
 lib/calibre/calibre/utils/fonts/sfnt/loca.py
 lib/calibre/calibre/utils/fonts/sfnt/maxp.py
+lib/calibre/calibre/utils/fonts/sfnt/merge.py
 lib/calibre/calibre/utils/fonts/sfnt/metrics.py
 lib/calibre/calibre/utils/fonts/sfnt/subset.py
 lib/calibre/calibre/utils/fonts/utils.py
@@ -1274,6 +1268,10 @@ lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/formatter_functions.py
 lib/calibre/calibre/utils/html2text.py
 lib/calibre/calibre/utils/https.py
+lib/calibre/calibre/utils/hyphenation/__init__.py
+lib/calibre/calibre/utils/hyphenation/dictionaries.py
+lib/calibre/calibre/utils/hyphenation/hyphenate.py
+lib/calibre/calibre/utils/hyphenation/test_hyphenation.py
 lib/calibre/calibre/utils/icu.py
 lib/calibre/calibre/utils/icu_test.py
 lib/calibre/calibre/utils/img.py
@@ -1284,7 +1282,6 @@ lib/calibre/calibre/utils/ipc/__init__.p
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
 lib/calibre/calibre/utils/ipc/pool.py
-lib/calibre/calibre/utils/ipc/proxy.py
 lib/calibre/calibre/utils/ipc/server.py
 lib/calibre/calibre/utils/ipc/simple_worker.py
 lib/calibre/calibre/utils/ipc/worker.py
@@ -1296,7 +1293,6 @@ lib/calibre/calibre/utils/localization.p
 lib/calibre/calibre/utils/localunzip.py
 lib/calibre/calibre/utils/lock.py
 lib/calibre/calibre/utils/logging.py
-lib/calibre/calibre/utils/lru_cache.py
 lib/calibre/calibre/utils/magick/__init__.py
 lib/calibre/calibre/utils/magick/draw.py
 lib/calibre/calibre/utils/magick/legacy.py
@@ -1320,20 +1316,16 @@ lib/calibre/calibre/utils/random_ua.py
 lib/calibre/calibre/utils/rapydscript.py
 lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
-lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/run_tests.py
 lib/calibre/calibre/utils/search_query_parser.py
 lib/calibre/calibre/utils/search_query_parser_test.py
 lib/calibre/calibre/utils/serialize.py
-lib/calibre/calibre/utils/serve_coffee.py
-lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/shared_file.py
 lib/calibre/calibre/utils/short_uuid.py
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
 lib/calibre/calibre/utils/socket_inheritance.py
-lib/calibre/calibre/utils/soupparser.py
 lib/calibre/calibre/utils/speedups.py
 lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/tdir_in_cache.py
@@ -1346,6 +1338,8 @@ lib/calibre/calibre/utils/unicode_getpas
 lib/calibre/calibre/utils/unicode_names.py
 lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
+lib/calibre/calibre/utils/windows/__init__.py
+lib/calibre/calibre/utils/windows/wintest.py
 lib/calibre/calibre/utils/winreg/__init__.py
 lib/calibre/calibre/utils/winreg/dde.py
 lib/calibre/calibre/utils/winreg/default_programs.py
@@ -1354,6 +1348,7 @@ lib/calibre/calibre/utils/wmf/__init__.p
 lib/calibre/calibre/utils/wmf/emf.py
 lib/calibre/calibre/utils/wmf/parse.py
 lib/calibre/calibre/utils/wordcount.py
+lib/calibre/calibre/utils/xml_parse.py
 lib/calibre/calibre/utils/zipfile.py
 lib/calibre/calibre/web/__init__.py
 lib/calibre/calibre/web/feeds/__init__.py
@@ -1365,18 +1360,16 @@ lib/calibre/calibre/web/feeds/templates.
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
 lib/calibre/calibre/web/fetch/utils.py
+lib/calibre/calibre_lzma/__init__.py
+lib/calibre/calibre_lzma/errors.py
+lib/calibre/calibre_lzma/lzma1.py
+lib/calibre/calibre_lzma/xz.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
 lib/calibre/css_selectors/parser.py
 lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
-lib/calibre/duktape/__init__.py
-lib/calibre/duktape/tests.py
-lib/calibre/lzma/__init__.py
-lib/calibre/lzma/errors.py
-lib/calibre/lzma/lzma1.py
-lib/calibre/lzma/xz.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -1412,8 +1405,19 @@ lib/calibre/odf/thumbnail.py
 lib/calibre/odf/userfield.py
 lib/calibre/odf/xforms.py
 lib/calibre/polyglot/__init__.py
+lib/calibre/polyglot/binary.py
 lib/calibre/polyglot/builtins.py
+lib/calibre/polyglot/functools.py
+lib/calibre/polyglot/html_entities.py
+lib/calibre/polyglot/http_client.py
+lib/calibre/polyglot/http_cookie.py
 lib/calibre/polyglot/http_server.py
+lib/calibre/polyglot/io.py
+lib/calibre/polyglot/plistlib.py
+lib/calibre/polyglot/queue.py
+lib/calibre/polyglot/reprlib.py
+lib/calibre/polyglot/smtplib.py
+lib/calibre/polyglot/socketserver.py
 lib/calibre/polyglot/urllib.py
 lib/calibre/templite/__init__.py
 lib/calibre/tinycss/__init__.py
@@ -1438,6 +1442,18 @@ lib/calibre/tinycss/tokenizer.py
 lib/calibre/tinycss/version.py
 ${PYSITELIB}/init_calibre.py
 share/bash-completion/completions/calibre
+share/bash-completion/completions/calibre-debug
+share/bash-completion/completions/calibre-server
+share/bash-completion/completions/calibre-smtp
+share/bash-completion/completions/ebook-convert
+share/bash-completion/completions/ebook-device
+share/bash-completion/completions/ebook-edit
+share/bash-completion/completions/ebook-meta
+share/bash-completion/completions/ebook-polish
+share/bash-completion/completions/ebook-viewer
+share/bash-completion/completions/fetch-ebook-metadata
+share/bash-completion/completions/lrf2lrs
+share/bash-completion/completions/lrfviewer
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
 share/calibre/calibre-ebook-root-CA.crt
@@ -1446,11 +1462,9 @@ share/calibre/calibre-portable.bat
 share/calibre/calibre-portable.sh
 share/calibre/catalog/DefaultCover.jpg
 share/calibre/catalog/mastheadImage.gif
-share/calibre/catalog/section_list_templates.py
+share/calibre/catalog/section_list_templates.conf
 share/calibre/catalog/stylesheet.css
 share/calibre/catalog/template.xhtml
-share/calibre/coffee-script.js
-share/calibre/compiled_coffeescript.zip
 share/calibre/content-server/calibre.appcache
 share/calibre/content-server/calibre.png
 share/calibre/content-server/empty.html
@@ -1460,6 +1474,7 @@ share/calibre/content-server/locales.zip
 share/calibre/content-server/mobile.css
 share/calibre/content-server/reset.css
 share/calibre/csscolorparser.js
+share/calibre/csslint.js
 share/calibre/default_tweaks.py
 share/calibre/dictionaries/en-GB/en-GB.aff
 share/calibre/dictionaries/en-GB/en-GB.dic
@@ -1492,12 +1507,16 @@ share/calibre/fonts/liberation/Liberatio
 share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
+share/calibre/hyphenation/dictionaries.tar.xz
+share/calibre/hyphenation/locales.json
+share/calibre/hyphenation/sha1sum
 share/calibre/images.qrc
 share/calibre/images/add_book.png
 share/calibre/images/apple-touch-icon.png
 share/calibre/images/arrow-down.png
 share/calibre/images/arrow-up.png
 share/calibre/images/auto-reload.png
+share/calibre/images/auto-scroll.png
 share/calibre/images/auto_author_sort.png
 share/calibre/images/back.png
 share/calibre/images/beautify.png
@@ -1509,6 +1528,8 @@ share/calibre/images/catalog.png
 share/calibre/images/chapters.png
 share/calibre/images/character-set.png
 share/calibre/images/clear_left.png
+share/calibre/images/close-for-dark-theme.png
+share/calibre/images/close-for-light-theme.png
 share/calibre/images/code.png
 share/calibre/images/column.png
 share/calibre/images/compress-image.png
@@ -1583,8 +1604,10 @@ share/calibre/images/format-text-supersc
 share/calibre/images/format-text-underline.png
 share/calibre/images/forward.png
 share/calibre/images/gear.png
+share/calibre/images/generic-library.png
 share/calibre/images/gmail_logo.png
 share/calibre/images/grid.png
+share/calibre/images/h-ellipsis.png
 share/calibre/images/help.png
 share/calibre/images/heuristics.png
 share/calibre/images/highlight_only_off.png
@@ -1671,6 +1694,7 @@ share/calibre/images/quickview.png
 share/calibre/images/random.png
 share/calibre/images/rating.png
 share/calibre/images/reader.png
+share/calibre/images/reference.png
 share/calibre/images/remove_books.png
 share/calibre/images/reports.png
 share/calibre/images/resize.png
@@ -1710,6 +1734,7 @@ share/calibre/images/tweak.png
 share/calibre/images/tweaks.png
 share/calibre/images/unpack-book.png
 share/calibre/images/user_profile.png
+share/calibre/images/v-ellipsis.png
 share/calibre/images/view-image.png
 share/calibre/images/view-refresh.png
 share/calibre/images/view.png
@@ -1728,6 +1753,7 @@ share/calibre/localization/pykakasi/kana
 share/calibre/localization/pykakasi/kanwadict2.calibre_msgpack
 share/calibre/localization/stats.calibre_msgpack
 share/calibre/localization/website-languages.txt
+share/calibre/lookup.js
 share/calibre/mathjax/MathJax.js
 share/calibre/mathjax/extensions/AssistiveMML.js
 share/calibre/mathjax/extensions/CHTML-preview.js
@@ -1986,23 +2012,14 @@ share/calibre/mathjax/manifest.json
 share/calibre/metadata_sqlite.sql
 share/calibre/mime.types
 share/calibre/mozilla-ca-certs.pem
+share/calibre/pdf-mathjax-loader.js
+share/calibre/pdf-preprint.js
 share/calibre/quick_start/deu.epub
 share/calibre/quick_start/eng.epub
 share/calibre/quick_start/fra.epub
 share/calibre/quick_start/ita.epub
 share/calibre/quick_start/swe.epub
 share/calibre/rapydscript/compiler.js.xz
-share/calibre/rapydscript/lib/aes.pyj
-share/calibre/rapydscript/lib/elementmaker.pyj
-share/calibre/rapydscript/lib/encodings.pyj
-share/calibre/rapydscript/lib/gettext.pyj
-share/calibre/rapydscript/lib/math.pyj
-share/calibre/rapydscript/lib/operator.pyj
-share/calibre/rapydscript/lib/pythonize.pyj
-share/calibre/rapydscript/lib/random.pyj
-share/calibre/rapydscript/lib/re.pyj
-share/calibre/rapydscript/lib/traceback.pyj
-share/calibre/rapydscript/lib/uuid.pyj
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/1843.recipe
@@ -2033,11 +2050,11 @@ share/calibre/recipes/ad.recipe
 share/calibre/recipes/adevarul.recipe
 share/calibre/recipes/adnkronos.recipe
 share/calibre/recipes/ads_of_the_world.recipe
-share/calibre/recipes/adventure_zone_pl.recipe
 share/calibre/recipes/adventuregamers.recipe
 share/calibre/recipes/aftenposten.recipe
 share/calibre/recipes/agrogerila.recipe
 share/calibre/recipes/aif_ru.recipe
+share/calibre/recipes/ainonline.recipe
 share/calibre/recipes/air_force_times.recipe
 share/calibre/recipes/ajc.recipe
 share/calibre/recipes/ajiajin.recipe
@@ -2115,7 +2132,6 @@ share/calibre/recipes/bangkok_biz.recipe
 share/calibre/recipes/bangkokpost.recipe
 share/calibre/recipes/bankier_pl.recipe
 share/calibre/recipes/barrons.recipe
-share/calibre/recipes/bash_org_pl.recipe
 share/calibre/recipes/bay_citizen.recipe
 share/calibre/recipes/bbc.recipe
 share/calibre/recipes/bbc_arabic.recipe
@@ -2148,7 +2164,6 @@ share/calibre/recipes/biz_portal.recipe
 share/calibre/recipes/blesk.recipe
 share/calibre/recipes/blic.recipe
 share/calibre/recipes/blog_da_cidadania.recipe
-share/calibre/recipes/bloomberg_columns.recipe
 share/calibre/recipes/boortz.recipe
 share/calibre/recipes/borse_online.recipe
 share/calibre/recipes/borsen_dk.recipe
@@ -2245,7 +2260,6 @@ share/calibre/recipes/common_dreams.reci
 share/calibre/recipes/computerworld_dk.recipe
 share/calibre/recipes/computerworld_pl.recipe
 share/calibre/recipes/computing_uk.recipe
-share/calibre/recipes/conowego_pl.recipe
 share/calibre/recipes/consortium_news.recipe
 share/calibre/recipes/contemporary_argentine_writers.recipe
 share/calibre/recipes/contropiano.recipe
@@ -2301,7 +2315,6 @@ share/calibre/recipes/dbb.recipe
 share/calibre/recipes/de_redactie_be.recipe
 share/calibre/recipes/de_standaard.recipe
 share/calibre/recipes/deadspin.recipe
-share/calibre/recipes/deccan_herald.recipe
 share/calibre/recipes/defensenews.recipe
 share/calibre/recipes/degentenaar.recipe
 share/calibre/recipes/delco_times.recipe
@@ -2312,6 +2325,7 @@ share/calibre/recipes/demorgen_be.recipe
 share/calibre/recipes/den_of_geek.recipe
 share/calibre/recipes/denik.cz.recipe
 share/calibre/recipes/denik_referendum.recipe
+share/calibre/recipes/denikn.cz.recipe
 share/calibre/recipes/denver_post.recipe
 share/calibre/recipes/der_standard.recipe
 share/calibre/recipes/deredactie.recipe
@@ -2442,7 +2456,6 @@ share/calibre/recipes/elperiodico_spanis
 share/calibre/recipes/elsevier.recipe
 share/calibre/recipes/eltiempo_hn.recipe
 share/calibre/recipes/eluniversal_ve.recipe
-share/calibre/recipes/eluniversalimpresa.recipe
 share/calibre/recipes/eluniverso_ec.recipe
 share/calibre/recipes/emg_en.recipe
 share/calibre/recipes/empire_magazine.recipe
@@ -2452,7 +2465,6 @@ share/calibre/recipes/entrepeneur.recipe
 share/calibre/recipes/eos_wetenschap.recipe
 share/calibre/recipes/epl_talk.recipe
 share/calibre/recipes/epw.recipe
-share/calibre/recipes/equipped.recipe
 share/calibre/recipes/erdinger_anzeiger.recipe
 share/calibre/recipes/erhvervs_avisen_dk.recipe
 share/calibre/recipes/esbjerglokalavisen_dk.recipe
@@ -2521,7 +2533,6 @@ share/calibre/recipes/foxnews.recipe
 share/calibre/recipes/fr_online.recipe
 share/calibre/recipes/frandroid.recipe
 share/calibre/recipes/frankfurter_rundschau.recipe
-share/calibre/recipes/frazpc.recipe
 share/calibre/recipes/freakonomics.recipe
 share/calibre/recipes/fredensborglokalavisen_dk.recipe
 share/calibre/recipes/fredericialokalavisen_dk.recipe
@@ -2530,7 +2541,6 @@ share/calibre/recipes/frederikssundlokal
 share/calibre/recipes/freenature.recipe
 share/calibre/recipes/freeway.recipe
 share/calibre/recipes/freisinger_tagblatt.recipe
-share/calibre/recipes/fria.recipe
 share/calibre/recipes/frontlineonnet.recipe
 share/calibre/recipes/fstream.recipe
 share/calibre/recipes/fudzilla.recipe
@@ -2666,7 +2676,6 @@ share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
 share/calibre/recipes/huffingtonpost_uk.recipe
 share/calibre/recipes/hurriyet.recipe
-share/calibre/recipes/hurriyet_daily_news.recipe
 share/calibre/recipes/hvg.recipe
 share/calibre/recipes/hvidovreavis_dk.recipe
 share/calibre/recipes/hvidovrelokalavisen_dk.recipe
@@ -2736,7 +2745,6 @@ share/calibre/recipes/japaa.recipe
 share/calibre/recipes/japan_news.recipe
 share/calibre/recipes/japan_times.recipe
 share/calibre/recipes/javalobby.recipe
-share/calibre/recipes/jazzpress.recipe
 share/calibre/recipes/jb_online.recipe
 share/calibre/recipes/jbpress.recipe
 share/calibre/recipes/jeuxvideo.recipe
@@ -2884,7 +2892,6 @@ share/calibre/recipes/london_free_press.
 share/calibre/recipes/los_tiempos_bo.recipe
 share/calibre/recipes/losservatoreromano_it.recipe
 share/calibre/recipes/lrb.recipe
-share/calibre/recipes/lrb_payed.recipe
 share/calibre/recipes/ludwig_mises.recipe
 share/calibre/recipes/luns_a_venres.recipe
 share/calibre/recipes/lupa.recipe
@@ -2898,7 +2905,7 @@ share/calibre/recipes/macity.recipe
 share/calibre/recipes/macleans.recipe
 share/calibre/recipes/macrobusiness.recipe
 share/calibre/recipes/maekyung.recipe
-share/calibre/recipes/magyar_idok.recipe
+share/calibre/recipes/magyar_nemzet.recipe
 share/calibre/recipes/maharashtra_times.recipe
 share/calibre/recipes/mail_and_guardian.recipe
 share/calibre/recipes/mainichi.recipe
@@ -2939,7 +2946,6 @@ share/calibre/recipes/miami_herald.recip
 share/calibre/recipes/michalkiewicz.recipe
 share/calibre/recipes/michellemalkin.recipe
 share/calibre/recipes/miesbacher_merkur.recipe
-share/calibre/recipes/milenio.recipe
 share/calibre/recipes/military_times.recipe
 share/calibre/recipes/ming_pao.recipe
 share/calibre/recipes/ming_pao_toronto.recipe
@@ -3270,7 +3276,6 @@ share/calibre/recipes/salon.recipe
 share/calibre/recipes/salonica_press_news.recipe
 share/calibre/recipes/samanyolu_haber.recipe
 share/calibre/recipes/samanyolu_teknoloji.recipe
-share/calibre/recipes/samcik_blox.recipe
 share/calibre/recipes/san_fran_chronicle.recipe
 share/calibre/recipes/sanjosemercurynews.recipe
 share/calibre/recipes/sarajevo_x.recipe
@@ -3364,7 +3369,6 @@ share/calibre/recipes/sueddeutschezeitun
 share/calibre/recipes/sunday_times_magazine.recipe
 share/calibre/recipes/superbebe.recipe
 share/calibre/recipes/superesportes.recipe
-share/calibre/recipes/svd_se.recipe
 share/calibre/recipes/swiat_obrazu.recipe
 share/calibre/recipes/swiatkindle.recipe
 share/calibre/recipes/syddjurslokalavisen_dk.recipe
@@ -3388,7 +3392,6 @@ share/calibre/recipes/techtarget.recipe
 share/calibre/recipes/tedneward.recipe
 share/calibre/recipes/tegernseer_zeitung.recipe
 share/calibre/recipes/telam.recipe
-share/calibre/recipes/telegraph_in.recipe
 share/calibre/recipes/telegraph_uk.recipe
 share/calibre/recipes/telepolis.recipe
 share/calibre/recipes/telepolis_artikel.recipe
@@ -3396,6 +3399,7 @@ share/calibre/recipes/teleread.recipe
 share/calibre/recipes/thai_post_daily.recipe
 share/calibre/recipes/thairath.recipe
 share/calibre/recipes/the_age.recipe
+share/calibre/recipes/the_baffler.recipe
 share/calibre/recipes/the_budget_fashionista.recipe
 share/calibre/recipes/the_clinic_online.recipe
 share/calibre/recipes/the_conversation.recipe
@@ -3431,6 +3435,7 @@ share/calibre/recipes/theeconomictimes_i
 share/calibre/recipes/theluminouslandscape.recipe
 share/calibre/recipes/themarketticker.recipe
 share/calibre/recipes/themorningpaper.recipe
+share/calibre/recipes/thenewcriterion.recipe
 share/calibre/recipes/thenews.recipe
 share/calibre/recipes/theoldfoodie.recipe
 share/calibre/recipes/theonion.recipe
@@ -3613,20 +3618,12 @@ share/calibre/templates/lrf.xsl
 share/calibre/templates/new_book.html
 share/calibre/templates/new_nav.html
 share/calibre/templates/rtf.xsl
+share/calibre/toc.js
 share/calibre/tracer.epub
 share/calibre/user-agent-data.json
 share/calibre/user-manual-translation-stats.json
 share/calibre/viewer.html
 share/calibre/viewer.js
-share/calibre/viewer/blank.html
-share/calibre/viewer/bookmarks.js
-share/calibre/viewer/hyphenate/Hyphenator.js
-share/calibre/viewer/hyphenate/patterns.zip
-share/calibre/viewer/hyphenation.js
-share/calibre/viewer/images.js
-share/calibre/viewer/jquery.js
-share/calibre/viewer/jquery_scrollTo.js
-share/calibre/viewer/referencing.js
 share/doc/calibre/COPYRIGHT
 share/doc/calibre/Changelog.old.yaml
 share/doc/calibre/Changelog.yaml

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.108 pkgsrc/misc/calibre/distinfo:1.109
--- pkgsrc/misc/calibre/distinfo:1.108  Tue Oct 26 10:58:58 2021
+++ pkgsrc/misc/calibre/distinfo        Sun Jan  9 15:43:51 2022
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.108 2021/10/26 10:58:58 nia Exp $
+$NetBSD: distinfo,v 1.109 2022/01/09 15:43:51 rhialto Exp $
 
-BLAKE2s (calibre-3.40.1.tar.xz) = bbac7039a1918d6a0019f7b434ae5711107f8996762a4629e12fac1fe0224197
-SHA512 (calibre-3.40.1.tar.xz) = 1333c24e384ccae79d264055e1e84b8a13919e68d9290a277e07bb7f3b4579d15090859b50945672c155a438a2bf9e5f088f094bc30781af7c5d0d9ccd7226f4
-Size (calibre-3.40.1.tar.xz) = 38365300 bytes
-SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
-SHA1 (patch-setup_build__environment.py) = dd6160233c717e935205649ee685e71df3f1858e
-SHA1 (patch-src_calibre_headless_fontconfig_database.cpp) = d794a9f1c94c85d3406384bf25ade4be8d2f8a1c
-SHA1 (patch-src_calibre_headless_headless__integration.cpp) = 62ab6f5aaf6bd8bcbb875ab56eac1a474d8b446b
-SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
-SHA1 (patch-src_calibre_utils_icu.c) = fd0172000b9ab5d52730f9e4a5c8cc6c2253d69b
-SHA1 (patch-src_calibre_utils_matcher.c) = 1041dc748cec86c18f2438d284608f42f66fc282
+BLAKE2s (calibre-4.11.0.tar.xz) = 5fdcbbb4e9bb5c9a9f8f8f44433c6dec79b4be9e4ec7633b6059815bbe02ca81
+SHA512 (calibre-4.11.0.tar.xz) = 866e86c926ec6508573c5ad9f382fbc8815103d7248c93ce24a87795b2fb144523cb237bb75dffe024a075e2d4f1bbd7f608ca624d66c898f6840a4b4f3081e3
+Size (calibre-4.11.0.tar.xz) = 37038104 bytes
+SHA1 (patch-setup_build.py) = 6eeedbce76a627900c55f59d31ba76dc79fc7d27
+SHA1 (patch-setup_extensions.json) = 90f61a7c776220bfa16439eeb599eb2132e410b1
+SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
+SHA1 (patch-src_calibre_constants.py) = a72594b5a68fa42e7133d8be42dd30e73c8db205
+SHA1 (patch-src_calibre_ebooks_BeautifulSoup.py) = 5be182dde2085bbd2893a966aeb0f4fd4fc0c707
+SHA1 (patch-src_calibre_headless_fontconfig_database.cpp) = 55e7bd7b779ec2ff4a28fdd3ca9d9c10811b6bb1
+SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
+SHA1 (patch-src_calibre_utils_icu.c) = 219257d68925b5c4a0df897d89324457f2ff7289
+SHA1 (patch-src_calibre_utils_matcher.c) = a774e353c224ef5dfba115a89ee5831edaef02ae

Index: pkgsrc/misc/calibre/patches/patch-setup_build.py
diff -u pkgsrc/misc/calibre/patches/patch-setup_build.py:1.3 pkgsrc/misc/calibre/patches/patch-setup_build.py:1.4
--- pkgsrc/misc/calibre/patches/patch-setup_build.py:1.3        Thu Feb  1 16:05:56 2018
+++ pkgsrc/misc/calibre/patches/patch-setup_build.py    Sun Jan  9 15:43:51 2022
@@ -1,18 +1,46 @@
-$NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
+$NetBSD: patch-setup_build.py,v 1.4 2022/01/09 15:43:51 rhialto Exp $
 
-Fix linking against native X.
+- Fix linking against native X.
+- Include netbsd in various conditional building criteria.
 
---- setup/build.py.orig        2016-09-29 10:28:31.000000000 +0000
+--- setup/build.py.orig        2020-02-21 03:27:12.000000000 +0000
 +++ setup/build.py
-@@ -368,6 +368,7 @@ class Build(Command):
+@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
+ import textwrap, os, shlex, subprocess, glob, shutil, re, sys, json
+ from collections import namedtuple
+ 
+-from setup import Command, islinux, isbsd, isfreebsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
++from setup import Command, islinux, isbsd, isfreebsd, isnetbsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
+ isunix = islinux or isosx or isbsd or ishaiku
+ 
+ py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2])
+@@ -103,7 +103,7 @@ def is_ext_allowed(ext):
+     only = ext.get('only', '')
+     if only:
+         only = set(only.split())
+-        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows"]))
++        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows", "netbsd"]))
+         return len(q.intersection(only)) > 0
+     return True
+ 
+@@ -124,6 +124,8 @@ def parse_extension(ext):
+             ans = ext.pop('bsd_' + k, ans)
+         elif isfreebsd:
+             ans = ext.pop('freebsd_' + k, ans)
++        elif isnetbsd:
++            ans = ext.pop('netbsd_' + k, ans)
+         elif ishaiku:
+             ans = ext.pop('haiku_' + k, ans)
+         else:
+@@ -412,6 +414,7 @@ class Build(Command):
              INCLUDEPATH += {freetype}
              DESTDIR = {destdir}
              CONFIG -= create_cmake  # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
 +            QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
-             QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
              ''').format(
                  headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
-@@ -426,6 +427,7 @@ class Build(Command):
+                     target), freetype=' '.join(ft_inc_dirs))
+@@ -472,6 +475,7 @@ class Build(Command):
          SOURCES = {sources}
          INCLUDEPATH += {sipinc} {pyinc}
          VERSION = {ver}

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp
diff -u pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp:1.1 pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp:1.2
--- pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp:1.1  Sun Jul  5 12:09:08 2020
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_headless_fontconfig_database.cpp      Sun Jan  9 15:43:51 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_calibre_headless_fontconfig_database.cpp,v 1.1 2020/07/05 12:09:08 rhialto Exp $
+$NetBSD: patch-src_calibre_headless_fontconfig_database.cpp,v 1.2 2022/01/09 15:43:51 rhialto Exp $
 
 Qt 5.15.0 has more languages in an array that Calibre tries to match,
 and it checks with a STATIC_ASSERT.
 
---- src/calibre/headless/fontconfig_database.cpp.orig  2020-07-02 17:32:43.809996191 +0000
+--- src/calibre/headless/fontconfig_database.cpp.orig  2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/headless/fontconfig_database.cpp
-@@ -295,7 +295,27 @@ static const char specialLanguages[][6] 
+@@ -295,7 +295,28 @@ static const char specialLanguages[][6] 
      "", // MasaramGondi
      "", // Nushu
      "", // Soyombo
@@ -31,6 +31,7 @@ and it checks with a STATIC_ASSERT.
 +    "", //    Script_KhitanSmallScript,
 +    "", //    Script_Yezidi,
 +#endif // Qt >= 5.15
++
  #else
      ""  // SignWriting
  #endif // Qt >= 5.11
Index: pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c
diff -u pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c:1.1 pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c:1.2
--- pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c:1.1       Tue Nov 17 01:55:04 2020
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_utils_icu.c   Sun Jan  9 15:43:51 2022
@@ -1,23 +1,15 @@
-$NetBSD: patch-src_calibre_utils_icu.c,v 1.1 2020/11/17 01:55:04 gutteridge Exp $
+$NetBSD: patch-src_calibre_utils_icu.c,v 1.2 2022/01/09 15:43:51 rhialto Exp $
 
 Fix build with ICU 68.
 
---- src/calibre/utils/icu.c.orig       2019-03-08 06:09:34.000000000 +0000
+--- src/calibre/utils/icu.c.orig       2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/utils/icu.c
-@@ -243,14 +243,14 @@ icu_Collator_contains(icu_Collator *self
+@@ -4,6 +4,8 @@
+ #define LOWER_CASE 1
+ #define TITLE_CASE 2
  
-     a = python_to_icu(a_, &asz);
-     if (a == NULL) goto end;
--    if (asz == 0) { found = TRUE; goto end; }
-+    if (asz == 0) { found = true; goto end; }
-     b = python_to_icu(b_, &bsz);
-     if (b == NULL) goto end;
- 
-     search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
-     if (U_SUCCESS(status)) {
-         pos = usearch_first(search, &status);
--        if (pos != USEARCH_DONE) found = TRUE;
-+        if (pos != USEARCH_DONE) found = true;
-     }
- end:
-     if (search != NULL) usearch_close(search);
++#define TRUE 1
++
+ static PyObject* uchar_to_unicode(const UChar *src, int32_t len) {
+     wchar_t *buf = NULL;
+     PyObject *ans = NULL;
Index: pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c
diff -u pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c:1.1 pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c:1.2
--- pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c:1.1   Tue Nov 17 01:55:04 2020
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_utils_matcher.c       Sun Jan  9 15:43:51 2022
@@ -1,73 +1,15 @@
-$NetBSD: patch-src_calibre_utils_matcher.c,v 1.1 2020/11/17 01:55:04 gutteridge Exp $
+$NetBSD: patch-src_calibre_utils_matcher.c,v 1.2 2022/01/09 15:43:51 rhialto Exp $
 
 Fix build with ICU 68.
 
---- src/calibre/utils/matcher.c.orig   2019-03-08 06:09:34.000000000 +0000
+--- src/calibre/utils/matcher.c.orig   2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/utils/matcher.c
-@@ -15,9 +15,6 @@
+@@ -15,7 +15,7 @@
  #define inline
  #endif
  
 -typedef unsigned char bool;
--#define TRUE 1
--#define FALSE 0
++//typedef unsigned char bool;
+ #define TRUE 1
+ #define FALSE 0
  #define MAX(x, y) ((x > y) ? x : y)
- #define nullfree(x) if(x != NULL) free(x); x = NULL;
- 
-@@ -240,10 +237,10 @@ static bool create_searches(UStringSearc
-         U16_FWD_1(needle, i, needle_len);
-         if (pos == i) break;
-         searches[pos] = usearch_openFromCollator(needle + pos, i - pos, haystack, haystack_len, collator, NULL, &status);
--        if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return FALSE; }
-+        if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return false; }
-     }
- 
--    return TRUE;
-+    return true;
- }
- 
- static void free_searches(UStringSearch **searches, int32_t count) {
-@@ -259,14 +256,14 @@ static bool match(UChar **items, int32_t
-     int32_t i = 0, maxhl = 0;
-     int32_t r = 0, *positions = NULL;
-     MatchInfo *matches = NULL;
--    bool ok = FALSE;
-+    bool ok = false;
-     MemoryItem ***memo = NULL;
-     int32_t needle_len = u_strlen(needle);
-     UStringSearch **searches = NULL;
- 
-     if (needle_len <= 0 || item_count <= 0) {
-         for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0;
--        ok = TRUE;
-+        ok = true;
-         goto end;
-     }
- 
-@@ -289,7 +286,7 @@ static bool match(UChar **items, int32_t
- 
-     if (maxhl <= 0) {
-         for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0;
--        ok = TRUE;
-+        ok = true;
-         goto end;
-     }
- 
-@@ -308,7 +305,7 @@ static bool match(UChar **items, int32_t
-         convert_positions(positions, final_positions + i * needle_char_len, matches[i].haystack, needle_char_len, needle_len, match_results[i].score);
-     }
- 
--    ok = TRUE;
-+    ok = true;
- end:
-     nullfree(positions);
-     nullfree(stack.items);
-@@ -401,7 +398,7 @@ static PyObject *
- Matcher_calculate_scores(Matcher *self, PyObject *args) {
-     int32_t *final_positions = NULL, *p;
-     Match *matches = NULL;
--    bool ok = FALSE;
-+    bool ok = false;
-     uint32_t i = 0, needle_char_len = 0, j = 0;
-     PyObject *items = NULL, *score = NULL, *positions = NULL, *pneedle = NULL;
-     UChar *needle = NULL;

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py
diff -u pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py:1.7 pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py:1.8
--- pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py:1.7  Mon Nov 23 11:03:40 2015
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_linux.py      Sun Jan  9 15:43:51 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_calibre_linux.py,v 1.7 2015/11/23 11:03:40 wiz Exp $
+$NetBSD: patch-src_calibre_linux.py,v 1.8 2022/01/09 15:43:51 rhialto Exp $
 
 Disable installing files into $HOME that are not packaged anyway.
 
---- src/calibre/linux.py.orig  2015-11-15 04:15:13.000000000 +0000
+--- src/calibre/linux.py.orig  2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/linux.py
-@@ -691,8 +691,6 @@ class PostInstall:
+@@ -729,8 +729,6 @@ class PostInstall:
          self.appdata_resources = []
          if islinux or isbsd:
              self.setup_completion()
 -        if islinux or isbsd:
 -            self.setup_desktop_integration()
-         self.create_uninstaller()
+         if not getattr(self.opts, 'staged_install', False):
+             self.create_uninstaller()
  
-         from calibre.utils.config import config_dir

Added files:

Index: pkgsrc/misc/calibre/patches/patch-setup_extensions.json
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-setup_extensions.json:1.3
--- /dev/null   Sun Jan  9 15:43:52 2022
+++ pkgsrc/misc/calibre/patches/patch-setup_extensions.json     Sun Jan  9 15:43:51 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-setup_extensions.json,v 1.3 2022/01/09 15:43:51 rhialto Exp $
+
+Include libusb and libmtp for netbsd.
+
+--- setup/extensions.json.orig 2020-02-21 03:27:12.000000000 +0000
++++ setup/extensions.json
+@@ -207,13 +207,13 @@
+     },
+     {
+         "name": "libusb",
+-        "only": "freebsd",
++        "only": "freebsd netbsd",
+         "sources": "calibre/devices/libusb/libusb.c",
+         "libraries": "usb"
+     },
+     {
+         "name": "libmtp",
+-        "only": "freebsd osx linux haiku",
++        "only": "freebsd osx linux haiku netbsd",
+         "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
+         "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
+         "libraries": "mtp"
Index: pkgsrc/misc/calibre/patches/patch-setup_install.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-setup_install.py:1.3
--- /dev/null   Sun Jan  9 15:43:52 2022
+++ pkgsrc/misc/calibre/patches/patch-setup_install.py  Sun Jan  9 15:43:51 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-setup_install.py,v 1.3 2022/01/09 15:43:51 rhialto Exp $
+
+This line gets replaced to a full python path by the pkgsrc
+infrastructure, avoid appending a number to that.
+
+--- setup/install.py.orig      2020-02-21 03:27:12.000000000 +0000
++++ setup/install.py
+@@ -20,7 +20,7 @@ from setup import (
+ )
+ 
+ HEADER = '''\
+-#!/usr/bin/env python{py_major_version}
++#!/usr/bin/env python
+ 
+ """
+ This is the standard runscript for all of calibre's tools.

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_constants.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-src_calibre_constants.py:1.5
--- /dev/null   Sun Jan  9 15:43:52 2022
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_constants.py  Sun Jan  9 15:43:51 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_calibre_constants.py,v 1.5 2022/01/09 15:43:51 rhialto Exp $
+
+Include netbsd conditional.
+
+--- src/calibre/constants.py.orig      2022-01-08 12:14:13.953868037 +0000
++++ src/calibre/constants.py
+@@ -197,7 +197,7 @@ class Plugins(collections.Mapping):
+         if isosx:
+             plugins.append('usbobserver')
+             plugins.append('cocoa')
+-        if isfreebsd or ishaiku or islinux or isosx:
++        if isfreebsd or ishaiku or islinux or isosx or isnetbsd:
+             plugins.append('libusb')
+             plugins.append('libmtp')
+         self.plugins = frozenset(plugins)

Index: pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py:1.1
--- /dev/null   Sun Jan  9 15:43:52 2022
+++ pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py       Sun Jan  9 15:43:51 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_calibre_ebooks_BeautifulSoup.py,v 1.1 2022/01/09 15:43:51 rhialto Exp $
+
+/usr/pkg/lib/calibre/calibre/ebooks/BeautifulSoup.py imports bs4,
+which imports this:
+
+  File "/usr/pkg/lib/python2.7/site-packages/bs4/dammit.py", line 13, in <module>
+    from html.entities import codepoint2name
+ImportError: No module named html.entities
+
+According to https://stackoverflow.com/questions/27372347/beautifulsoup-importerror-no-module-named-html-entities this module only exists for Python 3.
+There is the package /www/py-beautifulsoup, py27-beautifulsoup-3.2.2 for Python2, 
+
+--- src/calibre/ebooks/BeautifulSoup.py.orig   2020-02-21 03:27:12.000000000 +0000
++++ src/calibre/ebooks/BeautifulSoup.py
+@@ -4,8 +4,8 @@
+ 
+ from __future__ import absolute_import, division, print_function, unicode_literals
+ 
+-import bs4
+-from bs4 import (  # noqa
++import BeautifulSoup
++from BeautifulSoup import (  # noqa
+     CData, Comment, Declaration, NavigableString, ProcessingInstruction,
+     SoupStrainer, Tag, __version__
+ )

Prev by Date: CVS commit: pkgsrc/emulators/fs-uae-launcher
Next by Date: CVS commit: pkgsrc/www/loggerhead
Previous by Thread: CVS commit: pkgsrc/emulators/fs-uae-launcher
Next by Thread: CVS commit: pkgsrc/www/loggerhead
Indexes:

Home | Main Index | Thread Index | Old Index