Update from 5.32.0 to 5.37.0
Change log: https://calibre-ebook.com/whats-new
Tested lightly on amd64.
diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
index a5f09344e64..b1a78e4ea16 100644
--- a/textproc/calibre/Makefile
+++ b/textproc/calibre/Makefile
@@ -2,7 +2,7 @@
COMMENT = ebook management application
-V = 5.32.0
+V = 5.37.0
DISTNAME = calibre-$V
CATEGORIES = textproc
diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
index 4b610ef9399..a92ea121ecd 100644
--- a/textproc/calibre/distinfo
+++ b/textproc/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-5.32.0.tar.xz) = NXHvwcx3PkU7RZCWo4sUH9DHeE+5YRUFofmlVkj0fl4=
-SIZE (calibre-5.32.0.tar.xz) = 37115596
+SHA256 (calibre-5.37.0.tar.xz) = x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY=
+SIZE (calibre-5.37.0.tar.xz) = 38369808
diff --git a/textproc/calibre/patches/patch-setup___init___py
b/textproc/calibre/patches/patch-setup___init___py
index 6341b4456a9..e776d30f0ef 100644
--- a/textproc/calibre/patches/patch-setup___init___py
+++ b/textproc/calibre/patches/patch-setup___init___py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup___init___py,v 1.9 2021/08/14 10:24:26
sthen Exp $
Index: setup/__init__.py
--- setup/__init__.py.orig
+++ setup/__init__.py
-@@ -25,7 +25,8 @@ ismacos = 'darwin' in sys.platform
+@@ -24,7 +24,8 @@ ismacos = 'darwin' in sys.platform
isfreebsd = 'freebsd' in sys.platform
isnetbsd = 'netbsd' in sys.platform
isdragonflybsd = 'dragonfly' in sys.platform
diff --git a/textproc/calibre/patches/patch-setup_build_py
b/textproc/calibre/patches/patch-setup_build_py
index 180dd66571b..4184af5ef2a 100644
--- a/textproc/calibre/patches/patch-setup_build_py
+++ b/textproc/calibre/patches/patch-setup_build_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_build_py,v 1.8 2021/10/25 13:11:46 sthen
Exp $
Index: setup/build.py
--- setup/build.py.orig
+++ setup/build.py
-@@ -72,15 +72,7 @@ class Extension:
+@@ -71,15 +71,7 @@ class Extension:
self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
self.optional = d['options'] = kwargs.get('optional', False)
@@ -19,12 +19,12 @@ Index: setup/build.py
def lazy_load(name):
if name.startswith('!'):
name = name[1:]
-@@ -196,6 +188,8 @@ def init_env(debug=False, sanitize=False):
+@@ -206,6 +198,8 @@ def init_env(debug=False, sanitize=False):
if isbsd:
cflags.append('-pthread')
ldflags.append('-shared')
-+ cflags.append('-I'+os.path.join(sysconfig.PREFIX, 'include'))
-+ ldflags.append('-L'+os.path.join(sysconfig.PREFIX, 'lib'))
++ cflags.append('-I${PREFIX}/include')
++ ldflags.append('-L${PREFIX}/lib')
if ishaiku:
cflags.append('-lpthread')
diff --git a/textproc/calibre/patches/patch-setup_install_py
b/textproc/calibre/patches/patch-setup_install_py
index 02671652c28..1934745612b 100644
--- a/textproc/calibre/patches/patch-setup_install_py
+++ b/textproc/calibre/patches/patch-setup_install_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_install_py,v 1.7 2021/04/28 20:23:06
sthen Exp $
Index: setup/install.py
--- setup/install.py.orig
+++ setup/install.py
-@@ -270,7 +270,7 @@ class Install(Develop):
+@@ -272,7 +272,7 @@ class Install(Develop):
reldir = os.path.relpath(x[0], self.SRC)
destdir = os.path.join(dest, reldir)
for f in x[-1]:
diff --git a/textproc/calibre/patches/patch-src_calibre_constants_py
b/textproc/calibre/patches/patch-src_calibre_constants_py
index d3851393167..8b848eec784 100644
--- a/textproc/calibre/patches/patch-src_calibre_constants_py
+++ b/textproc/calibre/patches/patch-src_calibre_constants_py
@@ -8,7 +8,7 @@ supports OSX, Windows, and Linux SYSFS.
Index: src/calibre/constants.py
--- src/calibre/constants.py.orig
+++ src/calibre/constants.py
-@@ -22,7 +22,8 @@ isnewosx = ismacos and getattr(sys, 'new_app_bundle',
+@@ -21,7 +21,8 @@ isnewosx = ismacos and getattr(sys, 'new_app_bundle',
isfreebsd = 'freebsd' in _plat
isnetbsd = 'netbsd' in _plat
isdragonflybsd = 'dragonfly' in _plat
@@ -18,7 +18,7 @@ Index: src/calibre/constants.py
ishaiku = 'haiku1' in _plat
islinux = not(iswindows or ismacos or isbsd or ishaiku)
isfrozen = hasattr(sys, 'frozen')
-@@ -256,7 +257,7 @@ class ExtensionsImporter:
+@@ -255,7 +256,7 @@ class ExtensionsImporter:
extra = ('winutil', 'wpd', 'winfonts', 'winsapi')
elif ismacos:
extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
diff --git a/textproc/calibre/patches/patch-src_calibre_gui2___init___py
b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
index 94accb54210..93668f52d43 100644
--- a/textproc/calibre/patches/patch-src_calibre_gui2___init___py
+++ b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
@@ -5,7 +5,7 @@ $OpenBSD: patch-src_calibre_gui2___init___py,v 1.14 2021/10/25
13:11:46 sthen Ex
Index: src/calibre/gui2/__init__.py
--- src/calibre/gui2/__init__.py.orig
+++ src/calibre/gui2/__init__.py
-@@ -803,7 +803,7 @@ def load_builtin_fonts():
+@@ -854,7 +854,7 @@ def load_builtin_fonts():
def setup_gui_option_parser(parser):
diff --git a/textproc/calibre/patches/patch-src_calibre_linux_py
b/textproc/calibre/patches/patch-src_calibre_linux_py
index 44935c6adf8..3aaa8dde411 100644
--- a/textproc/calibre/patches/patch-src_calibre_linux_py
+++ b/textproc/calibre/patches/patch-src_calibre_linux_py
@@ -5,7 +5,7 @@ $OpenBSD: patch-src_calibre_linux_py,v 1.10 2021/02/24 14:13:48
rsadowski Exp $
Index: src/calibre/linux.py
--- src/calibre/linux.py.orig
+++ src/calibre/linux.py
-@@ -777,19 +777,6 @@ class PostInstall:
+@@ -776,19 +776,6 @@ class PostInstall:
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST
index 62ddab3e77b..dca564c07a4 100644
--- a/textproc/calibre/pkg/PLIST
+++ b/textproc/calibre/pkg/PLIST
@@ -20,12 +20,11 @@ bin/lrs2lrf
bin/markdown-calibre
bin/web2disk
lib/calibre/
-${MODPY_COMMENT}lib/calibre/${MODPY_PYCACHE}/
-lib/calibre/${MODPY_PYCACHE}sgmllib.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/
lib/calibre/calibre/__init__.py
${MODPY_COMMENT}lib/calibre/calibre/${MODPY_PYCACHE}/
lib/calibre/calibre/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/calibre/calibre/${MODPY_PYCACHE}build_forms.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}gui_launch.${MODPY_PYC_MAGIC_TAG}pyc
@@ -37,6 +36,7 @@
lib/calibre/calibre/${MODPY_PYCACHE}ptempfile.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}rpdb.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}startup.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/${MODPY_PYCACHE}test_build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/calibre/calibre/build_forms.py
lib/calibre/calibre/constants.py
lib/calibre/calibre/customize/
lib/calibre/calibre/customize/__init__.py
@@ -1469,6 +1469,7 @@
lib/calibre/calibre/gui2/${MODPY_PYCACHE}dnd.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}ebook_download.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}email.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}filename_pattern_ui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/calibre/calibre/gui2/${MODPY_PYCACHE}flow_toolbar.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}font_family_chooser.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}gestures.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/${MODPY_PYCACHE}html_transform_rules.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1782,7 +1783,6 @@
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}choose_library.${MODPY_PYC_MAGI
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}choose_library_ui.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}choose_plugin_toolbars.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}comments_dialog.${MODPY_PYC_MAGIC_TAG}pyc
-lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}comments_dialog_ui.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}confirm_delete_location_ui.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1849,7 +1849,6 @@ lib/calibre/calibre/gui2/dialogs/choose_library.py
lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
lib/calibre/calibre/gui2/dialogs/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
@@ -1906,6 +1905,7 @@ 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
@@ -2186,7 +2186,6 @@
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}smashwords_plugin.${MODPY_
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}swiatebookow_plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}virtualo_plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}weightless_books_plugin.${MODPY_PYC_MAGIC_TAG}pyc
-lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}whsmith_uk_plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}woblink_plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}wolnelektury_plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/gui2/store/stores/${MODPY_PYCACHE}xinxii_plugin.${MODPY_PYC_MAGIC_TAG}pyc
@@ -2253,7 +2252,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
@@ -3129,7 +3127,6 @@ 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/sgmllib.py
lib/calibre/templite/
lib/calibre/templite/__init__.py
${MODPY_COMMENT}lib/calibre/templite/${MODPY_PYCACHE}/
@@ -3212,6 +3209,7 @@ share/calibre/catalog/section_list_templates.conf
share/calibre/catalog/stylesheet.css
share/calibre/catalog/template.xhtml
share/calibre/changelog.json
+share/calibre/common-english-words.txt
share/calibre/content-server/
share/calibre/content-server/calibre.png
share/calibre/content-server/empty.html
@@ -3267,6 +3265,7 @@ share/calibre/hyphenation/
share/calibre/hyphenation/dictionaries.tar.xz
share/calibre/hyphenation/locales.json
share/calibre/hyphenation/sha1sum
+share/calibre/icons.rcc
share/calibre/images/
share/calibre/images.qrc
share/calibre/images/add_book.png
@@ -4143,6 +4142,7 @@ share/calibre/recipes/dunya_bulteni.recipe
share/calibre/recipes/dunyahalleri.recipe
share/calibre/recipes/dunyahalleri_haftaninozeti.recipe
share/calibre/recipes/dvhn.recipe
+share/calibre/recipes/dw_de.recipe
share/calibre/recipes/dwutygodnik.png
share/calibre/recipes/dwutygodnik.recipe
share/calibre/recipes/dzieje_pl.png
@@ -4274,7 +4274,9 @@ share/calibre/recipes/entrepeneur.png
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/equestria_daily.recipe
share/calibre/recipes/erdinger_anzeiger.png
share/calibre/recipes/erdinger_anzeiger.recipe
share/calibre/recipes/erhvervs_avisen_dk.png
@@ -5028,6 +5030,7 @@ share/calibre/recipes/medscape.recipe
share/calibre/recipes/melbourne_herald_sun.png
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.png
share/calibre/recipes/mens_health.recipe
share/calibre/recipes/merco_press.png
