pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

calibre5: some progress. now there are sip API version troubles.

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Jan 16 16:16:46 2022 +0100
Changeset:	5e1ccc94d1edf1379feb5b4a7b5853d7e425f06d

Modified Files:
	calibre5/Makefile
	calibre5/PLIST
	calibre5/TODO
	calibre5/distinfo
	calibre5/patches/patch-setup_build.py

Log Message:
calibre5: some progress. now there are sip API version troubles.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e1ccc94d1edf1379feb5b4a7b5853d7e425f06d

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

diffstat:
 calibre5/Makefile                     |  12 +-
 calibre5/PLIST                        | 521 +++++++++-------------------------
 calibre5/TODO                         |  32 ++-
 calibre5/distinfo                     |   2 +-
 calibre5/patches/patch-setup_build.py |  25 +-
 5 files changed, 179 insertions(+), 413 deletions(-)

diffs:
diff --git a/calibre5/Makefile b/calibre5/Makefile
index 7295af1ce1..e904e2496f 100644
--- a/calibre5/Makefile
+++ b/calibre5/Makefile
@@ -2,7 +2,6 @@
 
 DISTNAME=	calibre-5.34.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}
@@ -38,12 +37,11 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 # TODO: these are still in pkgsrc/wip:
 DEPENDS+=	${PYPKGPREFIX}-jeepney>=0.6.0:../../wip/py-jeepney
-DEPENDS+=	${PYPKGPREFIX}-sip6>=6:../../wip/py-sip6
-DEPENDS+=	${PYPKGPREFIX}-qt5-builder>=1:../../wip/py-qtbuilder
+BUILD_DEPENDS+=	${PYPKGPREFIX}-sip6>=6:../../wip/py-sip6
+BUILD_DEPENDS+=	${PYPKGPREFIX}-qt5-builder>=1:../../wip/py-qtbuilder
 # for installation
 BUILD_DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
-#BUILD_DEPENDS+=	${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging needed for sip
-#BUILD_DEPENDS+=	${PYPKGPREFIX}-sipbuild-[0-9]*:../../???/py-sipbuild???
+#BUILD_DEPENDS+=	${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging needed for sip?
 BUILD_DEPENDS+=	${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
 
 EXTRACT_USING=	bsdtar
@@ -98,7 +96,7 @@ REPLACE_PYTHON+=	src/odf/*.py
 
 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}
+#MAKE_ENV+=		SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 MAKE_ENV+=		SIP_DIR=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
 MAKE_ENV+=		LFLAGS=${LDFLAGS:Q}
 
@@ -106,7 +104,6 @@ MAKE_ENV+=		LFLAGS=${LDFLAGS:Q}
 post-extract:
 	find  ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
 	find  ${WRKSRC}/resources/images/mimetypes  -name '*.png' -exec chmod a-x \{} \;
-#	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
@@ -128,7 +125,6 @@ BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=1.1.5
 .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"
diff --git a/calibre5/PLIST b/calibre5/PLIST
index e95078f58c..b5814f77a3 100644
--- a/calibre5/PLIST
+++ b/calibre5/PLIST
@@ -1,7 +1,4 @@
 @comment $NetBSD$
-lib/calibre/calibre/plugins/libmtp.so
-lib/calibre/calibre/plugins/libusb.so
-
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -22,9 +19,9 @@ bin/lrfviewer
 bin/lrs2lrf
 bin/markdown-calibre
 bin/web2disk
-lib/calibre/backports/__init__.py
-lib/calibre/backports/functools_lru_cache.py
+lib/${PYVERSSUFFIX}/site-packages/init_calibre.py
 lib/calibre/calibre/__init__.py
+lib/calibre/calibre/build_forms.py
 lib/calibre/calibre/constants.py
 lib/calibre/calibre/customize/__init__.py
 lib/calibre/calibre/customize/builtins.py
@@ -34,6 +31,7 @@ lib/calibre/calibre/customize/ui.py
 lib/calibre/calibre/customize/zipplugin.py
 lib/calibre/calibre/db/__init__.py
 lib/calibre/calibre/db/adding.py
+lib/calibre/calibre/db/annotations.py
 lib/calibre/calibre/db/backend.py
 lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
@@ -64,11 +62,13 @@ lib/calibre/calibre/db/cli/main.py
 lib/calibre/calibre/db/cli/tests.py
 lib/calibre/calibre/db/cli/utils.py
 lib/calibre/calibre/db/copy_to_library.py
+lib/calibre/calibre/db/covers.py
 lib/calibre/calibre/db/delete_service.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
 lib/calibre/calibre/db/lazy.py
 lib/calibre/calibre/db/legacy.py
+lib/calibre/calibre/db/listeners.py
 lib/calibre/calibre/db/locking.py
 lib/calibre/calibre/db/restore.py
 lib/calibre/calibre/db/schema_upgrades.py
@@ -78,6 +78,7 @@ lib/calibre/calibre/db/tests/__init__.py
 lib/calibre/calibre/db/tests/add_remove.py
 lib/calibre/calibre/db/tests/base.py
 lib/calibre/calibre/db/tests/filesystem.py
+lib/calibre/calibre/db/tests/fts.py
 lib/calibre/calibre/db/tests/legacy.py
 lib/calibre/calibre/db/tests/locking.py
 lib/calibre/calibre/db/tests/main.py
@@ -149,7 +150,6 @@ lib/calibre/calibre/devices/mtp/unix/sysfs.py
 lib/calibre/calibre/devices/mtp/unix/upstream/update.py
 lib/calibre/calibre/devices/mtp/windows/__init__.py
 lib/calibre/calibre/devices/mtp/windows/driver.py
-lib/calibre/calibre/devices/mtp/windows/remote.py
 lib/calibre/calibre/devices/nokia/__init__.py
 lib/calibre/calibre/devices/nokia/driver.py
 lib/calibre/calibre/devices/nook/__init__.py
@@ -177,6 +177,7 @@ 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/usbms/hal.py
 lib/calibre/calibre/devices/user_defined/__init__.py
 lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/devices/utils.py
@@ -290,6 +291,7 @@ lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/to_zip.py
 lib/calibre/calibre/ebooks/html_entities.py
+lib/calibre/calibre/ebooks/html_transform_rules.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
 lib/calibre/calibre/ebooks/hyphenate.py
@@ -365,20 +367,18 @@ lib/calibre/calibre/ebooks/metadata/sources/base.py
 lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
 lib/calibre/calibre/ebooks/metadata/sources/cli.py
 lib/calibre/calibre/ebooks/metadata/sources/covers.py
-lib/calibre/calibre/ebooks/metadata/sources/douban.py
 lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
 lib/calibre/calibre/ebooks/metadata/sources/google.py
 lib/calibre/calibre/ebooks/metadata/sources/google_images.py
 lib/calibre/calibre/ebooks/metadata/sources/identify.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
-lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
-lib/calibre/calibre/ebooks/metadata/sources/ozon.py
 lib/calibre/calibre/ebooks/metadata/sources/prefs.py
 lib/calibre/calibre/ebooks/metadata/sources/search_engines.py
 lib/calibre/calibre/ebooks/metadata/sources/test.py
 lib/calibre/calibre/ebooks/metadata/sources/update.py
 lib/calibre/calibre/ebooks/metadata/sources/worker.py
 lib/calibre/calibre/ebooks/metadata/tag_mapper.py
+lib/calibre/calibre/ebooks/metadata/test_author_sort.py
 lib/calibre/calibre/ebooks/metadata/toc.py
 lib/calibre/calibre/ebooks/metadata/topaz.py
 lib/calibre/calibre/ebooks/metadata/txt.py
@@ -537,7 +537,6 @@ 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/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
@@ -640,6 +639,8 @@ lib/calibre/calibre/gui2/actions/add.py
 lib/calibre/calibre/gui2/actions/add_to_library.py
 lib/calibre/calibre/gui2/actions/annotate.py
 lib/calibre/calibre/gui2/actions/author_mapper.py
+lib/calibre/calibre/gui2/actions/auto_scroll.py
+lib/calibre/calibre/gui2/actions/browse_annots.py
 lib/calibre/calibre/gui2/actions/catalog.py
 lib/calibre/calibre/gui2/actions/choose_library.py
 lib/calibre/calibre/gui2/actions/convert.py
@@ -663,6 +664,7 @@ lib/calibre/calibre/gui2/actions/restart.py
 lib/calibre/calibre/gui2/actions/save_to_disk.py
 lib/calibre/calibre/gui2/actions/show_book_details.py
 lib/calibre/calibre/gui2/actions/show_quickview.py
+lib/calibre/calibre/gui2/actions/show_stored_templates.py
 lib/calibre/calibre/gui2/actions/show_template_tester.py
 lib/calibre/calibre/gui2/actions/similar_books.py
 lib/calibre/calibre/gui2/actions/sort.py
@@ -740,7 +742,6 @@ lib/calibre/calibre/gui2/convert/rtf_input_ui.py
 lib/calibre/calibre/gui2/convert/search_and_replace.py
 lib/calibre/calibre/gui2/convert/search_and_replace_ui.py
 lib/calibre/calibre/gui2/convert/single.py
-lib/calibre/calibre/gui2/convert/single_ui.py
 lib/calibre/calibre/gui2/convert/snb_output.py
 lib/calibre/calibre/gui2/convert/snb_output_ui.py
 lib/calibre/calibre/gui2/convert/structure_detection.py
@@ -752,21 +753,12 @@ lib/calibre/calibre/gui2/convert/txt_input_ui.py
 lib/calibre/calibre/gui2/convert/txt_output.py
 lib/calibre/calibre/gui2/convert/txt_output_ui.py
 lib/calibre/calibre/gui2/convert/txtz_output.py
-lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
 lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
 lib/calibre/calibre/gui2/covers.py
 lib/calibre/calibre/gui2/css_transform_rules.py
 lib/calibre/calibre/gui2/custom_column_widgets.py
-lib/calibre/calibre/gui2/dbus_export/__init__.py
-lib/calibre/calibre/gui2/dbus_export/demo.py
-lib/calibre/calibre/gui2/dbus_export/gtk.py
-lib/calibre/calibre/gui2/dbus_export/menu.py
-lib/calibre/calibre/gui2/dbus_export/menu2.py
-lib/calibre/calibre/gui2/dbus_export/tray.py
-lib/calibre/calibre/gui2/dbus_export/utils.py
-lib/calibre/calibre/gui2/dbus_export/widgets.py
 lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
@@ -788,9 +780,7 @@ lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
 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_ui.py
 lib/calibre/calibre/gui2/dialogs/comments_dialog.py
-lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
@@ -807,6 +797,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 lib/calibre/calibre/gui2/dialogs/duplicates.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/enum_values_edit.py
 lib/calibre/calibre/gui2/dialogs/exim.py
 lib/calibre/calibre/gui2/dialogs/jobs_ui.py
 lib/calibre/calibre/gui2/dialogs/match_books.py
@@ -814,6 +805,7 @@ lib/calibre/calibre/gui2/dialogs/match_books_ui.py
 lib/calibre/calibre/gui2/dialogs/message_box.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
+lib/calibre/calibre/gui2/dialogs/multisort.py
 lib/calibre/calibre/gui2/dialogs/opml.py
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
@@ -823,7 +815,6 @@ lib/calibre/calibre/gui2/dialogs/quickview.py
 lib/calibre/calibre/gui2/dialogs/quickview_ui.py
 lib/calibre/calibre/gui2/dialogs/restore_library.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
-lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/search.py
 lib/calibre/calibre/gui2/dialogs/select_formats.py
@@ -834,8 +825,11 @@ lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
 lib/calibre/calibre/gui2/dialogs/tag_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor_table_widget.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
+lib/calibre/calibre/gui2/dialogs/template_dialog_box_layout.py
+lib/calibre/calibre/gui2/dialogs/template_dialog_code_widget.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/trim_image.py
@@ -843,8 +837,10 @@ lib/calibre/calibre/gui2/dnd.py
 lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
+lib/calibre/calibre/gui2/flow_toolbar.py
 lib/calibre/calibre/gui2/font_family_chooser.py
 lib/calibre/calibre/gui2/gestures.py
+lib/calibre/calibre/gui2/html_transform_rules.py
 lib/calibre/calibre/gui2/icon_theme.py
 lib/calibre/calibre/gui2/image_popup.py
 lib/calibre/calibre/gui2/init.py
@@ -856,11 +852,13 @@ lib/calibre/calibre/gui2/layout.py
 lib/calibre/calibre/gui2/layout_menu.py
 lib/calibre/calibre/gui2/library/__init__.py
 lib/calibre/calibre/gui2/library/alternate_views.py
+lib/calibre/calibre/gui2/library/annotations.py
 lib/calibre/calibre/gui2/library/caches.py
 lib/calibre/calibre/gui2/library/delegates.py
 lib/calibre/calibre/gui2/library/models.py
 lib/calibre/calibre/gui2/library/views.py
 lib/calibre/calibre/gui2/linux_file_dialogs.py
+lib/calibre/calibre/gui2/listener.py
 lib/calibre/calibre/gui2/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -983,7 +981,6 @@ lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
-lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
 lib/calibre/calibre/gui2/store/stores/empik_plugin.py
 lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
@@ -1005,7 +1002,6 @@ lib/calibre/calibre/gui2/store/stores/mobileread/models.py
 lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
 lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
 lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
-lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
 lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
 lib/calibre/calibre/gui2/store/stores/publio_plugin.py
@@ -1014,7 +1010,6 @@ lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
 lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py
 lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
 lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
-lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
 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
@@ -1031,6 +1026,17 @@ lib/calibre/calibre/gui2/toc/__init__.py
 lib/calibre/calibre/gui2/toc/location.py
 lib/calibre/calibre/gui2/toc/main.py
 lib/calibre/calibre/gui2/tools.py
+lib/calibre/calibre/gui2/tts/__init__.py
+lib/calibre/calibre/gui2/tts/common.py
+lib/calibre/calibre/gui2/tts/develop.py
+lib/calibre/calibre/gui2/tts/errors.py
+lib/calibre/calibre/gui2/tts/implementation.py
+lib/calibre/calibre/gui2/tts/linux.py
+lib/calibre/calibre/gui2/tts/linux_config.py
+lib/calibre/calibre/gui2/tts/macos.py
+lib/calibre/calibre/gui2/tts/macos_config.py
+lib/calibre/calibre/gui2/tts/windows.py
+lib/calibre/calibre/gui2/tts/windows_config.py
 lib/calibre/calibre/gui2/tweak_book/__init__.py
 lib/calibre/calibre/gui2/tweak_book/boss.py
 lib/calibre/calibre/gui2/tweak_book/char_select.py
@@ -1073,6 +1079,7 @@ lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 lib/calibre/calibre/gui2/tweak_book/file_list.py
 lib/calibre/calibre/gui2/tweak_book/function_replace.py
 lib/calibre/calibre/gui2/tweak_book/job.py
+lib/calibre/calibre/gui2/tweak_book/jump_to_class.py
 lib/calibre/calibre/gui2/tweak_book/live_css.py
 lib/calibre/calibre/gui2/tweak_book/main.py
 lib/calibre/calibre/gui2/tweak_book/manage_fonts.py
@@ -1095,18 +1102,23 @@ lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/annotations.py
 lib/calibre/calibre/gui2/viewer/bookmarks.py
+lib/calibre/calibre/gui2/viewer/config.py
+lib/calibre/calibre/gui2/viewer/control_sleep.py
 lib/calibre/calibre/gui2/viewer/convert_book.py
+lib/calibre/calibre/gui2/viewer/highlights.py
+lib/calibre/calibre/gui2/viewer/integration.py
 lib/calibre/calibre/gui2/viewer/lookup.py
 lib/calibre/calibre/gui2/viewer/main.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/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/tts.py
 lib/calibre/calibre/gui2/viewer/ui.py
 lib/calibre/calibre/gui2/viewer/web_view.py
+lib/calibre/calibre/gui2/viewer/widgets.py
 lib/calibre/calibre/gui2/webengine.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
@@ -1143,11 +1155,12 @@ lib/calibre/calibre/library/schema_upgrades.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
+lib/calibre/calibre/live.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
-lib/calibre/calibre/plugins/chmlib.so
+lib/calibre/calibre/plugins/fast_css_transform.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html_as_json.so
 lib/calibre/calibre/plugins/html_syntax_highlighter.so
@@ -1158,19 +1171,18 @@ 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
-lib/calibre/calibre/plugins/monotonic.so
 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/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
+lib/calibre/calibre/plugins/sqlite_extension.so
 lib/calibre/calibre/plugins/tokenizer.so
 lib/calibre/calibre/plugins/unicode_names.so
-lib/calibre/calibre/plugins/zlib2.so
+lib/calibre/calibre/prints.py
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/spell/__init__.py
@@ -1205,13 +1217,13 @@ lib/calibre/calibre/srv/pool.py
 lib/calibre/calibre/srv/pre_activated.py
 lib/calibre/calibre/srv/render_book.py
 lib/calibre/calibre/srv/routes.py
-lib/calibre/calibre/srv/sendfile.py
 lib/calibre/calibre/srv/standalone.py
 lib/calibre/calibre/srv/tests/__init__.py
 lib/calibre/calibre/srv/tests/ajax.py
 lib/calibre/calibre/srv/tests/auth.py
 lib/calibre/calibre/srv/tests/base.py
 lib/calibre/calibre/srv/tests/content.py
+lib/calibre/calibre/srv/tests/fast_css_transform.py
 lib/calibre/calibre/srv/tests/http.py
 lib/calibre/calibre/srv/tests/loop.py
 lib/calibre/calibre/srv/tests/main.py
@@ -1226,19 +1238,15 @@ lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
-lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/bibtex.py
 lib/calibre/calibre/utils/browser.py
 lib/calibre/calibre/utils/certgen.py
-lib/calibre/calibre/utils/chm/__init__.py
-lib/calibre/calibre/utils/chm/chm.py
 lib/calibre/calibre/utils/cleantext.py
 lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
 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_type_icons.py
 lib/calibre/calibre/utils/filenames.py
@@ -1323,6 +1331,7 @@ 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/seven_zip.py
 lib/calibre/calibre/utils/shared_file.py
 lib/calibre/calibre/utils/short_uuid.py
 lib/calibre/calibre/utils/smartypants.py
@@ -1337,11 +1346,11 @@ lib/calibre/calibre/utils/test_lock.py
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
-lib/calibre/calibre/utils/unicode_getpass.py
 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/winsapi.py
 lib/calibre/calibre/utils/windows/wintest.py
 lib/calibre/calibre/utils/winreg/__init__.py
 lib/calibre/calibre/utils/winreg/dde.py
@@ -1363,10 +1372,6 @@ lib/calibre/calibre/web/feeds/templates.py
 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
@@ -1422,6 +1427,13 @@ lib/calibre/polyglot/reprlib.py
 lib/calibre/polyglot/smtplib.py
 lib/calibre/polyglot/socketserver.py
 lib/calibre/polyglot/urllib.py
+lib/calibre/qt/__init__.py
+lib/calibre/qt/__main__.py
+lib/calibre/qt/core.py
+lib/calibre/qt/core_name_map.py
+lib/calibre/qt/loader.py
+lib/calibre/qt/webengine.py
+lib/calibre/qt/webengine_name_map.py
 lib/calibre/templite/__init__.py
 lib/calibre/tinycss/__init__.py
 lib/calibre/tinycss/color3.py
@@ -1443,20 +1455,6 @@ lib/calibre/tinycss/tests/tokenizing.py
 lib/calibre/tinycss/token_data.py
 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
@@ -1468,7 +1466,8 @@ share/calibre/catalog/mastheadImage.gif
 share/calibre/catalog/section_list_templates.conf
 share/calibre/catalog/stylesheet.css
 share/calibre/catalog/template.xhtml
-share/calibre/content-server/calibre.appcache
+share/calibre/changelog.json
+share/calibre/common-english-words.txt
 share/calibre/content-server/calibre.png
 share/calibre/content-server/empty.html
 share/calibre/content-server/index-generated.html
@@ -1478,6 +1477,7 @@ share/calibre/content-server/mobile.css
 share/calibre/content-server/reset.css
 share/calibre/csscolorparser.js
 share/calibre/csslint.js
+share/calibre/dark_mode.css
 share/calibre/default_tweaks.py
 share/calibre/dictionaries/en-GB/en-GB.aff
 share/calibre/dictionaries/en-GB/en-GB.dic
@@ -1510,6 +1510,7 @@ share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
 share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
+share/calibre/fonts/liberation/version.txt
 share/calibre/hyphenation/dictionaries.tar.xz
 share/calibre/hyphenation/locales.json
 share/calibre/hyphenation/sha1sum
@@ -1527,6 +1528,7 @@ share/calibre/images/blank.png
 share/calibre/images/book.png
 share/calibre/images/bookmarks.png
 share/calibre/images/books_in_series.png
+share/calibre/images/bullhorn.png
 share/calibre/images/catalog.png
 share/calibre/images/chapters.png
 share/calibre/images/character-set.png
@@ -1613,6 +1615,7 @@ 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.png
 share/calibre/images/highlight_only_off.png
 share/calibre/images/highlight_only_on.png
 share/calibre/images/hotmail.png
@@ -1717,6 +1720,7 @@ share/calibre/images/smarten-punctuation.png
 share/calibre/images/snippets.png
 share/calibre/images/sort.png
 share/calibre/images/spell-check.png
+share/calibre/images/split.png
 share/calibre/images/store.png
 share/calibre/images/subset-fonts.png
 share/calibre/images/swap.png
@@ -1747,7 +1751,6 @@ share/calibre/images/window-close.png
 share/calibre/images/wizard.png
 share/calibre/jacket/stylesheet.css
 share/calibre/jacket/template.xhtml
-share/calibre/jquery.simulate.js
 share/calibre/localization/iso3166.calibre_msgpack
 share/calibre/localization/iso639.calibre_msgpack
 share/calibre/localization/locales.zip
@@ -1757,261 +1760,39 @@ 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
-share/calibre/mathjax/extensions/FontWarnings.js
-share/calibre/mathjax/extensions/HTML-CSS/handle-floats.js
-share/calibre/mathjax/extensions/HelpDialog.js
-share/calibre/mathjax/extensions/MatchWebFonts.js
-share/calibre/mathjax/extensions/MathEvents.js
-share/calibre/mathjax/extensions/MathML/content-mathml.js
-share/calibre/mathjax/extensions/MathML/mml3.js
-share/calibre/mathjax/extensions/MathMenu.js
-share/calibre/mathjax/extensions/MathZoom.js
-share/calibre/mathjax/extensions/Safe.js
-share/calibre/mathjax/extensions/TeX/AMScd.js
-share/calibre/mathjax/extensions/TeX/AMSmath.js
-share/calibre/mathjax/extensions/TeX/AMSsymbols.js
-share/calibre/mathjax/extensions/TeX/HTML.js
-share/calibre/mathjax/extensions/TeX/action.js
-share/calibre/mathjax/extensions/TeX/autobold.js
-share/calibre/mathjax/extensions/TeX/autoload-all.js
-share/calibre/mathjax/extensions/TeX/bbox.js
-share/calibre/mathjax/extensions/TeX/begingroup.js
-share/calibre/mathjax/extensions/TeX/boldsymbol.js
-share/calibre/mathjax/extensions/TeX/cancel.js
-share/calibre/mathjax/extensions/TeX/color.js
-share/calibre/mathjax/extensions/TeX/enclose.js
-share/calibre/mathjax/extensions/TeX/extpfeil.js
-share/calibre/mathjax/extensions/TeX/mathchoice.js
-share/calibre/mathjax/extensions/TeX/mediawiki-texvc.js
-share/calibre/mathjax/extensions/TeX/mhchem.js
-share/calibre/mathjax/extensions/TeX/mhchem3/mhchem.js
-share/calibre/mathjax/extensions/TeX/newcommand.js
-share/calibre/mathjax/extensions/TeX/noErrors.js
-share/calibre/mathjax/extensions/TeX/noUndefined.js
-share/calibre/mathjax/extensions/TeX/unicode.js
-share/calibre/mathjax/extensions/TeX/verb.js
-share/calibre/mathjax/extensions/a11y/accessibility-menu.js
-share/calibre/mathjax/extensions/a11y/auto-collapse.js
-share/calibre/mathjax/extensions/a11y/collapsible.js
-share/calibre/mathjax/extensions/a11y/explorer.js
-share/calibre/mathjax/extensions/a11y/invalid_keypress.mp3
-share/calibre/mathjax/extensions/a11y/invalid_keypress.ogg
-share/calibre/mathjax/extensions/a11y/mathjax-sre.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/functions/algebra.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/functions/elementary.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/functions/hyperbolic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/functions/trigonometry.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-capital.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-mathfonts-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-mathfonts-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-mathfonts-sans-serif-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-scripts.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-small.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/greek-symbols.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/hebrew_letters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-lower-double-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-lower-normal.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-lower-phonetic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-lower-single-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-bold-fraktur.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-bold-script.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-double-struck.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-fraktur.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-monospace.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-sans-serif-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-sans-serif-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-sans-serif.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-mathfonts-script.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-rest.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-upper-double-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-upper-normal.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/latin-upper-single-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_angles.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_arrows.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_characters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_delimiters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_digits.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_geometry.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_harpoons.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_non_characters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_symbols.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/math_whitespace.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/symbols/other_stars.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/energy.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/length.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/memory.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/other.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/speed.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/temperature.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/time.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/volume.js
-share/calibre/mathjax/extensions/a11y/mathmaps/en/units/weight.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/functions/algebra.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/functions/elementary.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/functions/hyperbolic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/functions/trigonometry.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-capital.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-mathfonts-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-mathfonts-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-mathfonts-sans-serif-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-scripts.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-small.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/greek-symbols.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/hebrew_letters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-lower-double-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-lower-normal.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-lower-phonetic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-lower-single-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-bold-fraktur.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-bold-script.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-double-struck.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-fraktur.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-monospace.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-sans-serif-bold.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-sans-serif-italic.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-sans-serif.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-mathfonts-script.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-rest.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-upper-double-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-upper-normal.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/latin-upper-single-accent.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_angles.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_arrows.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_characters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_delimiters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_digits.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_geometry.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_harpoons.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_non_characters.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_symbols.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/math_whitespace.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/symbols/other_stars.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/energy.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/length.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/memory.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/other.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/speed.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/temperature.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/time.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/volume.js
-share/calibre/mathjax/extensions/a11y/mathmaps/es/units/weight.js
-share/calibre/mathjax/extensions/a11y/mathmaps/mathmaps_ie.js
-share/calibre/mathjax/extensions/a11y/semantic-enrich.js
-share/calibre/mathjax/extensions/a11y/wgxpath.install.js
-share/calibre/mathjax/extensions/asciimath2jax.js
-share/calibre/mathjax/extensions/fast-preview.js
-share/calibre/mathjax/extensions/jsMath2jax.js
-share/calibre/mathjax/extensions/mml2jax.js
-share/calibre/mathjax/extensions/tex2jax.js
-share/calibre/mathjax/extensions/toMathML.js
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Vector-Bold.woff
-share/calibre/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Vector-Regular.woff
-share/calibre/mathjax/jax/element/mml/jax.js
-share/calibre/mathjax/jax/element/mml/optable/Arrows.js
-share/calibre/mathjax/jax/element/mml/optable/BasicLatin.js
-share/calibre/mathjax/jax/element/mml/optable/CombDiacritMarks.js
-share/calibre/mathjax/jax/element/mml/optable/CombDiactForSymbols.js
-share/calibre/mathjax/jax/element/mml/optable/Dingbats.js
-share/calibre/mathjax/jax/element/mml/optable/GeneralPunctuation.js
-share/calibre/mathjax/jax/element/mml/optable/GeometricShapes.js
-share/calibre/mathjax/jax/element/mml/optable/GreekAndCoptic.js
-share/calibre/mathjax/jax/element/mml/optable/Latin1Supplement.js
-share/calibre/mathjax/jax/element/mml/optable/LetterlikeSymbols.js
-share/calibre/mathjax/jax/element/mml/optable/MathOperators.js
-share/calibre/mathjax/jax/element/mml/optable/MiscMathSymbolsA.js
-share/calibre/mathjax/jax/element/mml/optable/MiscMathSymbolsB.js
-share/calibre/mathjax/jax/element/mml/optable/MiscSymbolsAndArrows.js
-share/calibre/mathjax/jax/element/mml/optable/MiscTechnical.js
-share/calibre/mathjax/jax/element/mml/optable/SpacingModLetters.js
-share/calibre/mathjax/jax/element/mml/optable/SuppMathOperators.js
-share/calibre/mathjax/jax/element/mml/optable/SupplementalArrowsA.js
-share/calibre/mathjax/jax/element/mml/optable/SupplementalArrowsB.js
-share/calibre/mathjax/jax/input/AsciiMath/config.js
-share/calibre/mathjax/jax/input/AsciiMath/jax.js
-share/calibre/mathjax/jax/input/MathML/config.js
-share/calibre/mathjax/jax/input/MathML/entities/a.js
-share/calibre/mathjax/jax/input/MathML/entities/b.js
-share/calibre/mathjax/jax/input/MathML/entities/c.js
-share/calibre/mathjax/jax/input/MathML/entities/d.js
-share/calibre/mathjax/jax/input/MathML/entities/e.js
-share/calibre/mathjax/jax/input/MathML/entities/f.js
-share/calibre/mathjax/jax/input/MathML/entities/fr.js
-share/calibre/mathjax/jax/input/MathML/entities/g.js
-share/calibre/mathjax/jax/input/MathML/entities/h.js
-share/calibre/mathjax/jax/input/MathML/entities/i.js
-share/calibre/mathjax/jax/input/MathML/entities/j.js
-share/calibre/mathjax/jax/input/MathML/entities/k.js
-share/calibre/mathjax/jax/input/MathML/entities/l.js
-share/calibre/mathjax/jax/input/MathML/entities/m.js
-share/calibre/mathjax/jax/input/MathML/entities/n.js
-share/calibre/mathjax/jax/input/MathML/entities/o.js
-share/calibre/mathjax/jax/input/MathML/entities/opf.js
-share/calibre/mathjax/jax/input/MathML/entities/p.js
-share/calibre/mathjax/jax/input/MathML/entities/q.js
-share/calibre/mathjax/jax/input/MathML/entities/r.js
-share/calibre/mathjax/jax/input/MathML/entities/s.js
-share/calibre/mathjax/jax/input/MathML/entities/scr.js
-share/calibre/mathjax/jax/input/MathML/entities/t.js
-share/calibre/mathjax/jax/input/MathML/entities/u.js
-share/calibre/mathjax/jax/input/MathML/entities/v.js
-share/calibre/mathjax/jax/input/MathML/entities/w.js
-share/calibre/mathjax/jax/input/MathML/entities/x.js
-share/calibre/mathjax/jax/input/MathML/entities/y.js
-share/calibre/mathjax/jax/input/MathML/entities/z.js
-share/calibre/mathjax/jax/input/MathML/jax.js
-share/calibre/mathjax/jax/input/TeX/config.js
-share/calibre/mathjax/jax/input/TeX/jax.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/annotation-xml.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/maction.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/menclose.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/mglyph.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/mmultiscripts.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/ms.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/mtable.js
-share/calibre/mathjax/jax/output/CommonHTML/autoload/multiline.js
-share/calibre/mathjax/jax/output/CommonHTML/config.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/AMS-Regular.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Caligraphic-Bold.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Fraktur-Bold.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Fraktur-Regular.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Main-Bold.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Math-BoldItalic.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/SansSerif-Bold.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/SansSerif-Italic.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/SansSerif-Regular.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Script-Regular.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/Typewriter-Regular.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js
-share/calibre/mathjax/jax/output/CommonHTML/fonts/TeX/fontdata.js
-share/calibre/mathjax/jax/output/CommonHTML/jax.js
+share/calibre/mathjax/core.js
+share/calibre/mathjax/input/asciimath.js
+share/calibre/mathjax/input/mml.js
+share/calibre/mathjax/input/mml/entities.js
+share/calibre/mathjax/input/tex-full.js
+share/calibre/mathjax/loader.js
 share/calibre/mathjax/manifest.json
+share/calibre/mathjax/output/chtml.js
+share/calibre/mathjax/output/chtml/fonts/tex.js
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_AMS-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Calligraphic-Bold.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Calligraphic-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Fraktur-Bold.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Fraktur-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Main-Bold.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Main-Italic.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Main-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Math-BoldItalic.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Math-Italic.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Math-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_SansSerif-Bold.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_SansSerif-Italic.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_SansSerif-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Script-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Size1-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Size2-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Size3-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Size4-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Typewriter-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Vector-Bold.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Vector-Regular.woff
+share/calibre/mathjax/output/chtml/fonts/woff-v2/MathJax_Zero.woff
+share/calibre/mathjax/startup.js
 share/calibre/metadata_sqlite.sql
 share/calibre/mime.types
 share/calibre/mozilla-ca-certs.pem
@@ -2022,20 +1803,18 @@ 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/quick_start/tur.epub
 share/calibre/rapydscript/compiler.js.xz
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/1843.recipe
 share/calibre/recipes/20_minutos.recipe
 share/calibre/recipes/20minutes.recipe
-share/calibre/recipes/20minutos.recipe
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/3dnews.recipe
 share/calibre/recipes/7seri.recipe
 share/calibre/recipes/7x7.recipe
-share/calibre/recipes/Ansa.recipe
 share/calibre/recipes/DrawAndCook.recipe
-share/calibre/recipes/ZIVE.sk.recipe
 share/calibre/recipes/aabenraalokalavisen_dk.recipe
 share/calibre/recipes/aachener_nachrichten.recipe
 share/calibre/recipes/aarhuslokalavisen_dk.recipe
@@ -2052,9 +1831,9 @@ share/calibre/recipes/acrimed.recipe
 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/adventuregamers.recipe
 share/calibre/recipes/aftenposten.recipe
+share/calibre/recipes/aftonbladet.recipe
 share/calibre/recipes/agrogerila.recipe
 share/calibre/recipes/aif_ru.recipe
 share/calibre/recipes/ainonline.recipe
@@ -2063,12 +1842,10 @@ share/calibre/recipes/ajc.recipe
 share/calibre/recipes/ajiajin.recipe
 share/calibre/recipes/aksiyon_derigisi.recipe
 share/calibre/recipes/aktualne.cz.recipe
-share/calibre/recipes/al_ahram.recipe
 share/calibre/recipes/al_jazeera.recipe
 share/calibre/recipes/al_masry_alyoum_arabic.recipe
 share/calibre/recipes/al_monitor.recipe
 share/calibre/recipes/albert_mohler.recipe
-share/calibre/recipes/albertslundlokalavisen_dk.recipe
 share/calibre/recipes/ald.recipe
 share/calibre/recipes/alejakomiksu_com.recipe
 share/calibre/recipes/alleroedlokalavisen_dk.recipe
@@ -2130,26 +1907,21 @@ share/calibre/recipes/badania_net.recipe
 share/calibre/recipes/balkaninsight.recipe
 share/calibre/recipes/balkanist.recipe
 share/calibre/recipes/baltimore_sun.recipe
-share/calibre/recipes/banat_news.recipe
 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/bay_citizen.recipe
 share/calibre/recipes/bbc.recipe
-share/calibre/recipes/bbc_arabic.recipe
 share/calibre/recipes/bbc_brasil.recipe
-share/calibre/recipes/bbc_chinese.recipe
 share/calibre/recipes/bbc_es.recipe
 share/calibre/recipes/bbc_fast.recipe
 share/calibre/recipes/bbc_sport.recipe
 share/calibre/recipes/bbcvietnamese.recipe
 share/calibre/recipes/benchmark_pl.recipe
 share/calibre/recipes/beppe_grillo.recipe
-share/calibre/recipes/berlin_policy_journal.recipe
 share/calibre/recipes/berliner_zeitung.recipe
 share/calibre/recipes/berlingske_dk.recipe
-share/calibre/recipes/berria.recipe
 share/calibre/recipes/biamag.recipe
 share/calibre/recipes/biamag_en.recipe
 share/calibre/recipes/bianet.recipe
@@ -2166,7 +1938,6 @@ share/calibre/recipes/bitacora.recipe
 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/boortz.recipe
 share/calibre/recipes/borse_online.recipe
 share/calibre/recipes/borsen_dk.recipe
@@ -2187,12 +1958,10 @@ share/calibre/recipes/buenosaireseconomico.recipe
 share/calibre/recipes/buffalo_news.recipe
 share/calibre/recipes/bugun_gazetesi.recipe
 share/calibre/recipes/business_insider.recipe
-share/calibre/recipes/business_spectator.recipe
 share/calibre/recipes/business_standard.recipe
 share/calibre/recipes/businessworldin.recipe
 share/calibre/recipes/cacm.recipe
 share/calibre/recipes/cafcaf_dergisi.recipe
-share/calibre/recipes/caijing.recipe
 share/calibre/recipes/calcalist.recipe
 share/calibre/recipes/calgary_herald.recipe
 share/calibre/recipes/calibre_blog.recipe
@@ -2203,9 +1972,7 @@ share/calibre/recipes/capital.recipe
 share/calibre/recipes/capital_de.recipe
 share/calibre/recipes/capital_gr.recipe
 share/calibre/recipes/caravan_magazine.recipe
-share/calibre/recipes/caros_amigos.recipe
 share/calibre/recipes/carta.recipe
-share/calibre/recipes/carta_capital.recipe
 share/calibre/recipes/catavencii.recipe
 share/calibre/recipes/catavencu.recipe
 share/calibre/recipes/catholic_daily_readings.recipe
@@ -2224,10 +1991,7 @@ share/calibre/recipes/champion.recipe
 share/calibre/recipes/chicago_breaking_news.recipe
 share/calibre/recipes/chicago_tribune.recipe
 share/calibre/recipes/china_economic_net.recipe
-share/calibre/recipes/china_post.recipe
-share/calibre/recipes/china_press.recipe
 share/calibre/recipes/china_times.recipe
-share/calibre/recipes/chinadaily.recipe
 share/calibre/recipes/chipro.recipe
 share/calibre/recipes/chosun.recipe
 share/calibre/recipes/chowk.recipe
@@ -2235,7 +1999,6 @@ share/calibre/recipes/chr_mon.recipe
 share/calibre/recipes/christian_post.recipe
 share/calibre/recipes/chronicle_higher_ed.recipe
 share/calibre/recipes/cicero.recipe
-share/calibre/recipes/ciekawostki_historyczne.recipe
 share/calibre/recipes/cincinnati_enquirer.recipe
 share/calibre/recipes/cinco_dias.recipe
 share/calibre/recipes/cinebel_be.recipe
@@ -2249,8 +2012,6 @@ share/calibre/recipes/clarion_ledger.recipe
 share/calibre/recipes/clic_rbs.recipe
 share/calibre/recipes/climate_progress.recipe
 share/calibre/recipes/cm_journal.recipe
-share/calibre/recipes/cnd.recipe
-share/calibre/recipes/cnd_weekly.recipe
 share/calibre/recipes/cnetjapan.recipe
 share/calibre/recipes/cnetjapan_digital.recipe
 share/calibre/recipes/cnetjapan_release.recipe
@@ -2262,7 +2023,6 @@ share/calibre/recipes/columbusdispatch.recipe
 share/calibre/recipes/common_dreams.recipe
 share/calibre/recipes/computerworld_dk.recipe
 share/calibre/recipes/computerworld_pl.recipe
-share/calibre/recipes/computing_uk.recipe
 share/calibre/recipes/consortium_news.recipe
 share/calibre/recipes/contemporary_argentine_writers.recipe
 share/calibre/recipes/contropiano.recipe
@@ -2281,6 +2041,7 @@ share/calibre/recipes/courrierinternational.recipe
 share/calibre/recipes/cracked_com.recipe
 share/calibre/recipes/craigslist.recipe
 share/calibre/recipes/credit_slips.recipe
+share/calibre/recipes/crikey.recipe
 share/calibre/recipes/cronica.recipe
 share/calibre/recipes/csid.recipe
 share/calibre/recipes/ct24.recipe
@@ -2305,7 +2066,6 @@ share/calibre/recipes/dailyreckoning.recipe
 share/calibre/recipes/dailytportal.recipe
 share/calibre/recipes/dallas.recipe
 share/calibre/recipes/danas.recipe
-share/calibre/recipes/dani.recipe
 share/calibre/recipes/dark_horizons.recipe
 share/calibre/recipes/dark_reading.recipe
 share/calibre/recipes/darknet.recipe
@@ -2338,6 +2098,7 @@ share/calibre/recipes/descopera_org.recipe
 share/calibre/recipes/desiring_god.recipe
 share/calibre/recipes/detroit_news.recipe
 share/calibre/recipes/deutsche_welle_bs.recipe
+share/calibre/recipes/deutsche_welle_de.recipe
 share/calibre/recipes/deutsche_welle_en.recipe
 share/calibre/recipes/deutsche_welle_es.recipe
 share/calibre/recipes/deutsche_welle_hr.recipe
@@ -2369,7 +2130,6 @@ share/calibre/recipes/divahair.recipe
 share/calibre/recipes/djurslandsposten_dk.recipe
 share/calibre/recipes/dn_se.recipe
 share/calibre/recipes/dna.recipe
-share/calibre/recipes/dnevni_avaz.recipe
 share/calibre/recipes/dnevnik.recipe
 share/calibre/recipes/dnevnik_cro.recipe
 share/calibre/recipes/dnevnik_mk.recipe
@@ -2403,7 +2163,6 @@ share/calibre/recipes/ebeltoftlokalavisen_dk.recipe
 share/calibre/recipes/ebetrsberger_zeitung.recipe
 share/calibre/recipes/echo_dnia.recipe
 share/calibre/recipes/echo_moskvy.recipe
-share/calibre/recipes/echo_online.recipe
 share/calibre/recipes/eclipseonline.recipe
 share/calibre/recipes/ecogeek.recipe
 share/calibre/recipes/economia.recipe
@@ -2428,6 +2187,7 @@ share/calibre/recipes/ekot.recipe
 share/calibre/recipes/el_colombiano.recipe
 share/calibre/recipes/el_correo.recipe
 share/calibre/recipes/el_cultural.recipe
+share/calibre/recipes/el_diario.recipe
 share/calibre/recipes/el_diplo.recipe
 share/calibre/recipes/el_espectador.recipe
 share/calibre/recipes/el_faro.recipe
@@ -2454,7 +2214,6 @@ share/calibre/recipes/elet_es_irodalom.recipe
 share/calibre/recipes/elmundo.recipe
 share/calibre/recipes/elpais_impreso.recipe
 share/calibre/recipes/elpais_semanal.recipe
-share/calibre/recipes/elperiodico_catalan.recipe
 share/calibre/recipes/elperiodico_spanish.recipe
 share/calibre/recipes/elsevier.recipe
 share/calibre/recipes/eltiempo_hn.recipe
@@ -2467,11 +2226,11 @@ share/calibre/recipes/endgadget_ja.recipe
 share/calibre/recipes/entrepeneur.recipe
 share/calibre/recipes/eos_wetenschap.recipe
 share/calibre/recipes/epl_talk.recipe
+share/calibre/recipes/epoch_times.recipe
 share/calibre/recipes/epw.recipe
 share/calibre/recipes/erdinger_anzeiger.recipe
 share/calibre/recipes/erhvervs_avisen_dk.recipe
 share/calibre/recipes/esbjerglokalavisen_dk.recipe
-share/calibre/recipes/escrevinhador.recipe
 share/calibre/recipes/esenja.recipe
 share/calibre/recipes/esensja_(rss).recipe
 share/calibre/recipes/eso_pl.recipe
@@ -2544,7 +2303,6 @@ share/calibre/recipes/frederikssundlokalavisen_dk.recipe
 share/calibre/recipes/freenature.recipe
 share/calibre/recipes/freeway.recipe
 share/calibre/recipes/freisinger_tagblatt.recipe
-share/calibre/recipes/frontlineonnet.recipe
 share/calibre/recipes/fstream.recipe
 share/calibre/recipes/fudzilla.recipe
 share/calibre/recipes/furesoelokalavisen_dk.recipe
@@ -2595,6 +2353,7 @@ share/calibre/recipes/gofin_pl.recipe
 share/calibre/recipes/golem_de.recipe
 share/calibre/recipes/good_house_keeping.recipe
 share/calibre/recipes/good_to_know.recipe
+share/calibre/recipes/google_news.recipe
 share/calibre/recipes/googlemobileblog.recipe
 share/calibre/recipes/gosc_full.recipe
 share/calibre/recipes/gosc_niedzielny.recipe
@@ -2616,17 +2375,11 @@ share/calibre/recipes/gulfnews.recipe
 share/calibre/recipes/gulli.recipe
 share/calibre/recipes/gva_be.recipe
 share/calibre/recipes/gwup.recipe
-share/calibre/recipes/h1.recipe
-share/calibre/recipes/h2.recipe
 share/calibre/recipes/h3.recipe
-share/calibre/recipes/h7_tumspor.recipe
 share/calibre/recipes/haaretz_en.recipe
-share/calibre/recipes/haber7.recipe
 share/calibre/recipes/hackernews.recipe
 share/calibre/recipes/haderslevlokalavisen_dk.recipe
 share/calibre/recipes/haksoz.recipe
-share/calibre/recipes/hallo_assen.recipe
-share/calibre/recipes/halsnaeslokalavisen_dk.recipe
 share/calibre/recipes/hamilton_spectator.recipe
 share/calibre/recipes/handelsblatt.recipe
 share/calibre/recipes/hankyoreh.recipe
@@ -2634,31 +2387,20 @@ share/calibre/recipes/hankyoreh21.recipe
 share/calibre/recipes/hannoversche_zeitung.recipe
 share/calibre/recipes/harpers.recipe
 share/calibre/recipes/harpers_full.recipe
-share/calibre/recipes/hartford_courant.recipe
 share/calibre/recipes/hatalska.recipe
-share/calibre/recipes/hawaii.recipe
-share/calibre/recipes/hbr.recipe
 share/calibre/recipes/heavy_metal_it.recipe
 share/calibre/recipes/heise.recipe
-share/calibre/recipes/heise_online.recipe
+share/calibre/recipes/heise_ct.recipe
+share/calibre/recipes/heise_ix.recipe
 share/calibre/recipes/heise_open.recipe
 share/calibre/recipes/helsingin_sanomat.recipe
-share/calibre/recipes/heraldo.recipe
-share/calibre/recipes/heritage_foundation.recipe
 share/calibre/recipes/high_country_news.recipe
-share/calibre/recipes/hillerod_posten_dk.recipe
 share/calibre/recipes/hindu.recipe
 share/calibre/recipes/hindu_business_line.recipe
-share/calibre/recipes/hira.recipe
-share/calibre/recipes/histmag.recipe
-share/calibre/recipes/historia_news.recipe
+share/calibre/recipes/hindu_human_rights.recipe
+share/calibre/recipes/hindu_post.recipe
 share/calibre/recipes/historia_pl.recipe
-share/calibre/recipes/historiaro.recipe
-share/calibre/recipes/historias_del_mundo_es.recipe
-share/calibre/recipes/histories_del_mon_ca.recipe
 share/calibre/recipes/history_today.recipe
-share/calibre/recipes/hitro.recipe
-share/calibre/recipes/hln.recipe
 share/calibre/recipes/hln_be.recipe
 share/calibre/recipes/hna.recipe
 share/calibre/recipes/hnonline.recipe
@@ -2677,7 +2419,6 @@ share/calibre/recipes/howtogeek.recipe
 share/calibre/recipes/hoy.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
-share/calibre/recipes/huffingtonpost_uk.recipe
 share/calibre/recipes/hurriyet.recipe
 share/calibre/recipes/hvg.recipe
 share/calibre/recipes/hvidovreavis_dk.recipe
@@ -2687,7 +2428,6 @@ share/calibre/recipes/id_pixel.recipe
 share/calibre/recipes/ideal_almeria.recipe
 share/calibre/recipes/ideal_granada.recipe
 share/calibre/recipes/ideal_jaen.recipe
-share/calibre/recipes/idg_now.recipe
 share/calibre/recipes/idg_se.recipe
 share/calibre/recipes/idnes.recipe
 share/calibre/recipes/ieeespectrum.recipe
@@ -2712,9 +2452,13 @@ share/calibre/recipes/in4_pl.recipe
 share/calibre/recipes/in_gr.recipe
 share/calibre/recipes/inc.recipe
 share/calibre/recipes/independent.recipe
+share/calibre/recipes/independent_australia.recipe
 share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/india_facts.recipe
+share/calibre/recipes/india_speaks_reddit.recipe
 share/calibre/recipes/india_today.recipe
 share/calibre/recipes/indian_express.recipe
+share/calibre/recipes/indic_today.recipe
 share/calibre/recipes/indy_star.recipe
 share/calibre/recipes/infobae.recipe
 share/calibre/recipes/infomotori.recipe
@@ -2736,6 +2480,7 @@ share/calibre/recipes/iprofesional.recipe
 share/calibre/recipes/irish_independent.recipe
 share/calibre/recipes/irish_times.recipe
 share/calibre/recipes/isar-loisachbote.recipe
+share/calibre/recipes/istorias.recipe
 share/calibre/recipes/ivanamilakovic.recipe
 share/calibre/recipes/ixbt.recipe
 share/calibre/recipes/izvestia.recipe
@@ -2783,7 +2528,6 @@ share/calibre/recipes/kidney.recipe
 share/calibre/recipes/kitekinto.recipe
 share/calibre/recipes/kitsapun.recipe
 share/calibre/recipes/kleinezeitung.recipe
-share/calibre/recipes/klip_me.recipe
 share/calibre/recipes/klubknjige.recipe
 share/calibre/recipes/km_blog.recipe
 share/calibre/recipes/knack_be.recipe
@@ -2811,7 +2555,6 @@ share/calibre/recipes/kudika.recipe
 share/calibre/recipes/kudy_z_nudy.recipe
 share/calibre/recipes/kukuburi.recipe
 share/calibre/recipes/kurier.recipe
-share/calibre/recipes/kurier_galicyjski.recipe
 share/calibre/recipes/kurier_lubelski.recipe
 share/calibre/recipes/kurier_poranny.recipe
 share/calibre/recipes/kurier_szczecinski.recipe
@@ -2886,12 +2629,14 @@ share/calibre/recipes/lightspeed_magazine.recipe
 share/calibre/recipes/limba_sarda.recipe
 share/calibre/recipes/limes.recipe
 share/calibre/recipes/linux_magazine.recipe
+share/calibre/recipes/linux_news_de.recipe
 share/calibre/recipes/linuxportal_pl.recipe
 share/calibre/recipes/list_apart.recipe
 share/calibre/recipes/livemint.recipe
 share/calibre/recipes/living_stones.recipe
 share/calibre/recipes/lomza.recipe
 share/calibre/recipes/london_free_press.recipe
+share/calibre/recipes/los_danieles.recipe
 share/calibre/recipes/los_tiempos_bo.recipe
 share/calibre/recipes/losservatoreromano_it.recipe
 share/calibre/recipes/lrb.recipe
@@ -2916,6 +2661,7 @@ share/calibre/recipes/mainichi_en.recipe
 share/calibre/recipes/mainichi_science_news.recipe
 share/calibre/recipes/malaya_business_insight.recipe
 share/calibre/recipes/malaysian_mirror.recipe
+share/calibre/recipes/mallorca_zeitung.recipe
 share/calibre/recipes/mandidner.recipe
 share/calibre/recipes/manila_standard_today.recipe
 share/calibre/recipes/marca.recipe
@@ -2938,6 +2684,7 @@ share/calibre/recipes/mediterraneo.recipe
 share/calibre/recipes/medscape.recipe
 share/calibre/recipes/melbourne_herald_sun.recipe
 share/calibre/recipes/men24_gr.recipe
+share/calibre/recipes/mens_day_out.recipe
 share/calibre/recipes/mens_health.recipe
 share/calibre/recipes/merco_press.recipe
 share/calibre/recipes/mesec.recipe
@@ -2950,13 +2697,9 @@ share/calibre/recipes/michalkiewicz.recipe
 share/calibre/recipes/michellemalkin.recipe
 share/calibre/recipes/miesbacher_merkur.recipe
 share/calibre/recipes/military_times.recipe
-share/calibre/recipes/ming_pao.recipe
-share/calibre/recipes/ming_pao_toronto.recipe
-share/calibre/recipes/ming_pao_vancouver.recipe
 share/calibre/recipes/mit_technology_review.recipe
 share/calibre/recipes/mlody_technik_pl.recipe
 share/calibre/recipes/mmc_rtv.recipe
-share/calibre/recipes/mobile_bulgaria.recipe
 share/calibre/recipes/mobilenations.recipe
 share/calibre/recipes/modoros.recipe
 share/calibre/recipes/moldovaazi.recipe
@@ -2975,13 +2718,13 @@ share/calibre/recipes/msdnmag_en.recipe
 share/calibre/recipes/msnbc.recipe
 share/calibre/recipes/msnsankei.recipe
 share/calibre/recipes/mult_kor.recipe
-share/calibre/recipes/mumbai_mirror.recipe
 share/calibre/recipes/munchner_merkur_nord.recipe
 share/calibre/recipes/munchner_merkur_stadt.recipe
 share/calibre/recipes/munchner_merkur_sud.recipe
 share/calibre/recipes/munchner_merkur_wurmtal.recipe
 share/calibre/recipes/murnauer_tagblatt.recipe
 share/calibre/recipes/mwjournal.recipe
+share/calibre/recipes/my_dealz_de.recipe
 share/calibre/recipes/myapple_pl.recipe
 share/calibre/recipes/nachdenkseiten.recipe
 share/calibre/recipes/nacional_cro.recipe
@@ -2989,7 +2732,6 @@ share/calibre/recipes/nacionred.recipe
 share/calibre/recipes/nadacni_fond_proti_korupci.recipe
 share/calibre/recipes/najwyzszy_czas.recipe
 share/calibre/recipes/nakedcapitalism.recipe
-share/calibre/recipes/nanfengchuang.recipe
 share/calibre/recipes/nasa.recipe
 share/calibre/recipes/naszdziennik.recipe
 share/calibre/recipes/natemat_pl.recipe
@@ -2997,15 +2739,12 @@ share/calibre/recipes/natgeo.recipe
 share/calibre/recipes/nation_ke.recipe
 share/calibre/recipes/national_geographic_es.recipe
 share/calibre/recipes/national_geographic_it.recipe
-share/calibre/recipes/national_geographic_pl.recipe
 share/calibre/recipes/national_post.recipe
-share/calibre/recipes/nationalgeographicjp.recipe
 share/calibre/recipes/nationalgeoro.recipe
 share/calibre/recipes/nationalreviewonline.recipe
 share/calibre/recipes/nature.recipe
 share/calibre/recipes/nauka_w_polsce.recipe
 share/calibre/recipes/navalny.recipe
-share/calibre/recipes/navegalo.recipe
 share/calibre/recipes/navy_times.recipe
 share/calibre/recipes/nbonline.recipe
 share/calibre/recipes/ncrnext.recipe
@@ -3027,7 +2766,6 @@ share/calibre/recipes/newsbeast.recipe
 share/calibre/recipes/newsmoldova.recipe
 share/calibre/recipes/newsobs.recipe
 share/calibre/recipes/newsstraitstimes.recipe
-share/calibre/recipes/newsweek.recipe
 share/calibre/recipes/newsweek_polska.recipe
 share/calibre/recipes/newz_dk.recipe
 share/calibre/recipes/nezavisne_novine.recipe
@@ -3050,8 +2788,6 @@ share/calibre/recipes/norddjurslokalavisen_dk.recipe
 share/calibre/recipes/nordjyske_dk.recipe
 share/calibre/recipes/nortecastilla.recipe
 share/calibre/recipes/nos_nl.recipe
-share/calibre/recipes/noticias_r7.recipe
-share/calibre/recipes/noticias_unb.recipe
 share/calibre/recipes/novaya_gazeta.recipe
 share/calibre/recipes/novilist_novine_hr.recipe
 share/calibre/recipes/novilist_portal_hr.recipe
@@ -3060,7 +2796,6 @@ share/calibre/recipes/novinite_bg.recipe
 share/calibre/recipes/novinky.cz.recipe
 share/calibre/recipes/novinky.recipe
 share/calibre/recipes/novosti.recipe
-share/calibre/recipes/now_toronto.recipe
 share/calibre/recipes/nowiny_rybnik.recipe
 share/calibre/recipes/nowy_obywatel.recipe
 share/calibre/recipes/noz.recipe
@@ -3077,10 +2812,10 @@ share/calibre/recipes/ntv_spor.recipe
 share/calibre/recipes/ntv_tr.recipe
 share/calibre/recipes/nu.recipe
 share/calibre/recipes/nursingtimes.recipe
-share/calibre/recipes/nuus24.recipe
 share/calibre/recipes/nymag.recipe
 share/calibre/recipes/nypost.recipe
 share/calibre/recipes/nytimes.recipe
+share/calibre/recipes/nytimes_cooking.recipe
 share/calibre/recipes/nytimes_sports.recipe
 share/calibre/recipes/nytimes_sub.recipe
 share/calibre/recipes/nytimes_tech.recipe
@@ -3088,7 +2823,6 @@ share/calibre/recipes/nytimesbook.recipe
 share/calibre/recipes/nzherald.recipe
 share/calibre/recipes/nzz_folio.recipe
 share/calibre/recipes/nzz_ger.recipe
-share/calibre/recipes/nzz_webpaper.recipe
 share/calibre/recipes/o_globo.recipe
 share/calibre/recipes/oakland_north.recipe
 share/calibre/recipes/oba.recipe
@@ -3106,6 +2840,7 @@ share/calibre/recipes/omgubuntu.recipe
 share/calibre/recipes/onda_rock.recipe
 share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/opindia.recipe
 share/calibre/recipes/opinion_bo.recipe
 share/calibre/recipes/optyczne_pl.recipe
 share/calibre/recipes/oregonian.recipe
@@ -3134,7 +2869,6 @@ share/calibre/recipes/patente_de_corso.recipe
 share/calibre/recipes/pc_advisor.recipe
 share/calibre/recipes/pc_foster.recipe
 share/calibre/recipes/pc_lab.recipe
-share/calibre/recipes/pc_mag.recipe
 share/calibre/recipes/pc_world.recipe
 share/calibre/recipes/pcworld_hu.recipe
 share/calibre/recipes/pcworldro.recipe
@@ -3181,12 +2915,14 @@ share/calibre/recipes/post_today.recipe
 share/calibre/recipes/poughkeepsie_journal.recipe
 share/calibre/recipes/ppe_pl.recipe
 share/calibre/recipes/praguemonitor.recipe
+share/calibre/recipes/pragyata.recipe
 share/calibre/recipes/pravda.recipe
 share/calibre/recipes/pravda_it.recipe
 share/calibre/recipes/pravda_por.recipe
 share/calibre/recipes/pravda_rs.recipe
 share/calibre/recipes/pravda_ru.recipe
 share/calibre/recipes/pravo.recipe
+share/calibre/recipes/prekshaa.recipe
 share/calibre/recipes/presse_portal.recipe
 share/calibre/recipes/pressonline.recipe
 share/calibre/recipes/pressthink.recipe
@@ -3257,7 +2993,6 @@ share/calibre/recipes/rollingstone.recipe
 share/calibre/recipes/romanialibera.recipe
 share/calibre/recipes/root.recipe
 share/calibre/recipes/roskildelokalavisen_dk.recipe
-share/calibre/recipes/rossijkaja_gazeta.recipe
 share/calibre/recipes/rte.recipe
 share/calibre/recipes/rtnews.recipe
 share/calibre/recipes/rts.recipe
@@ -3273,6 +3008,7 @@ share/calibre/recipes/rzeczpospolita.recipe
 share/calibre/recipes/sa_gazeta.recipe
 share/calibre/recipes/sabah.recipe
 share/calibre/recipes/sabit_fikir.recipe
+share/calibre/recipes/saechsische.recipe
 share/calibre/recipes/sage_news.recipe
 share/calibre/recipes/sage_news_opinion.recipe
 share/calibre/recipes/salon.recipe
@@ -3282,6 +3018,7 @@ share/calibre/recipes/samanyolu_teknoloji.recipe
 share/calibre/recipes/san_fran_chronicle.recipe
 share/calibre/recipes/sanjosemercurynews.recipe
 share/calibre/recipes/sarajevo_x.recipe
+share/calibre/recipes/sardinia_post.recipe
 share/calibre/recipes/saskatoon_star_phoenix.recipe
 share/calibre/recipes/satira.recipe
 share/calibre/recipes/satkurier.recipe
@@ -3289,7 +3026,7 @@ share/calibre/recipes/satmagazine.recipe
 share/calibre/recipes/sb_nation.recipe
 share/calibre/recipes/schattenblick.recipe
 share/calibre/recipes/schongauer_nachrichten.recipe
-share/calibre/recipes/science_aas.recipe
+share/calibre/recipes/schwarzerpfeil.recipe
 share/calibre/recipes/science_advances.recipe
 share/calibre/recipes/science_based_medicine.recipe
 share/calibre/recipes/science_news.recipe
@@ -3342,6 +3079,7 @@ share/calibre/recipes/soldiers.recipe
 share/calibre/recipes/something_awful.recipe
 share/calibre/recipes/sondagsavisen_dk.recipe
 share/calibre/recipes/southernstar.recipe
+share/calibre/recipes/spectator-au.recipe
 share/calibre/recipes/spectator_magazine.recipe
 share/calibre/recipes/spektrum.recipe
 share/calibre/recipes/spiegel_int.recipe
@@ -3366,18 +3104,23 @@ share/calibre/recipes/straitstimes.recipe
 share/calibre/recipes/strange_horizons.recipe
 share/calibre/recipes/strategic_culture.recipe
 share/calibre/recipes/strategy-business.recipe
+share/calibre/recipes/substack.recipe
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/sueddeutsche_mobil.recipe
 share/calibre/recipes/sueddeutschezeitung.recipe
 share/calibre/recipes/sunday_times_magazine.recipe
 share/calibre/recipes/superbebe.recipe
 share/calibre/recipes/superesportes.recipe
+share/calibre/recipes/svt_nyheter.recipe
 share/calibre/recipes/swiat_obrazu.recipe
 share/calibre/recipes/swiatkindle.recipe
 share/calibre/recipes/syddjurslokalavisen_dk.recipe
+share/calibre/recipes/t3n_de.recipe
+share/calibre/recipes/t_online.recipe
 share/calibre/recipes/tablety_pl.recipe
 share/calibre/recipes/tabu.recipe
 share/calibre/recipes/tagesan.recipe
+share/calibre/recipes/tagespost.recipe
 share/calibre/recipes/tagesspiegel.recipe
 share/calibre/recipes/taggeschau_de.recipe
 share/calibre/recipes/taipei.recipe
@@ -3424,9 +3167,11 @@ share/calibre/recipes/the_oz.recipe
 share/calibre/recipes/the_philippine_daily_inquirer.recipe
 share/calibre/recipes/the_philippine_star.recipe
 share/calibre/recipes/the_register.recipe
+share/calibre/recipes/the_saturday_paper.recipe
 share/calibre/recipes/the_scotsman.recipe
 share/calibre/recipes/the_sun.recipe
 share/calibre/recipes/the_verge.recipe
+share/calibre/recipes/the_week.recipe
 share/calibre/recipes/the_week_magazine_free.recipe
 share/calibre/recipes/the_workingham_times.recipe
 share/calibre/recipes/thecodelesscode.recipe
@@ -3443,6 +3188,7 @@ share/calibre/recipes/thenews.recipe
 share/calibre/recipes/theoldfoodie.recipe
 share/calibre/recipes/theonion.recipe
 share/calibre/recipes/theonlinephotographer.recipe
+share/calibre/recipes/theprint.recipe
 share/calibre/recipes/thestar.recipe
 share/calibre/recipes/thewest_au.recipe
 share/calibre/recipes/think_progress.recipe
@@ -3513,12 +3259,10 @@ share/calibre/recipes/utrinski.recipe
 share/calibre/recipes/valbybladet_dk.recipe
 share/calibre/recipes/vancouver_province.recipe
 share/calibre/recipes/vancouver_sun.recipe
-share/calibre/recipes/vanityfair.recipe
 share/calibre/recipes/vanloesebladet_dk.recipe
 share/calibre/recipes/vardelokalavisen_dk.recipe
 share/calibre/recipes/variety.recipe
 share/calibre/recipes/vecernji_list.recipe
-share/calibre/recipes/vedomosti.recipe
 share/calibre/recipes/veintitres.recipe
 share/calibre/recipes/vejlelokalavisen_dk.recipe
 share/calibre/recipes/version2.recipe
@@ -3591,6 +3335,7 @@ share/calibre/recipes/yenisafak_gazetesi.recipe
 share/calibre/recipes/ynet.recipe
 share/calibre/recipes/yomiuri.recipe
 share/calibre/recipes/yomiuri_world.recipe
+share/calibre/recipes/zackzack.recipe
 share/calibre/recipes/zadolba_li.recipe
 share/calibre/recipes/zaman.recipe
 share/calibre/recipes/zaobao.recipe
@@ -3622,16 +3367,16 @@ 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/doc/calibre/COPYRIGHT
-share/doc/calibre/Changelog.old.yaml
-share/doc/calibre/Changelog.yaml
+share/doc/calibre/Changelog.old.txt
+share/doc/calibre/Changelog.txt
 share/doc/calibre/INSTALL.rst
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
 @pkgdir share/icons
 @pkgdir share/applications
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages
diff --git a/calibre5/TODO b/calibre5/TODO
index 5a5d7320bd..e07998b3ed 100644
--- a/calibre5/TODO
+++ b/calibre5/TODO
@@ -28,5 +28,35 @@ Next error:
 >> Generating the pictureflow bindings...
 >> -c: Q_PID is undefined
 
+I son't see where it is used, but it seems to be defined in
 
-According to near code in setup/build.py we would need py-toml (toml-0.10.1.tar.gz)
+/usr/pkg/share/sip3.9/PyQt5/QtCore/qprocess.sip:typedef void *Q_PID;
+/usr/pkg/share/sip3.9/PyQt5/QtCore/qprocess.sip:typedef qint64 Q_PID;
+/usr/pkg/share/sip3.9/PyQt5/QtCore/qprocess.sip:    Q_PID pid() const;
+
+Moving that file aside gives an error that it isn't found, so it is included
+from somewhere.
+Commenting out the 3rd line makes the build work.
+The first two are conditional defines; 
+It seems that %If (WS_X11 || WS_MACX) isn't matching.
+
+
+Next error:
+
+$ calibre
+Traceback (most recent call last):
+  File "/usr/pkg/bin/calibre", line 21, in <module>
+    sys.exit(calibre())
+  File "/usr/pkg/lib/calibre/calibre/gui_launch.py", line 64, in calibre
+    main(args)
+  File "/usr/pkg/lib/calibre/calibre/gui2/main.py", line 533, in main
+    app, opts, args = init_qt(args)
+  File "/usr/pkg/lib/calibre/calibre/gui2/main.py", line 124, in init_qt
+    app = Application(args, override_program_name=override, windows_app_uid=MAIN_APP_UID)
+  File "/usr/pkg/lib/calibre/calibre/gui2/__init__.py", line 915, in __init__
+    from calibre_extensions import progress_indicator
+RuntimeError: the sip module implements API v12.0 to v12.7 but the progress_indicator module requires API v12.9
+
+
+Does that mean that py39-qt5 also needs to be built with sip6 somehow?
+Or that calibre's use of sip6 needs to be replaced with sip4?
diff --git a/calibre5/distinfo b/calibre5/distinfo
index 4ea0fdcb0c..48300a6d76 100644
--- a/calibre5/distinfo
+++ b/calibre5/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.104 2019/09/24 16:39:50 kamil Exp $
 BLAKE2s (calibre-5.34.0.tar.xz) = 62505402dee81ebd41063e80dc9611e9517c27b3a69e8cb88d99755ccbd3bca5
 SHA512 (calibre-5.34.0.tar.xz) = fe60f43493e8830a02a08db017efa8d8bdf873618c75efd73ed9a5a6e13a5afc41daa79489645f15fbeeadc6f99b16a70ebc8e6979b0c113f73a170e20f4c95f
 Size (calibre-5.34.0.tar.xz) = 37077184 bytes
-SHA1 (patch-setup_build.py) = 1c0213c2483407f8d488ae014e0ff62f26a0fd43
+SHA1 (patch-setup_build.py) = bfd4d4c7b08771cd8acf86c6aaa26a739e469684
 SHA1 (patch-setup_extensions.json) = a15bf58d20bd9a7566f14ebae20116f646c834e7
 SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
 SHA1 (patch-src_calibre_constants.py) = e35f904d075ddb2cf2256895b564a55490fb5897
diff --git a/calibre5/patches/patch-setup_build.py b/calibre5/patches/patch-setup_build.py
index f3391ce326..31290cff14 100644
--- a/calibre5/patches/patch-setup_build.py
+++ b/calibre5/patches/patch-setup_build.py
@@ -4,15 +4,11 @@ $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
 - Include netbsd in various conditional building criteria.
 - Patch in the directory /usr/pkg/share/sip3.9/PyQt5 for
   QtWidgets/QtWidgetsmod.sip etc.
+- Define the %Platform value WS_X11, so that Q_PID gets defined in
+  PyQt5/QtCore/qprocess.sip.
 
 --- setup/build.py.orig	2021-12-17 00:40:19.000000000 +0000
 +++ setup/build.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python
- # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
- 
- __license__   = 'GPL v3'
 @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
  import textwrap, os, shlex, subprocess, glob, shutil, sys, json, errno, sysconfig
  from collections import namedtuple
@@ -40,15 +36,6 @@ $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
          elif ishaiku:
              ans = ext.pop('haiku_' + k, ans)
          else:
-@@ -197,6 +199,8 @@ def init_env(debug=False, sanitize=False
-         if sanitize:
-             cflags.append('-fsanitize-address')
-             ldflags.append('-shared-libasan')
-+        # QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
-+        # ldflags.append('$(COMPILER_RPATH_FLAG)$(X11BASE)/lib')
- 
-     if islinux:
-         cflags.append('-pthread')
 @@ -496,6 +500,7 @@ class Build(Command):
              INCLUDEPATH += {freetype}
              DESTDIR = {destdir}
@@ -73,3 +60,11 @@ $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
  {abi_version}
  
  [tool.sip.bindings.pictureflow]
+@@ -547,6 +554,7 @@ exceptions = {needs_exceptions}
+ include-dirs = {ext.inc_dirs}
+ qmake-QT = ["widgets"]
+ sip-file = "{os.path.basename(sipf)}"
++tags = ["WS_X11"]
+ ''')
+         shutil.copy2(sipf, src_dir)
+
Home | Main Index | Thread Index | Old Index