bump to 6.2.1

3 files changed, 40 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8abddc65cc59..190e970d1eb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = calibre-unicode-path
 	pkgdesc = Ebook management application. With unicode filename and path patch.
-	pkgver = 5.42.0
+	pkgver = 6.2.1
 	pkgrel = 1
 	url = https://calibre-ebook.com
 	arch = x86_64
 	license = GPL3
+	makedepends = cmake
 	makedepends = pyqt-builder
-	makedepends = qt5-x11extras
 	makedepends = rapydscript-ng
 	makedepends = sip
 	makedepends = xdg-utils
@@ -38,19 +38,23 @@ pkgbase = calibre-unicode-path
 	depends = python-mechanize
 	depends = python-msgpack
 	depends = python-netifaces
+	depends = python-pdftotext
 	depends = python-pillow
 	depends = python-psutil
 	depends = python-py7zr
 	depends = python-pychm
+	depends = python-pycryptodome
 	depends = python-pygments
-	depends = python-pyqt5
-	depends = python-pyqtwebengine
+	depends = python-pyqt6
+	depends = python-pyqt6-webengine
 	depends = python-regex
 	depends = python-unrardll
 	depends = python-zeroconf
-	depends = qt5-imageformats
-	depends = qt5-svg
+	depends = qt6-imageformats
+	depends = qt6-svg
+	depends = qt6-webengine
 	depends = ttf-liberation
+	depends = uchardet
 	depends = udisks2
 	optdepends = poppler: required for converting pdf to html
 	optdepends = speech-dispatcher: TTS support in the viewer
@@ -58,11 +62,14 @@ pkgbase = calibre-unicode-path
 	conflicts = calibre
 	conflicts = calibre-common
 	conflicts = calibre-python3
-	source = https://download.calibre-ebook.com/5.42.0/calibre-5.42.0.tar.xz
-	source = https://calibre-ebook.com/signatures/calibre-5.42.0.tar.xz.sig
+	replaces = calibre
+	replaces = calibre-common
+	replaces = calibre-python3
+	source = https://download.calibre-ebook.com/6.2.1/calibre-6.2.1.tar.xz
+	source = https://calibre-ebook.com/signatures/calibre-6.2.1.tar.xz.sig
 	source = 000-fix-unicode-filename.patch
 	validpgpkeys = 3CE1780F78DD88DF45194FD706BC317B515ACE7C
-	sha256sums = a686fd1999775a2932e5a3061af70d41d0eb2a1d7d6e8fa7e6285d4b8e57f958
+	sha256sums = eae23824750360d4486aa6275364dd00926b1f363c50404171fcacefbf8f7476
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/000-fix-unicode-filename.patch b/000-fix-unicode-filename.patch
index 4fc9ec9345a4..04c79fd1414a 100644
--- a/000-fix-unicode-filename.patch
+++ b/000-fix-unicode-filename.patch
@@ -1,5 +1,5 @@
 diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py
-index 71978c8..7bbfae8 100644
+index 4240333..9184319 100644
 --- a/src/calibre/db/backend.py
 +++ b/src/calibre/db/backend.py
 @@ -12,6 +12,7 @@ import glob
@@ -10,27 +10,27 @@ index 71978c8..7bbfae8 100644
  import shutil
  import sys
  import time
-@@ -38,7 +39,7 @@ from calibre.utils import pickle_binary_string, unpickle_binary_string
+@@ -39,7 +40,7 @@ from calibre.utils import pickle_binary_string, unpickle_binary_string
  from calibre.utils.config import from_json, prefs, to_json, tweaks
  from calibre.utils.date import EPOCH, parse_date, utcfromtimestamp, utcnow
  from calibre.utils.filenames import (
 -    WindowsAtomicFolderMove, ascii_filename, atomic_rename, copyfile_using_links,
 +    WindowsAtomicFolderMove, atomic_rename, copyfile_using_links,
-     copytree_using_links, hardlink_file, is_case_sensitive, remove_dir_if_empty,
-     samefile
+     copytree_using_links, hardlink_file, is_case_sensitive, is_fat_filesystem,
+     remove_dir_if_empty, samefile
  )
-@@ -54,6 +55,10 @@ from polyglot.builtins import (
- # }}}
+@@ -60,6 +61,10 @@ CUSTOM_DATA_TYPES = frozenset(('rating', 'text', 'comments', 'datetime',
+ WINDOWS_RESERVED_NAMES = frozenset('CON PRN AUX NUL COM1 COM2 COM3 COM4 COM5 COM6 COM7 COM8 COM9 LPT1 LPT2 LPT3 LPT4 LPT5 LPT6 LPT7 LPT8 LPT9'.split())
  
  
 +def safe_filename(filename):
 +    return re.sub(r"[\/\\\:\*\?\"\<\>\|]", "_", filename)
 +
 +
- class FTSQueryError(ValueError):
+ class DynamicFilter:  # {{{
  
-     def __init__(self, query, sql_statement, apsw_error):
-@@ -1249,8 +1254,8 @@ class DB:
+     'No longer used, present for legacy compatibility'
+@@ -1335,8 +1340,8 @@ class DB:
          '''
          book_id = ' (%d)' % book_id
          l = self.PATH_LIMIT - (len(book_id) // 2) - 2
@@ -41,7 +41,7 @@ index 71978c8..7bbfae8 100644
          if not title:
              title = 'Unknown'[:l]
          try:
-@@ -1259,7 +1264,7 @@ class DB:
+@@ -1345,7 +1350,7 @@ class DB:
          except IndexError:
              author = ''
          if not author:
@@ -50,7 +50,7 @@ index 71978c8..7bbfae8 100644
          if author.upper() in WINDOWS_RESERVED_NAMES:
              author += 'w'
          return f'{author}/{title}{book_id}'
-@@ -1276,15 +1281,15 @@ class DB:
+@@ -1362,15 +1367,15 @@ class DB:
          l = (self.PATH_LIMIT - (extlen // 2) - 2) if iswindows else ((self.PATH_LIMIT - extlen - 2) // 2)
          if l < 5:
              raise ValueError('Extension length too long: %d' % extlen)
diff --git a/PKGBUILD b/PKGBUILD
index eb93383d11f1..00ede5418288 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-unicode-path
-pkgver=5.42.0
+pkgver=6.2.1
 pkgrel=1
 pkgdesc='Ebook management application. With unicode filename and path patch.'
 arch=(x86_64)
@@ -31,13 +31,15 @@ _pydeps=(apsw
          mechanize
          msgpack
          netifaces
+         pdftotext
          pillow
          psutil
          py7zr
          pychm
+         pycryptodome
          pygments
-         pyqt5
-         pyqtwebengine
+         pyqt6
+         pyqt6-webengine
          regex
          unrardll
          zeroconf)
@@ -54,12 +56,14 @@ depends=(hunspell
          optipng
          podofo
          "${_pydeps[@]/#/python-}"
-         qt5-imageformats
-         qt5-svg
+         qt6-imageformats
+         qt6-svg
+         qt6-webengine
          ttf-liberation
+         uchardet
          udisks2)
-makedepends=(pyqt-builder
-             qt5-x11extras
+makedepends=(cmake
+             pyqt-builder
              rapydscript-ng
              sip
              xdg-utils)
@@ -69,12 +73,12 @@ provides=("$_pkgname")
 conflicts=("$_pkgname"
            calibre-common
            calibre-python3)
-replaces=("${replaces[@]}")
+replaces=("${conflicts[@]}")
 _archive="$_pkgname-$pkgver"
 source=("https://download.calibre-ebook.com/$pkgver/$_archive.tar.xz"
         "$url/signatures/$_archive.tar.xz.sig"
         "000-fix-unicode-filename.patch")
-sha256sums=('a686fd1999775a2932e5a3061af70d41d0eb2a1d7d6e8fa7e6285d4b8e57f958'
+sha256sums=('eae23824750360d4486aa6275364dd00926b1f363c50404171fcacefbf8f7476'
             'SKIP'
             'SKIP')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid@kovidgoyal.net>