update to calibre-5.44.0, last version before it switched to py-qt6

This commit is contained in:
sthen 2022-09-03 14:00:45 +00:00
parent 87b98f08d5
commit de3ecd0387
5 changed files with 16 additions and 38 deletions

View File

@ -1,6 +1,6 @@
COMMENT = ebook management application
V = 5.43.0
V = 5.44.0
DISTNAME = calibre-$V
CATEGORIES = textproc
@ -15,7 +15,8 @@ WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Widgets crypto fontconfig
WANTLIB += freetype glib-2.0 gthread-2.0 hunspell-1.7 hyphen icudata
WANTLIB += icui18n icuio icuuc intl m podofo stemmer z
MASTER_SITES = https://github.com/kovidgoyal/calibre/releases/download/v${V}/
MASTER_SITES = https://download.calibre-ebook.com/$V/
PORTROACH = site:https://github.com/kovidgoyal/calibre/archive/
EXTRACT_SUFX = .tar.xz
MODULES = lang/python \

View File

@ -1,2 +1,2 @@
SHA256 (calibre-5.43.0.tar.xz) = g0v65Swm+Sk8AMtNT1EmDe/hmO8HZhkZQBbFH4ffEuA=
SIZE (calibre-5.43.0.tar.xz) = 38641220
SHA256 (calibre-5.44.0.tar.xz) = b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw=
SIZE (calibre-5.44.0.tar.xz) = 41015696

View File

@ -16,7 +16,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:
@@ -260,7 +261,7 @@ class ExtensionsImporter:
extra = ('winutil', 'wpd', 'winfonts', 'winsapi')
elif ismacos:
extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')

View File

@ -3,40 +3,13 @@
Index: src/calibre/gui2/update.py
--- src/calibre/gui2/update.py.orig
+++ src/calibre/gui2/update.py
@@ -32,35 +32,7 @@ def get_download_url():
@@ -32,6 +32,9 @@ def get_download_url():
def get_newest_version():
- try:
- icon_theme_name = json.loads(I('icon-theme.json', data=True))['name']
- except Exception:
- icon_theme_name = ''
- headers={
- 'CALIBRE-VERSION':__version__,
- 'CALIBRE-OS': ('win' if iswindows else 'osx' if ismacos else 'oth'),
- 'CALIBRE-INSTALL-UUID': prefs['installation_uuid'],
- 'CALIBRE-ICON-THEME': icon_theme_name,
- }
- try:
- version = get_https_resource_securely(URL, headers=headers)
- except ssl.SSLError as err:
- if getattr(err, 'reason', None) != 'CERTIFICATE_VERIFY_FAILED':
- raise
- # 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 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(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
+ return NO_CALIBRE_UPDATE
class Signal(QObject):
+
+def DISABLED_get_newest_version():
try:
icon_theme_name = json.loads(I('icon-theme.json', data=True))['name']
except Exception:

View File

@ -3843,6 +3843,7 @@ share/calibre/recipes/business_insider.png
share/calibre/recipes/business_insider.recipe
share/calibre/recipes/business_standard.png
share/calibre/recipes/business_standard.recipe
share/calibre/recipes/business_standard_print_edition.recipe
share/calibre/recipes/business_today.recipe
share/calibre/recipes/businessworldin.png
share/calibre/recipes/businessworldin.recipe
@ -5171,6 +5172,7 @@ share/calibre/recipes/nationalreviewonline.recipe
share/calibre/recipes/nature.recipe
share/calibre/recipes/nauka_w_polsce.png
share/calibre/recipes/nauka_w_polsce.recipe
share/calibre/recipes/nautilus.recipe
share/calibre/recipes/navalny.png
share/calibre/recipes/navalny.recipe
share/calibre/recipes/navy_times.recipe
@ -5524,6 +5526,7 @@ share/calibre/recipes/rbc_ru.recipe
share/calibre/recipes/rds.png
share/calibre/recipes/rds.recipe
share/calibre/recipes/readers_digest.recipe
share/calibre/recipes/readersdigest_thehealthy.recipe
share/calibre/recipes/readitlater.png
share/calibre/recipes/readitlater.recipe
share/calibre/recipes/real_clear.recipe
@ -5871,6 +5874,7 @@ share/calibre/recipes/theecocolapse.png
share/calibre/recipes/theecocolapse.recipe
share/calibre/recipes/theeconomictimes_india.png
share/calibre/recipes/theeconomictimes_india.recipe
share/calibre/recipes/theeconomictimes_india_print_edition.recipe
share/calibre/recipes/theluminouslandscape.png
share/calibre/recipes/theluminouslandscape.recipe
share/calibre/recipes/themarketticker.png