Calibre 5.32.0 (#6421)

* Depends on pyqtwebengine

app-text/calibre/calibre-5.32.0.recipe

@@ -7,9 +7,9 @@ convenient reading. It is cross platform, running on Linux, Windows and macOS."
 HOMEPAGE="https://calibre-ebook.com/"
 COPYRIGHT="2008-2019 Kovid Goyal"
 LICENSE="GNU GPL v3"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="https://download.calibre-ebook.com/$portVersion/calibre-$portVersion.tar.xz"
-CHECKSUM_SHA256="699392c018e834b63c9cc8bd022e2ccc4c49f4d31bf6acbc08bcbeed5bc7f6a2"
+CHECKSUM_SHA256="3571efc1cc773e453b459096a38b141fd0c7784fb9611505a1f9a55648f47e5e"
 PATCHES="calibre-$portVersion.patchset"
 ADDITIONAL_FILES="calibre.rdef.in"
 
@@ -74,6 +74,7 @@ REQUIRES="
 	pycrypto_python38
 	pygments_python38
 	pyqt5_python38
+	pyqtwebengine5_python38
 	regex_python38
 	setuptools_python38
 	six_python38
@@ -105,8 +106,9 @@ REQUIRES="
 	lib:libpoppler${secondaryArchSuffix}_qt5
 	lib:libpoppler$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5WebKit$secondaryArchSuffix
+	lib:libQt5WebEngine$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
+	lib:libstemmer$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
@@ -175,8 +177,9 @@ BUILD_REQUIRES="
 	devel:libpoppler${secondaryArchSuffix}_qt5
 	devel:libpoppler$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5WebKit$secondaryArchSuffix
+	devel:libQt5WebEngine$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
+	devel:libstemmer$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix

app-text/calibre/patches/calibre-5.10.1.patchset

@@ -1,59 +0,0 @@
-From 39280bc4c3fa235564195b28a2373297438b14a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Thu, 11 Apr 2019 09:38:10 +0200
-Subject: Crash workaround: disabling splashscreen, FIXME
-
-
-diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
-index 776f8be..393cfe3 100644
---- a/src/calibre/gui2/main.py
-+++ b/src/calibre/gui2/main.py
-@@ -345,7 +345,9 @@ class GuiRunner(QObject):
-     def show_splash_screen(self):
-         self.timed_print('Showing splash screen...')
-         self.splash_screen = SplashScreen()
--        self.splash_screen.show()
-+        # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
-+        # self.splash_screen.show()
-+        # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
-         self.splash_screen.show_message(_('Starting %s: Loading books...') % __appname__)
-         self.timed_print('splash screen shown')
- 
--- 
-2.30.0
-
-
-From e542655d8a337fbab8c732af7e0fb0d64fca18db Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sun, 24 Jan 2021 17:31:18 +0100
-Subject: Haiku build
-
-
-diff --git a/setup/build.py b/setup/build.py
-index 44dad2a..fe4679d 100644
---- a/setup/build.py
-+++ b/setup/build.py
-@@ -487,6 +487,7 @@ project-factory = "pyqtbuild:PyQtProject"
- 
- [tool.sip.project]
- sip-files-dir = "."
-+sip-include-dirs = ['{os.environ.get("BINDINGS_DIR")}']
- 
- [tool.sip.bindings.pictureflow]
- headers = {ext.headers}
-diff --git a/setup/translations.py b/setup/translations.py
-index b51b405..00c162a 100644
---- a/setup/translations.py
-+++ b/setup/translations.py
-@@ -159,7 +159,7 @@ class POT(Command):  # {{{
-                             f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
-                             break
-                     else:
--                        raise SystemExit(f'Failed to add file_filter for {slug=} to config file')
-+                        raise SystemExit(f'Failed to add file_filter for {slug} to config file')
-                 self.git('add .tx/config')
-             self.upload_pot(resource=slug)
-             self.git(['add', dest])
--- 
-2.30.0
-

app-text/calibre/patches/calibre-5.32.0.patchset

@@ -0,0 +1,46 @@
+From 786b1a9e995df5c6eae89076a35992897d83a52a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 21 Nov 2021 03:36:09 +0100
+Subject: Crash workaround: disabling splashscreen, FIXME
+
+
+diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
+index 45feca9..e5555b2 100644
+--- a/src/calibre/gui2/main.py
++++ b/src/calibre/gui2/main.py
+@@ -360,7 +360,9 @@ class GuiRunner(QObject):
+     def show_splash_screen(self):
+         self.timed_print('Showing splash screen...')
+         self.splash_screen = SplashScreen()
+-        self.splash_screen.show()
++        # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
++        # self.splash_screen.show()
++        # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
+         self.splash_screen.show_message(_('Starting %s: Loading books...') % __appname__)
+         self.timed_print('splash screen shown')
+ 
+-- 
+2.30.2
+
+
+From 3c0c35edda1ef7ca88587aec627ec8c8f512bb46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 21 Nov 2021 03:38:28 +0100
+Subject: Haiku build
+
+
+diff --git a/setup/build.py b/setup/build.py
+index 3a5d95b..ad3b879 100644
+--- a/setup/build.py
++++ b/setup/build.py
+@@ -524,6 +524,7 @@ project-factory = "pyqtbuild:PyQtProject"
+ 
+ [tool.sip.project]
+ sip-files-dir = "."
++sip-include-dirs = ['{os.environ.get("BINDINGS_DIR")}']
+ {abi_version}
+ 
+ [tool.sip.bindings.pictureflow]
+-- 
+2.30.2
+