From nobody Thu May 30 05:59:06 2024 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 4VqbDC1CT9z5Lyfb; Thu, 30 May 2024 05:59:07 +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 4VqbDC0FDpz4nl4; Thu, 30 May 2024 05:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717048747; 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=vkivEZqp8MEpdobay0KjPO4jTeEfXHA5OOX4vwIAzRo=; b=FqDI/7OZIAdNarMPGQPkFz3AtvQokbYH2KMVtXeLA9fFFEc9BreQ135CKvIB5YfLt/S8ad iF9Aa4jyaWXf85h0ZoX0VqBr4p7ykBWyjv9tU39UCd39OmS+BEh+4o0JctfK+BbaqNpg25 7KMQ0nMBghFi084idSDoxcFv7elWJhhxoljbNdVJyDevi55nkwS1ty89TYVrxaPShxrS/b qjYyBCshtZu28P5ZevyOGqJ6GMNIzjAzKWTfnU3J3HIhMn3FdnKLKHOPTLLJAj2HPZLz6p FabxBAMkWXKVGifPkeUfOQnczeSDGB3wnRm7F4OAbh3A52lhyhfqqSzfjtg7TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717048747; a=rsa-sha256; cv=none; b=QjTtQu+Cwi65Hy9KFmzumfcAFrLL/fdQ0EBXZaDIZgYMUGqvOqXTcBiBMs0sDctYwhOaM2 GHBg2TNVM/TYwcc+hXVrukFsitfP89aI0qU7w14MaudW1xZAUpWvLM7kIVzEYLb6FX55OM iEc5WlH5m9ddlmwzST0lZLh/g3hh7Kwmt+s7qsfa8WKdGSnU+iRwq2jD1QIE8NxHmwnTL/ LHAbppZUUICMCMT0WqM8TNdalS5R2sq6uQzNoM82XcKs3WPuB8v3ifz5R0EQCdkH8VT6b2 HS2Ttncso1av8yZapY33dUHApgflBQUr7WR1sWtlUrT3WmlAJ5JiyvIzq7B0AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717048747; 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=vkivEZqp8MEpdobay0KjPO4jTeEfXHA5OOX4vwIAzRo=; b=aLHOIsHB6shiwmYIweQf+dZunwkDCMsN7pDJvqQibCS6eE+IZqdLTtASK+ekt/R+EoAyc+ K1m3V7VGycazTAgh6NHcghQOUyQKNnAnLNVd6gZ5sJ9pM03p7+7u3vi7PUthYqxJXQZYyO D1O6+G+/0afQeYy4TYdxMH0HyywkaZiLkw/O7JNTPOR68TYHu7iuecgoJO9kXVLzTgp4Sx nS5YdYYcb5a1aQImXUIGN9G9Gm/pSiYd4sxd5ANI3feP3abI1I+1axKxCzQu8ODsKoINkI CTi0mQukITL6Tf5HwNfK6blrwOeZ1zzg5TaObm/pVN0nOYcqF0SSRuacEg6reQ== 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 4VqbDB6yltzSk2; Thu, 30 May 2024 05:59:06 +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 44U5x6Dd052436; Thu, 30 May 2024 05:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U5x6sd052434; Thu, 30 May 2024 05:59:06 GMT (envelope-from git) Date: Thu, 30 May 2024 05:59:06 GMT Message-Id: <202405300559.44U5x6sd052434@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: ebe45e7ceb45 - main - deskutils/calibre: Remove Python 3.9 compatibility patches 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: ebe45e7ceb45c5f3b2ff91433942d06ff1fd837f Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebe45e7ceb45c5f3b2ff91433942d06ff1fd837f commit ebe45e7ceb45c5f3b2ff91433942d06ff1fd837f Author: Guido Falsi AuthorDate: 2024-05-30 05:55:16 +0000 Commit: Guido Falsi CommitDate: 2024-05-30 05:58:48 +0000 deskutils/calibre: Remove Python 3.9 compatibility patches Align minimum Python requirement with upstream, not that 3.11 is the default. Removed patches to make it compatible with 3.9. --- deskutils/calibre/Makefile | 3 ++- deskutils/calibre/files/patch-src_calibre_db_cache.py | 11 ----------- deskutils/calibre/files/patch-src_calibre_db_notes_exim.py | 11 ----------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index a7efa6a8b51c..b65ce3a76bc9 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,5 +1,6 @@ PORTNAME= calibre PORTVERSION= 7.11.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -61,7 +62,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.43.0.0:databases/py-apsw@${PY_FLAVO xdg-open:devel/xdg-utils USES= desktop-file-utils gettext-runtime:build gl localbase:ldflags \ - pkgconfig pyqt:6 python qt:6 shared-mime-info shebangfix sqlite ssl \ + pkgconfig pyqt:6 python:3.11+ qt:6 shared-mime-info shebangfix sqlite ssl \ tar:xz xorg USE_GL= opengl USE_PYQT= pyqt6 pysip qtbuilder sip webengine diff --git a/deskutils/calibre/files/patch-src_calibre_db_cache.py b/deskutils/calibre/files/patch-src_calibre_db_cache.py deleted file mode 100644 index fc499931f82e..000000000000 --- a/deskutils/calibre/files/patch-src_calibre_db_cache.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 5df66446d3d3..000000000000 --- a/deskutils/calibre/files/patch-src_calibre_db_notes_exim.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)