From nobody Fri Aug 09 09:16:54 2024 X-Original-To: dev-commits-ports-main@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 4WgJFg1Vs9z5TDZt; Fri, 09 Aug 2024 09:16:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WgJFg0wz8z42p6; Fri, 9 Aug 2024 09:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723195015; 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=7BeO1BoCW7UG0C2c9eVGVngrJiCDLcYdSjxUDoXxzt4=; b=raUzDczj5C3WYi4az6hmZMzkaFOw6rYRQMlizCJiTbblMWShx6WqxfX+M6yGsTOAo4jzZf WSQt8zsH+mAF+MhYq5S6+HpI8ad4Jvmp0CyKdxUeiT9B2sm1DLpcwFfv126l5bk3cmkQT/ Iy5P6XKPBtKrIjmbmTEztZtcVOF47+LCMYj9DUj8dnn1RW9K9fIvF/NfIhMg0oPYJIqt1f CGnUn5J8dk0fdS1J6JWoPjTSQ6CuWOkNR4AtKaFmGV+3HhrpZ7Rbth5UoUaX4oxbms4n+s +sRHSCHdhSdTgn+sFnc41hSXrmO18QplZr7QIds2D6Gmi2AXDnfjaVWfPbVWRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723195015; a=rsa-sha256; cv=none; b=iaLTltcvy5NCsRwHMnK4sylDIsVGZGHnO2N9imH+a+z0YIyC2crWkKnZERMRxnzpc7IJ3B Sl+fIjNh/prWBxQQAteeK72WNx6BMRoVEbhI5oFFMN1YgekooYWqhp63sOjE/n3W7w6Fyl sQ4D3eGJX382MrFDdyYgUhdh1tVuC1x4TfQ4AGwcjna/tjJOTS4kUrV+uPfpxF09IsgSKs YAilcB5lSAiDgHdlFPPU5F+zd7iUWYQKbi5IyFR7UMBa8UD/Ero3W/3wxfl2g2DupmckSA 8uucqTTVQAbJoovCmUwvMl1ZCmd2bQyHMzbUnhuNjBxwdDgBSgmKla7eqXmeDQ== 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=1723195015; 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=7BeO1BoCW7UG0C2c9eVGVngrJiCDLcYdSjxUDoXxzt4=; b=ZhXCUd2kglNG27QW+B6A8vzqgSRV339LpV1ecu1YSfdqAcRirI/aFjHs2rYj7135w6kj4j qMLmH+W4DmI06nO6LIbK9GpTZcNsSqdiale4FXJjkZAlrQVDtLK8/95Cr7LGx6BypS3TQ3 NlsJsqaGPaGIxc0SLGNnNrELQSPWlVHTF65hsWUJJdEFVSjMBQXpETryFLiDiHZaX8T5BF QyXphrvyO0G0n4dRKKVEd02beLrvrkKHBUN2WEW6ltc/9LOokONRmKMoOEUjzwb5teaaV1 x5pe7uglsh3RHBq5+Fh9ssP1yGDYaDZy6ifoeVQ81cW/qudEhT9erD5sya1Rsw== 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 4WgJFg0XHzz19lw; Fri, 9 Aug 2024 09:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4799Gs2C055762; Fri, 9 Aug 2024 09:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4799GsHM055759; Fri, 9 Aug 2024 09:16:54 GMT (envelope-from git) Date: Fri, 9 Aug 2024 09:16:54 GMT Message-Id: <202408090916.4799GsHM055759@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 53b90ee074f9 - main - misc/py-oterm: Fix a runtime error List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53b90ee074f97b55a3242caec601f18885a74455 Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=53b90ee074f97b55a3242caec601f18885a74455 commit 53b90ee074f97b55a3242caec601f18885a74455 Author: Nicola Vitale AuthorDate: 2024-08-09 09:05:48 +0000 Commit: Nicola Vitale CommitDate: 2024-08-09 09:05:48 +0000 misc/py-oterm: Fix a runtime error - Due to an incompatibility with the recent version of textproc/py-textual, oterm crashes when there are saved chats, with the following error │ /usr/local/lib/python3.11/site-packages/textual/widget.py:984 in mount │ │ │ │ 981 │ │ if self._closing or self._pruning: ╭──────────── locals ────────────╮ │ │ 982 │ │ │ return AwaitMount(self, []) │ after = None │ │ │ 983 │ │ if not self.is_attached: │ before = None │ │ │ ❱ 984 │ │ │ raise MountError(f"Can't mount widget(s) before {self!r} is mounted") │ self = TabPane(id='chat-1') │ │ │ 985 │ │ # Check for duplicate IDs in the incoming widgets │ widgets = (ChatContainer(),) │ │ │ 986 │ │ ids_to_mount = [ ╰────────────────────────────────╯ │ │ 987 │ │ │ widget_id for widget in widgets if (widget_id := widget.id) is not None │ ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ MountError: Can't mount widget(s) before TabPane(id='chat-1') is mounted So add the patch patch-oterm_app_oterm.py, that is a simple workaround waiting for an official solution by upstream. - Bump PORTREVISION --- misc/py-oterm/Makefile | 1 + misc/py-oterm/files/patch-oterm_app_oterm.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/misc/py-oterm/Makefile b/misc/py-oterm/Makefile index 844590d4d1ff..5f487674975e 100644 --- a/misc/py-oterm/Makefile +++ b/misc/py-oterm/Makefile @@ -1,5 +1,6 @@ PORTNAME= oterm DISTVERSION= 0.2.9 +PORTREVISION= 1 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-oterm/files/patch-oterm_app_oterm.py b/misc/py-oterm/files/patch-oterm_app_oterm.py new file mode 100644 index 000000000000..e96637544753 --- /dev/null +++ b/misc/py-oterm/files/patch-oterm_app_oterm.py @@ -0,0 +1,11 @@ +--- oterm/app/oterm.py.orig 2024-05-15 16:35:57 UTC ++++ oterm/app/oterm.py +@@ -72,7 +72,7 @@ class OTerm(App): + for id, name, model, context, system, format, keep_alive in saved_chats: + messages = await self.store.get_messages(id) + pane = TabPane(name, id=f"chat-{id}") +- await pane.mount( ++ pane.compose_add_child( + ChatContainer( + db_id=id, + chat_name=name,