deskutils/calibre: Update to 6.17.0

Remove upstreamed patch.

5 files changed, 57 insertions, 735 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index e25842500b57..283cd41d738f 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	calibre
-PORTVERSION=	6.16.0
-PORTREVISION=	1
+PORTVERSION=	6.17.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/ \
 		https://curl.haxx.se/ca/:cacert
@@ -82,7 +81,7 @@ USE_GNOME=	glib20
 USE_XORG=	xrender xext x11
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	kovidgoyal:calibre-translations:1610e5c:translations \
+GH_TUPLE=	kovidgoyal:calibre-translations:321c711:translations \
 		LibreOffice:dictionaries:9bb2bfe:hypenation
 
 SHEBANG_GLOB=	*.sh *.py *.recipe
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 8a5cf2cdd792..0dc59c646f92 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1682062820
-SHA256 (calibre/calibre-6.16.0.tar.xz) = d8b869f4f059d7db2fab6e8fa25749d47f2d9adf7933063497bfa0ea63d4bc52
-SIZE (calibre/calibre-6.16.0.tar.xz) = 42952668
+TIMESTAMP = 1682580851
+SHA256 (calibre/calibre-6.17.0.tar.xz) = 1ca4abb8a5d850c1f5963e37080dd1a7795736538d5c4d4ff6014b687d7a368e
+SIZE (calibre/calibre-6.17.0.tar.xz) = 42983760
 SHA256 (calibre/cacert.pem) = fb1ecd641d0a02c01bc9036d513cb658bbda62a75e246bedbc01764560a639f0
 SIZE (calibre/cacert.pem) = 216583
-SHA256 (calibre/kovidgoyal-calibre-translations-1610e5c_GH0.tar.gz) = 79e7b884ee7be72a60e800dbd92c11fdca748e329233d8ecdf878618a504e3a1
-SIZE (calibre/kovidgoyal-calibre-translations-1610e5c_GH0.tar.gz) = 71404513
+SHA256 (calibre/kovidgoyal-calibre-translations-321c711_GH0.tar.gz) = 2e547a4d6fa94d47b63ec538fad7fac8d5c084003e27b602b8de78d6cf392ccb
+SIZE (calibre/kovidgoyal-calibre-translations-321c711_GH0.tar.gz) = 71486525
 SHA256 (calibre/LibreOffice-dictionaries-9bb2bfe_GH0.tar.gz) = 5e83c9f227a7b593eba5d3aa667af382d904b6582eec269fa4631e3f95b1b9e9
 SIZE (calibre/LibreOffice-dictionaries-9bb2bfe_GH0.tar.gz) = 94246875
diff --git a/deskutils/calibre/files/patch-src_calibre_utils_copy__files.py b/deskutils/calibre/files/patch-src_calibre_utils_copy__files.py
deleted file mode 100644
index 141f4736667c..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_utils_copy__files.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/utils/copy_files.py.orig	2023-04-21 02:50:25 UTC
-+++ src/calibre/utils/copy_files.py
-@@ -127,7 +127,7 @@ class WindowsFileCopier:
-             winutil.delete_file(make_long_path_useable(src_path))
- 
- 
--def get_copier() -> Union[UnixFileCopier | WindowsFileCopier]:
-+def get_copier() -> Union[UnixFileCopier, WindowsFileCopier]:
-     return WindowsFileCopier() if iswindows else UnixFileCopier()
- 
- 
diff --git a/deskutils/calibre/files/user-agent-data.json b/deskutils/calibre/files/user-agent-data.json
index 5974f8476113..d40a6bde1377 100644
--- a/deskutils/calibre/files/user-agent-data.json
+++ b/deskutils/calibre/files/user-agent-data.json
@@ -1,556 +1,4 @@
 {
-  "chrome_versions": [
-    {
-      "chrome_version": "112.0.5615",
-      "date": "2023-04-04",
-      "webkit_version": "112"
-    },
-    {
-      "chrome_version": "111.0.5563",
-      "date": "2023-03-07",
-      "webkit_version": "111"
-    },
-    {
-      "chrome_version": "110.0.5481",
-      "date": "2023-02-07",
-      "webkit_version": "110"
-    },
-    {
-      "chrome_version": "109.0.5414",
-      "date": "2023-01-10",
-      "webkit_version": "109"
-    },
-    {
-      "chrome_version": "108.0.5359",
-      "date": "2022-11-29",
-      "webkit_version": "108"
-    },
-    {
-      "chrome_version": "107.0.5304",
-      "date": "2022-10-24",
-      "webkit_version": "107"
-    },
-    {
-      "chrome_version": "106.0.5249",
-      "date": "2022-09-27",
-      "webkit_version": "106"
-    },
-    {
-      "chrome_version": "105.0.5195",
-      "date": "2022-08-30",
-      "webkit_version": "105"
-    },
-    {
-      "chrome_version": "104.0.5112",
-      "date": "2022-08-02",
-      "webkit_version": "104"
-    },
-    {
-      "chrome_version": "103.0.5060",
-      "date": "2022-06-21",
-      "webkit_version": "103"
-    },
-    {
-      "chrome_version": "102.0.5005",
-      "date": "2022-05-24",
-      "webkit_version": "102"
-    },
-    {
-      "chrome_version": "101.0.4951",
-      "date": "2022-04-26",
-      "webkit_version": "101"
-    },
-    {
-      "chrome_version": "100.0.4896",
-      "date": "2022-03-29",
-      "webkit_version": "100"
-    },
-    {
-      "chrome_version": "99.0.4844",
-      "date": "2022-03-01",
-      "webkit_version": "99"
-    },
-    {
-      "chrome_version": "98.0.4758",
-      "date": "2022-02-01",
-      "webkit_version": "98"
-    },
-    {
-      "chrome_version": "97.0.4692",
-      "date": "2022-01-04",
-      "webkit_version": "97"
-    },
-    {
-      "chrome_version": "96.0.4664",
-      "date": "2021-11-09",
-      "webkit_version": "96"
-    },
-    {
-      "chrome_version": "95.0.4638",
-      "date": "2021-10-19",
-      "webkit_version": "95"
-    },
-    {
-      "chrome_version": "94.0.4606",
-      "date": "2021-09-21",
-      "webkit_version": "94"
-    },
-    {
-      "chrome_version": "93.0.4577",
-      "date": "2021-08-31",
-      "webkit_version": "93"
-    },
-    {
-      "chrome_version": "92.0.4515",
-      "date": "2021-07-20",
-      "webkit_version": "92"
-    },
-    {
-      "chrome_version": "91.0.4472",
-      "date": "2021-05-25",
-      "webkit_version": "91"
-    },
-    {
-      "chrome_version": "90.0.4430",
-      "date": "2021-04-13",
-      "webkit_version": "90"
-    },
-    {
-      "chrome_version": "89.0.4389",
-      "date": "2021-03-02",
-      "webkit_version": "89"
-    },
-    {
-      "chrome_version": "88.0.4324",
-      "date": "2021-01-19",
-      "webkit_version": "88"
-    },
-    {
-      "chrome_version": "87.0.4280",
-      "date": "2020-11-17",
-      "webkit_version": "87"
-    },
-    {
-      "chrome_version": "86.0.4240",
-      "date": "2020-09-30",
-      "webkit_version": "86"
-    },
-    {
-      "chrome_version": "85.0.4183",
-      "date": "2020-08-25",
-      "webkit_version": "85"
-    },
-    {
-      "chrome_version": "84.0.4147",
-      "date": "2020-07-14",
-      "webkit_version": "84"
-    },
-    {
-      "chrome_version": "83.0.4103",
-      "date": "2020-05-19",
-      "webkit_version": "83"
-    },
-    {
-      "chrome_version": "81.0.4044",
-      "date": "2020-04-07",
-      "webkit_version": "81"
-    },
-    {
-      "chrome_version": "80.0.3987",
-      "date": "2020-02-04",
-      "webkit_version": "80"
-    },
-    {
-      "chrome_version": "79.0.3945",
-      "date": "2019-12-10",
-      "webkit_version": "79"
-    },
-    {
-      "chrome_version": "78.0.3904",
-      "date": "2019-10-22",
-      "webkit_version": "78"
-    },
-    {
-      "chrome_version": "77.0.3865",
-      "date": "2019-09-10",
-      "webkit_version": "77"
-    },
-    {
-      "chrome_version": "76.0.3809",
-      "date": "2019-07-30",
-      "webkit_version": "76"
-    },
-    {
-      "chrome_version": "75.0.3770",
-      "date": "2019-06-04",
-      "webkit_version": "75"
-    },
-    {
-      "chrome_version": "74.0.3729",
-      "date": "2019-04-23",
-      "webkit_version": "74"
-    },
-    {
-      "chrome_version": "73.0.3683",
-      "date": "2019-03-12",
-      "webkit_version": "73"
-    },
-    {
-      "chrome_version": "72.0.3626",
-      "date": "2019-01-29",
-      "webkit_version": "72"
-    },
-    {
-      "chrome_version": "71.0.3578",
-      "date": "2018-12-04",
-      "webkit_version": "71"
-    },
-    {
-      "chrome_version": "70.0.3538",
-      "date": "2018-10-16",
-      "webkit_version": "70"
-    },
-    {
-      "chrome_version": "69.0.3497",
-      "date": "2018-09-04",
-      "webkit_version": "69"
-    },
-    {
-      "chrome_version": "68.0.3440",
-      "date": "2018-07-24",
-      "webkit_version": "68"
-    },
-    {
-      "chrome_version": "67.0.3396",
-      "date": "2018-05-29",
-      "webkit_version": "67"
-    },
-    {
-      "chrome_version": "66.0.3359",
-      "date": "2018-04-17",
-      "webkit_version": "66"
-    },
-    {
-      "chrome_version": "65.0.3325",
-      "date": "2018-03-06",
-      "webkit_version": "65"
-    },
-    {
-      "chrome_version": "64.0.3282",
-      "date": "2018-01-23",
-      "webkit_version": "64"
-    },
-    {
-      "chrome_version": "63.0.3239",
-      "date": "2017-12-05",
-      "webkit_version": "63"
-    },
-    {
-      "chrome_version": "62.0.3202",
-      "date": "2017-10-17",
-      "webkit_version": "62"
-    },
-    {
-      "chrome_version": "61.0.3163",
-      "date": "2017-09-05",
-      "webkit_version": "61"
-    },
-    {
-      "chrome_version": "60.0.3112",
-      "date": "2017-07-25",
-      "webkit_version": "60"
-    },
-    {
-      "chrome_version": "59.0.3071",
-      "date": "2017-06-05",
-      "webkit_version": "59"
-    },
-    {
-      "chrome_version": "58.0.3029",
-      "date": "2017-04-19",
-      "webkit_version": "58"
-    },
-    {
-      "chrome_version": "57.0.2987",
-      "date": "2017-03-09",
-      "webkit_version": "57"
-    },
-    {
-      "chrome_version": "56.0.2924",
-      "date": "2017-01-25",
-      "webkit_version": "56"
-    },
-    {
-      "chrome_version": "55.0.2883",
-      "date": "2016-12-01",
-      "webkit_version": "55"
-    },
-    {
-      "chrome_version": "54.0.2840",
-      "date": "2016-10-12",
-      "webkit_version": "54"
-    },
-    {
-      "chrome_version": "53.0.2785",
-      "date": "2016-08-31",
-      "webkit_version": "53"
-    },
-    {
-      "chrome_version": "52.0.2743",
-      "date": "2016-07-20",
-      "webkit_version": "52"
-    },
-    {
-      "chrome_version": "51.0.2704",
-      "date": "2016-05-25",
-      "webkit_version": "51"
-    },
-    {
-      "chrome_version": "50.0.2661",
-      "date": "2016-04-13",
-      "webkit_version": "50"
-    },
-    {
-      "chrome_version": "49.0.2623",
-      "date": "2016-03-02",
-      "webkit_version": "49"
-    },
-    {
-      "chrome_version": "48.0.2564",
-      "date": "2016-01-20",
-      "webkit_version": "48"
-    },
-    {
-      "chrome_version": "47.0.2526",
-      "date": "2015-12-01",
-      "webkit_version": "47"
-    },
-    {
-      "chrome_version": "46.0.2490",
-      "date": "2015-10-13",
-      "webkit_version": "46"
-    },
-    {
-      "chrome_version": "45.0.2454",
-      "date": "2015-09-01",
-      "webkit_version": "45"
-    },
-    {
-      "chrome_version": "44.0.2403",
-      "date": "2015-07-21",
-      "webkit_version": "44"
-    },
-    {
-      "chrome_version": "43.0.2357",
-      "date": "2015-05-19",
-      "webkit_version": "43"
-    },
-    {
-      "chrome_version": "42.0.2311",
-      "date": "2015-04-14",
-      "webkit_version": "42"
-    },
-    {
-      "chrome_version": "41.0.2272",
-      "date": "2015-03-03",
-      "webkit_version": "41"
-    },
-    {
-      "chrome_version": "40.0.2214",
-      "date": "2015-01-20",
-      "webkit_version": "40"
-    },
-    {
-      "chrome_version": "39.0.2171",
-      "date": "2014-11-12",
-      "webkit_version": "39"
-    },
-    {
-      "chrome_version": "38.0.2125",
-      "date": "2014-10-07",
-      "webkit_version": "38"
-    },
-    {
-      "chrome_version": "37.0.2062",
-      "date": "2014-08-26",
-      "webkit_version": "37"
-    },
-    {
-      "chrome_version": "36.0.1985",
-      "date": "2014-07-15",
-      "webkit_version": "36"
-    },
-    {
-      "chrome_version": "35.0.1916",
-      "date": "2014-05-20",
-      "webkit_version": "35"
-    },
-    {
-      "chrome_version": "34.0.1847",
-      "date": "2014-04-02",
-      "webkit_version": "34"
-    },
-    {
-      "chrome_version": "33.0.1750",
-      "date": "2014-02-18",
-      "webkit_version": "33"
-    },
-    {
-      "chrome_version": "32.0.1700",
-      "date": "2014-01-14",
-      "webkit_version": "32"
-    },
-    {
-      "chrome_version": "31.0.1650",
-      "date": "2013-11-12",
-      "webkit_version": "31"
-    },
-    {
-      "chrome_version": "30.0.1599",
-      "date": "2013-09-18",
-      "webkit_version": "30"
-    },
-    {
-      "chrome_version": "29.0.1547",
-      "date": "2013-08-20",
-      "webkit_version": "29"
-    },
-    {
-      "chrome_version": "27.0.1453",
-      "date": "2013-05-21",
-      "webkit_version": "537.36"
-    },
-    {
-      "chrome_version": "26.0.1410",
-      "date": "2013-03-26",
-      "webkit_version": "537.31"
-    },
-    {
-      "chrome_version": "25.0.1364",
-      "date": "2013-02-21",
-      "webkit_version": "537.22"
-    },
-    {
-      "chrome_version": "24.0.1312",
-      "date": "2013-01-10",
-      "webkit_version": "537.17"
-    },
-    {
-      "chrome_version": "23.0.1271",
-      "date": "2012-11-06",
-      "webkit_version": "537.11"
-    },
-    {
-      "chrome_version": "22.0.1229",
-      "date": "2012-09-25",
-      "webkit_version": "537.4"
-    },
-    {
-      "chrome_version": "21.0.1180",
-      "date": "2012-07-31",
-      "webkit_version": "537.1"
-    },
-    {
-      "chrome_version": "20.0.1132",
-      "date": "2012-06-26",
-      "webkit_version": "536.10"
-    },
-    {
-      "chrome_version": "19.0.1084",
-      "date": "2012-05-15",
-      "webkit_version": "536.5"
-    },
-    {
-      "chrome_version": "18.0.1025",
-      "date": "2012-03-28",
-      "webkit_version": "535.19"
-    },
-    {
-      "chrome_version": "17.0.963",
-      "date": "2012-02-08",
-      "webkit_version": "535.11"
-    },
-    {
-      "chrome_version": "16.0.912",
-      "date": "2011-12-13",
-      "webkit_version": "535.7"
-    },
-    {
-      "chrome_version": "15.0.874",
-      "date": "2011-10-25",
-      "webkit_version": "535.2"
-    },
-    {
-      "chrome_version": "13.0.782",
-      "date": "2011-08-02",
-      "webkit_version": "535.1"
-    },
-    {
-      "chrome_version": "12.0.742",
-      "date": "2011-06-07",
-      "webkit_version": "534.30"
-    },
-    {
-      "chrome_version": "11.0.696",
-      "date": "2011-04-27",
-      "webkit_version": "534.24"
-    },
-    {
-      "chrome_version": "10.0.648",
-      "date": "2011-03-08",
-      "webkit_version": "534.16"
-    },
-    {
-      "chrome_version": "9.0.597",
-      "date": "2011-02-03",
-      "webkit_version": "534.13"
-    },
-    {
-      "chrome_version": "8.0.552",
-      "date": "2010-12-02",
-      "webkit_version": "534.10"
-    },
-    {
-      "chrome_version": "7.0.517",
-      "date": "2010-10-21",
-      "webkit_version": "534.7"
-    },
-    {
-      "chrome_version": "6.0.472",
-      "date": "2010-09-02",
-      "webkit_version": "534.3"
-    },
-    {
-      "chrome_version": "5.0.375",
-      "date": "2010-05-21",
-      "webkit_version": "533"
-    },
-    {
-      "chrome_version": "4.0.249",
-      "date": "2010-01-25",
-      "webkit_version": "532.5"
-    },
-    {
-      "chrome_version": "3.0.195",
-      "date": "2009-10-12",
-      "webkit_version": "532"
-    },
-    {
-      "chrome_version": "2.0.172",
-      "date": "2009-05-24",
-      "webkit_version": "530"
-    },
-    {
-      "chrome_version": "1.0.154",
-      "date": "2008-12-11",
-      "webkit_version": "528"
-    },
-    {
-      "chrome_version": "0.4.154",
-      "date": "2008-11-24",
-      "webkit_version": "525"
-    }
-  ],
   "common_user_agents": [
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36",
     "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko",
@@ -603,181 +51,62 @@
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0"
   ],
   "desktop_platforms": [
-    "Linux; Android",
+    "Windows NT 10.0",
     "Windows NT 6.1; WOW64",
     "Windows NT 10.0; Win64; x64",
-    "Windows NT 10.0",
+    "Linux; Android",
     "Windows NT 10.0; WOW64"
   ],
-  "firefox_versions": [
-    "112.0",
-    "111.0",
-    "110.0",
-    "109.0",
-    "108.0",
-    "107.0",
-    "106.0",
-    "105.0",
-    "104.0",
-    "103.0",
-    "102.0",
-    "101.0",
-    "100.0",
-    "99.0",
-    "98.0",
-    "97.0",
-    "96.0",
-    "95.0",
-    "94.0",
-    "93.0",
-    "92.0",
-    "91.0",
-    "90.0",
-    "89.0",
-    "88.0",
-    "87.0",
-    "86.0",
-    "85.0",
-    "84.0",
-    "83.0",
-    "82.0",
-    "81.0",
-    "80.0",
-    "79.0",
-    "78.0",
-    "77.0",
-    "76.0",
-    "75.0",
-    "74.0",
-    "73.0",
-    "72.0",
-    "71.0",
-    "70.0",
-    "69.0",
-    "68.0",
-    "67.0",
-    "66.0",
-    "65.0",
-    "64.0",
-    "63.0",
-    "62.0",
-    "61.0",
-    "60.0",
-    "59.0",
-    "58.0",
-    "57.0",
-    "56.0",
-    "55.0",
-    "54.0",
-    "53.0",
-    "52.0",
-    "51.0",
-    "50.0",
-    "49.0",
-    "48.0",
-    "47.0",
-    "46.0",
-    "45.0",
-    "44.0",
-    "43.0",
-    "42.0",
-    "41.0",
-    "40.0",
-    "39.0",
-    "38.0",
-    "37.0",
-    "36.0",
-    "35.0",
-    "34.0",
-    "33.1",
-    "33.0",
-    "32.0",
-    "31.0",
-    "30.0",
-    "29.0",
-    "28.0",
-    "27.0",
-    "26.0",
-    "25.0",
-    "24.0",
-    "23.0",
-    "22.0",
-    "21.0",
-    "20.0",
-    "19.0",
-    "18.0",
-    "17.0",
-    "16.0",
-    "15.0",
-    "14.0.1",
-    "13.0",
-    "12.0",
-    "11.0",
-    "10.0",
-    "9.0",
-    "8.0",
-    "7.0",
-    "6.0",
-    "5.0",
-    "4.0",
-    "3.6",
-    "3.5",
-    "3.0",
-    "2.0",
-    "1.5",
-    "1.0",
-    "0.1"
-  ],
-  "timestamp": "2023-04-21T07:40:47.586341+00:00",
+  "timestamp": "2023-04-27T07:42:14.990199+00:00",
   "user_agents_popularity": {
-    "Mozilla/5.0 (Linux; Android) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36": 14843,
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15": 38690,
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.1 Safari/605.1.15": 14645,
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15": 65460,
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Safari/605.1.15": 139666,
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15": 19519,
-    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36": 16304,
-    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 101341,
-    "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko": 2938732,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36": 253917,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36": 118870,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54": 97109,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36": 146702,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36": 23273,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36": 77897,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36": 4176613,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 14276,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36": 248877,
+    "Mozilla/5.0 (Linux; Android) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36": 14920,
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15": 38786,
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.1 Safari/605.1.15": 14650,
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15": 65468,
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Safari/605.1.15": 139706,
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15": 19520,
+    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36": 16316,
+    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 101708,
+    "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko": 2956018,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36": 254091,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36": 119103,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54": 97163,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36": 148330,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36": 23275,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36": 78107,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36": 4198989,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 14293,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36": 248879,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36 Edg/87.0.664.75": 73765,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36": 218794,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36": 218801,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66": 74747,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.104 Safari/537.36": 104064,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36": 38457,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36": 123115,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36": 38459,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36": 123116,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36 Edg/88.0.705.68": 24593,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36": 71891,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.190 Safari/537.36": 153610,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36": 71893,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.190 Safari/537.36": 153612,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36 Edg/88.0.705.50": 26554,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36 Edg/88.0.705.56": 25708,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36": 102501,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36": 78722,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36": 46965,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36": 153006,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36": 162754,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36": 154710,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36": 136611,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36": 108734,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36": 74677,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36": 102504,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36": 78725,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36": 46966,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36": 153060,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36": 162759,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36": 154713,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36": 136613,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36": 108739,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36": 74685,
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36 Edg/95.0.1020.30": 48671,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0": 64283,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0": 23005,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0": 13715,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0": 224673,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0": 156852,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) Gecko/20100101 Firefox/86.0": 165859,
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0": 55711,
-    "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0": 38890,
-    "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36": 59358,
-    "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko": 16437
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0": 64894,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0": 23022,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0": 13802,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0": 224677,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0": 156853,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) Gecko/20100101 Firefox/86.0": 165862,
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0": 55713,
+    "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0": 38902,
+    "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36": 61201,
+    "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko": 16483
   }
 }
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 086e41acff23..fbf8a8124b28 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -61,6 +61,7 @@ lib/calibre/calibre/db/cli/cmd_show_metadata.py
 lib/calibre/calibre/db/cli/main.py
 lib/calibre/calibre/db/cli/tests.py
 lib/calibre/calibre/db/cli/utils.py
+lib/calibre/calibre/db/constants.py
 lib/calibre/calibre/db/copy_to_library.py
 lib/calibre/calibre/db/covers.py
 lib/calibre/calibre/db/errors.py
@@ -854,6 +855,7 @@ lib/calibre/calibre/gui2/dialogs/trim_image.py
 lib/calibre/calibre/gui2/dnd.py
 lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
+lib/calibre/calibre/gui2/extra_files_watcher.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
 lib/calibre/calibre/gui2/flow_toolbar.py
 lib/calibre/calibre/gui2/font_family_chooser.py
@@ -892,6 +894,8 @@ lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
 lib/calibre/calibre/gui2/lrf_renderer/text.py
 lib/calibre/calibre/gui2/main.py
 lib/calibre/calibre/gui2/main_window.py
+lib/calibre/calibre/gui2/markdown_editor.py
+lib/calibre/calibre/gui2/markdown_syntax_highlighter.py
 lib/calibre/calibre/gui2/metadata/__init__.py
 lib/calibre/calibre/gui2/metadata/basic_widgets.py
 lib/calibre/calibre/gui2/metadata/bulk_download.py
@@ -1311,6 +1315,7 @@ lib/calibre/calibre/utils/fonts/sfnt/maxp.py
 lib/calibre/calibre/utils/fonts/sfnt/merge.py
 lib/calibre/calibre/utils/fonts/sfnt/metrics.py
 lib/calibre/calibre/utils/fonts/sfnt/subset.py
+lib/calibre/calibre/utils/fonts/subset.py
 lib/calibre/calibre/utils/fonts/utils.py
 lib/calibre/calibre/utils/fonts/win_fonts.py
 lib/calibre/calibre/utils/formatter.py