thanks, committed. needed a "make update-patches".
On 2021/10/25 07:06, Josh Grosse wrote:
> Update from 5.28.0 to 5.30.0. Tested on amd64.
> Changelog: https://calibre-ebook.com/whats-new
> diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
> index 958c9fa7eab..32bbf6600bd 100644
> --- a/textproc/calibre/Makefile
> +++ b/textproc/calibre/Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT = ebook management application
>
> -V = 5.28.0
> +V = 5.30.0
> DISTNAME = calibre-$V
>
> CATEGORIES = textproc
> diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
> index b3374a00c77..72e1e8bad98 100644
> --- a/textproc/calibre/distinfo
> +++ b/textproc/calibre/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (calibre-5.28.0.tar.xz) = 6AIRMcjk93WAVg1woNSayxrKv7QOPZEnQhTfkl1fOto=
> -SIZE (calibre-5.28.0.tar.xz) = 37002032
> +SHA256 (calibre-5.30.0.tar.xz) = jvh/JLpMpW2EIlKVFpDJZAL072CWthh0JPQOBjvGDRU=
> +SIZE (calibre-5.30.0.tar.xz) = 37002224
> diff --git a/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> index a8502bb229c..77b056cc8ff 100644
> --- a/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> +++ b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
> @@ -5,7 +5,7 @@ $OpenBSD: patch-src_calibre_gui2_update_py,v 1.3 2021/03/27
> 14:35:12 sthen Exp $
> Index: src/calibre/gui2/update.py
> --- src/calibre/gui2/update.py.orig
> +++ src/calibre/gui2/update.py
> -@@ -35,35 +35,7 @@ def get_download_url():
> +@@ -32,35 +32,7 @@ def get_download_url():
>
>
> def get_newest_version():
> @@ -27,14 +27,14 @@ Index: src/calibre/gui2/update.py
> - # certificate verification failed, since the version check contains
> no
> - # critical information, ignore and proceed
> - # We have to do this as if the calibre CA certificate ever
> -- # needs to be revoked, then we wont be able to do version checks
> +- # needs to be revoked, then we won't be able to do version checks
> - version = get_https_resource_securely(URL, headers=headers,
> cacerts=None)
> - try:
> - version = version.decode('utf-8').strip()
> - except UnicodeDecodeError:
> - version = ''
> - ans = NO_CALIBRE_UPDATE
> -- m = re.match(unicode_type(r'(\d+)\.(\d+).(\d+)$'), version)
> +- m = re.match(r'(\d+)\.(\d+).(\d+)$', version)
> - if m is not None:
> - ans = tuple(map(int, (m.group(1), m.group(2), m.group(3))))
> - return ans
> diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST
> index f8f24e705ea..2349f7ae416 100644
> --- a/textproc/calibre/pkg/PLIST
> +++ b/textproc/calibre/pkg/PLIST
> @@ -1806,6 +1806,7 @@
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}match_books_ui.${MODPY_PYC_MAGI
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}message_box.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}metadata_bulk.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}metadata_bulk_ui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}multisort.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}opml.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password_ui.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -1872,6 +1873,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
> @@ -4552,6 +4554,8 @@ share/calibre/recipes/high_country_news.png
> share/calibre/recipes/high_country_news.recipe
> share/calibre/recipes/hindu.recipe
> share/calibre/recipes/hindu_business_line.recipe
> +share/calibre/recipes/hindu_human_rights.recipe
> +share/calibre/recipes/hindu_post.recipe
> share/calibre/recipes/historia_pl.png
> share/calibre/recipes/historia_pl.recipe
> share/calibre/recipes/history_today.recipe
> @@ -4645,9 +4649,11 @@ share/calibre/recipes/independent.recipe
> share/calibre/recipes/independent_australia.recipe
> share/calibre/recipes/index_hu.png
> share/calibre/recipes/index_hu.recipe
> +share/calibre/recipes/india_facts.recipe
> share/calibre/recipes/india_today.recipe
> share/calibre/recipes/indian_express.png
> share/calibre/recipes/indian_express.recipe
> +share/calibre/recipes/indic_today.recipe
> share/calibre/recipes/indy_star.recipe
> share/calibre/recipes/infobae.png
> share/calibre/recipes/infobae.recipe
> @@ -5277,6 +5283,7 @@ share/calibre/recipes/onda_rock.recipe
> share/calibre/recipes/onemagazine.png
> 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.png
> share/calibre/recipes/optyczne_pl.recipe
> @@ -5402,6 +5409,7 @@ share/calibre/recipes/ppe_pl.png
> share/calibre/recipes/ppe_pl.recipe
> share/calibre/recipes/praguemonitor.png
> share/calibre/recipes/praguemonitor.recipe
> +share/calibre/recipes/pragyata.recipe
> share/calibre/recipes/pravda.recipe
> share/calibre/recipes/pravda_it.png
> share/calibre/recipes/pravda_it.recipe
> @@ -5412,6 +5420,7 @@ share/calibre/recipes/pravda_rs.recipe
> share/calibre/recipes/pravda_ru.png
> share/calibre/recipes/pravda_ru.recipe
> share/calibre/recipes/pravo.recipe
> +share/calibre/recipes/prekshaa.recipe
> share/calibre/recipes/presse_portal.png
> share/calibre/recipes/presse_portal.recipe
> share/calibre/recipes/pressonline.png
