From nobody Sat Nov 18 15:18:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SXcq35rWBz51F9f; Sat, 18 Nov 2023 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SXcq35Xg1z3HFX; Sat, 18 Nov 2023 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700320703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFNvvbnLMyQ9rJkSoId2nAYsU4OmpfXKM5B/RKYfEf4=; b=hONvtc3xey3y+erwYw33xZ7MFU3IdpY4A8kYNqcz78hbmLyEYGQMAgq0kJBRr15hlnrN4B fONNBTU5VY0L5FyW+lr41VLLfnDy05vo408OHMTBwicgWJs/NJtSKT6Fx11+k+RlYSUysg 2oBbiS2svcQScj2QAu386Pl2am59K5MsMInSA71otm1dITP044T1gspZFKspDiclYOjw1N 81yCvDLqd3mUBDHlj14607NkDAz2nZu5JPhyK/jeX8CAxJkNWTPL3nQuECyjaoc0Ipw2Q8 STLSdu09jeOyNj/ifS/RJFonV+mMup+2V1TR3+D8qWdymah8bcFVeIfwj0fZKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700320703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFNvvbnLMyQ9rJkSoId2nAYsU4OmpfXKM5B/RKYfEf4=; b=yq6f7EZlndl9jiczKP+B26rCiMH3zjzGCma1KiZXD/0nWyIqRhrPzYV/olF9sty7gvzSum 6YKv8/ogXTh7NAb8cy605a2H4fcnYQSuwNekYfH3gcASgnc2Q+7Zd8OMZ6r/8qfecCg4AQ 8DldH1XzkORavXPL3aMyYwj7v3mjShRrDjyW/Sv7lVI1Il+H9higWy35o1IVPKFJDQzoGv F42Z4bi+66mJF28LTu60yGdFnQV4erhnbY3vXoI/Y6eg7PNmUuduN2J+kmYDOsnCR2QhiJ 0XMKxEiyTh6yiJyjCeAljoe4z5MjOm5UusYj8KnNqNVkLTSD3iU4wlQJObiN+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700320703; a=rsa-sha256; cv=none; b=IETsS620bOR3hAH4KN8KAJzF+h4sV6cJ/yHyW7UBZiBodRcO0qphwDF3/1WAekKeTCFRNu /X11qjaIZ0Ww1tJLmn3Wv7bKlSgFcC4+HHyM+Jco4gNXX6hRIirzdRlinj+BSH1RB1YfvS olcE+UAW7du8bRSKjdWcMB8zE3kjjL0t2H+SIdqimnC2Zezk8G4eKGjLhrd0nGdLktvGyE dAMODZiPYWL6rboVy3K+wxzVuJgcOAm3fMTGIjVBcqK6sPo6X/6QdOLImLKMIJmInG1e1V Fjudh1s2PbsE/iwun7fXgiWuiCC0HwaF8Lq6rfOzSMnxsHL4FqFzbi5LbvKxfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SXcq347mWzXRk; Sat, 18 Nov 2023 15:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AIFINws098858; Sat, 18 Nov 2023 15:18:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIFINLX098855; Sat, 18 Nov 2023 15:18:23 GMT (envelope-from git) Date: Sat, 18 Nov 2023 15:18:23 GMT Message-Id: <202311181518.3AIFINLX098855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 24707c92fd8b - main - deskutils/calibre: Update to 7.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24707c92fd8b63030be3fe4895e11fbff9651bac Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=24707c92fd8b63030be3fe4895e11fbff9651bac commit 24707c92fd8b63030be3fe4895e11fbff9651bac Author: Guido Falsi AuthorDate: 2023-11-18 15:17:40 +0000 Commit: Guido Falsi CommitDate: 2023-11-18 15:17:40 +0000 deskutils/calibre: Update to 7.0.0 - Add dependencies, and bump some minimum requirements - Improve pkg-message information about the server functionality and the included rc script [1] PR: 275102 [1] --- deskutils/calibre/Makefile | 19 +++-- deskutils/calibre/distinfo | 14 ++-- .../calibre/files/patch-src_calibre_db_cache.py | 11 +++ .../files/patch-src_calibre_db_notes_exim.py | 11 +++ deskutils/calibre/files/user-agent-data.json | 96 +++++++++++----------- deskutils/calibre/pkg-message | 7 +- deskutils/calibre/pkg-plist | 14 +++- 7 files changed, 105 insertions(+), 67 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 48503e969a5d..886c86aa64ff 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,6 +1,5 @@ PORTNAME= calibre -PORTVERSION= 6.29.0 -PORTREVISION= 1 +PORTVERSION= 7.0.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -27,6 +26,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xxhash>3.3.0:devel/py-xxhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \ MathJax3>0:www/mathjax3 @@ -42,23 +42,24 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=0:textproc/py-charset-normalizer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.11:www/py-html5-parser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jeepney>=0.8:devel/py-jeepney@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=10.0.1:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xxhash>=3.3.0:devel/py-xxhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \ MathJax3>0:www/mathjax3 \ @@ -75,8 +76,8 @@ USE_RC_SUBR= calibre USE_XORG= x11 xext xrender USE_GITHUB= nodefault -GH_TUPLE= kovidgoyal:calibre-translations:24a7001:translations \ - LibreOffice:dictionaries:f4dcf9e:hypenation +GH_TUPLE= kovidgoyal:calibre-translations:79f0906:translations \ + LibreOffice:dictionaries:3b7e1d2:hypenation SHEBANG_GLOB= *.py *.recipe *.sh python_OLD_CMD= "/usr/bin/env python" ${LOCALBASE}/bin/python3 diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 92e20cfd155e..76681e3a84f2 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1697787196 -SHA256 (calibre/calibre-6.29.0.tar.xz) = c3d9af30a9bbeb0e6c0df5b4398c6166e84839829d507deda621a5a4a342da43 -SIZE (calibre/calibre-6.29.0.tar.xz) = 41487064 -SHA256 (calibre/kovidgoyal-calibre-translations-24a7001_GH0.tar.gz) = bdcdee3cd9b42e0cfe8b962a9769dc942db0ebad2f8ef7ec2a50f955112036d2 -SIZE (calibre/kovidgoyal-calibre-translations-24a7001_GH0.tar.gz) = 72113498 -SHA256 (calibre/LibreOffice-dictionaries-f4dcf9e_GH0.tar.gz) = 350969b650906369518151e6e0f2604778eb56241b1f64b816523899871f942c -SIZE (calibre/LibreOffice-dictionaries-f4dcf9e_GH0.tar.gz) = 94697826 +TIMESTAMP = 1700209282 +SHA256 (calibre/calibre-7.0.0.tar.xz) = 5409f369ccfff0b60254c0a31d7a9de01f8d5059a232a77142aa726a9f9430d7 +SIZE (calibre/calibre-7.0.0.tar.xz) = 41889020 +SHA256 (calibre/kovidgoyal-calibre-translations-79f0906_GH0.tar.gz) = d0a58195d0b73dc6c9c38539cd82551cadc6c40ee63b6ef1ebdcf73593f8af23 +SIZE (calibre/kovidgoyal-calibre-translations-79f0906_GH0.tar.gz) = 72143348 +SHA256 (calibre/LibreOffice-dictionaries-3b7e1d2_GH0.tar.gz) = 9e67c8e5ee00e30b140bc8ec93a5624e02444b9488b676097e79d88cb2077576 +SIZE (calibre/LibreOffice-dictionaries-3b7e1d2_GH0.tar.gz) = 94631835 diff --git a/deskutils/calibre/files/patch-src_calibre_db_cache.py b/deskutils/calibre/files/patch-src_calibre_db_cache.py new file mode 100644 index 000000000000..fc499931f82e --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_db_cache.py @@ -0,0 +1,11 @@ +--- src/calibre/db/cache.py.orig 2023-11-17 06:02:05 UTC ++++ src/calibre/db/cache.py +@@ -687,7 +687,7 @@ class Cache: + return self.backend.notes_data_for(field, item_id) + + @read_api +- def get_all_items_that_have_notes(self, field_name=None) -> set[int] | dict[str, set[int]]: ++ def get_all_items_that_have_notes(self, field_name=None) -> "set[int] | dict[str, set[int]]": + ' Return all item_ids for items that have notes in the specified field or all fields if field_name is None ' + return self.backend.get_all_items_that_have_notes(field_name) + diff --git a/deskutils/calibre/files/patch-src_calibre_db_notes_exim.py b/deskutils/calibre/files/patch-src_calibre_db_notes_exim.py new file mode 100644 index 000000000000..5df66446d3d3 --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_db_notes_exim.py @@ -0,0 +1,11 @@ +--- src/calibre/db/notes/exim.py.orig 2023-11-17 06:02:05 UTC ++++ src/calibre/db/notes/exim.py +@@ -41,7 +41,7 @@ def export_note(note_doc: str, get_resource) -> str: + return html.tostring(root, encoding='unicode') + + +-def import_note(shtml: str | bytes, basedir: str, add_resource) -> tuple[str, str, set[str]]: ++def import_note(shtml: "str | bytes", basedir: str, add_resource) -> tuple[str, str, set[str]]: + shtml = xml_to_unicode(shtml, strip_encoding_pats=True, assume_utf8=True)[0] + basedir = os.path.normcase(get_long_path_name(os.path.abspath(basedir)) + os.sep) + root = parse_html(shtml) diff --git a/deskutils/calibre/files/user-agent-data.json b/deskutils/calibre/files/user-agent-data.json index 4f12a5dd7395..71c359e48edd 100644 --- a/deskutils/calibre/files/user-agent-data.json +++ b/deskutils/calibre/files/user-agent-data.json @@ -24,8 +24,8 @@ "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", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0", "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", "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", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36", @@ -51,62 +51,62 @@ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36" ], "desktop_platforms": [ - "Windows NT 10.0; Win64; x64", - "Windows NT 6.1; WOW64", + "Windows NT 10.0", "Windows NT 10.0; WOW64", "Linux; Android", - "Windows NT 10.0" + "Windows NT 6.1; WOW64", + "Windows NT 10.0; Win64; x64" ], - "timestamp": "2023-10-20T07:34:25.088942+00:00", + "timestamp": "2023-11-17T08:22:05.900742+00:00", "user_agents_popularity": { - "Mozilla/5.0 (Linux; Android) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36": 18470, - "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": 41674, - "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": 14916, - "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": 65723, - "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": 142438, - "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": 19557, - "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36": 16720, - "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 107179, - "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko": 3615142, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36": 256720, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36": 121831, - "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": 97792, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36": 190470, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36": 23464, + "Mozilla/5.0 (Linux; Android) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36": 18986, + "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": 42032, + "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": 14937, + "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": 65746, + "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": 142520, + "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": 19559, + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36": 16761, + "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 108115, + "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko": 3691290, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36": 257127, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36": 122050, + "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": 97831, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36": 196606, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36": 24179, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36": 78649, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36": 4830932, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 14490, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36": 248937, - "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": 73771, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36": 218943, - "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": 74757, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.104 Safari/537.36": 104102, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36": 4927593, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36": 14571, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36": 248945, + "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": 73772, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36": 218953, + "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": 74758, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.104 Safari/537.36": 104106, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36": 38465, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36": 123153, - "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": 24599, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36": 71914, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.190 Safari/537.36": 153637, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36": 123156, + "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": 24600, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36": 71915, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.190 Safari/537.36": 153638, "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": 25709, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36": 102570, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36": 78778, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36": 46977, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36": 154320, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36": 162959, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36": 154862, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36": 136693, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36": 108803, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36": 75138, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36": 102575, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.128 Safari/537.36": 78787, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36": 46979, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36": 154551, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36": 162969, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36": 154882, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36": 136700, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36": 108806, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36": 76135, "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": 48696, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0": 75455, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0": 23286, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0": 16314, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0": 224750, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0": 156906, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) Gecko/20100101 Firefox/86.0": 165927, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0": 55754, - "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0": 39312, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0": 75605, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0": 23307, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0": 16701, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0": 224756, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0": 156912, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:86.0) Gecko/20100101 Firefox/86.0": 165936, + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0": 55757, + "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0": 39373, "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36": 67119, - "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko": 17334 + "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko": 17452 } } diff --git a/deskutils/calibre/pkg-message b/deskutils/calibre/pkg-message index e30d9fa7dbfd..3cf3230e57f9 100644 --- a/deskutils/calibre/pkg-message +++ b/deskutils/calibre/pkg-message @@ -34,8 +34,11 @@ free apps Aldiko or WordPlayer are used instead. A basic startup script for calibre-server has been installed. -It can be customized and configured using the flags described in the -headers of the startup script. +It can be customized and configured using the flags described in +the headers of the startup script. The calibre_user and calibre_library +variables need to be configured to point to a library and the user +with write access to it. For example the user you usually run calibre +on the desktop as. The command line options are documented here: diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 1de12fcad349..50a2523ea6ef 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -75,6 +75,11 @@ lib/calibre/calibre/db/lazy.py lib/calibre/calibre/db/legacy.py lib/calibre/calibre/db/listeners.py lib/calibre/calibre/db/locking.py +lib/calibre/calibre/db/notes/__init__.py +lib/calibre/calibre/db/notes/connect.py +lib/calibre/calibre/db/notes/exim.py +lib/calibre/calibre/db/notes/schema_upgrade.py +lib/calibre/calibre/db/tests/notes.py lib/calibre/calibre/db/restore.py lib/calibre/calibre/db/schema_upgrades.py lib/calibre/calibre/db/search.py @@ -657,6 +662,7 @@ lib/calibre/calibre/gui2/actions/author_mapper.py lib/calibre/calibre/gui2/actions/auto_scroll.py lib/calibre/calibre/gui2/actions/booklist_context_menu.py lib/calibre/calibre/gui2/actions/browse_annots.py +lib/calibre/calibre/gui2/actions/browse_notes.py lib/calibre/calibre/gui2/actions/catalog.py lib/calibre/calibre/gui2/actions/choose_library.py lib/calibre/calibre/gui2/actions/convert.py @@ -818,6 +824,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py lib/calibre/calibre/gui2/dialogs/duplicates.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py +lib/calibre/calibre/gui2/dialogs/edit_category_notes.py lib/calibre/calibre/gui2/dialogs/enum_values_edit.py lib/calibre/calibre/gui2/dialogs/exim.py lib/calibre/calibre/gui2/dialogs/jobs_ui.py @@ -839,6 +846,7 @@ lib/calibre/calibre/gui2/dialogs/saved_search_editor.py lib/calibre/calibre/gui2/dialogs/scheduler.py lib/calibre/calibre/gui2/dialogs/search.py lib/calibre/calibre/gui2/dialogs/select_formats.py +lib/calibre/calibre/gui2/dialogs/show_category_note.py lib/calibre/calibre/gui2/dialogs/smartdevice.py lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py lib/calibre/calibre/gui2/dialogs/tag_categories.py @@ -884,6 +892,7 @@ lib/calibre/calibre/gui2/library/annotations.py lib/calibre/calibre/gui2/library/caches.py lib/calibre/calibre/gui2/library/delegates.py lib/calibre/calibre/gui2/library/models.py +lib/calibre/calibre/gui2/library/notes.py lib/calibre/calibre/gui2/library/views.py lib/calibre/calibre/gui2/linux_file_dialogs.py lib/calibre/calibre/gui2/listener.py @@ -1685,8 +1694,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/insert-link.png %%DATADIR%%/images/jobs.png %%DATADIR%%/images/keyboard-prefs.png -%%DATADIR%%/images/layout.png %%DATADIR%%/images/languages.png +%%DATADIR%%/images/layout.png %%DATADIR%%/images/library.png %%DATADIR%%/images/list_remove.png %%DATADIR%%/images/lookfeel.png @@ -1735,6 +1744,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/network-server.png %%DATADIR%%/images/news.png %%DATADIR%%/images/next.png +%%DATADIR%%/images/notes-for-dark-theme.png +%%DATADIR%%/images/notes.png %%DATADIR%%/images/ok.png %%DATADIR%%/images/page.png %%DATADIR%%/images/plugboard.png @@ -1859,6 +1870,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/metadata_sqlite.sql %%DATADIR%%/mime.types %%DATADIR%%/mozilla-ca-certs.pem +%%DATADIR%%/notes_sqlite.sql %%DATADIR%%/pdf-mathjax-loader.js %%DATADIR%%/pdf-preprint.js %%DATADIR%%/pin-template.svg