From nobody Tue Jul 12 12:46:08 2022 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 15FFE17FD521; Tue, 12 Jul 2022 12:46:09 +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 4Lj0qN6k29z3sRV; Tue, 12 Jul 2022 12:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657629968; 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=A7F0BC7EsRm+Q4A88uRbYZ2efc9N2GNRBlNKsMsteVc=; b=XaU4zmjNjVdo0nQbtDIAi3QJ5y7Q1eQ74fWkEw9SpvWKXsVNyiDuGISkBNQKB0nxjS1Z5e ZhbwiknmFvwlyjgbW2qeOOCJ2ggFenD/2RB5uN/5kPJHyZgAUezWClEHNI2IT2e7YPzdoG b179lAblO6MxqWojZCyESypjCUfuqasasdctJY41UrCXTSosJ0egI3jejbAfebSmM/k8Pw UHYqOEENuQtl8BVFwl8WLqO3OiiZOeZ6F5r+fjeoRL3RXNdjZNQ+wR89o6bvV3EWOQlA79 haL73XsinWC9ztAoiLSi5kMwZLk7PrcqSJ32J4SgvQpl4sM2O+18MxGc50SuXA== 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 4Lj0qN5nm4zkmM; Tue, 12 Jul 2022 12:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26CCk8fS073071; Tue, 12 Jul 2022 12:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CCk8Sk073070; Tue, 12 Jul 2022 12:46:08 GMT (envelope-from git) Date: Tue, 12 Jul 2022 12:46:08 GMT Message-Id: <202207121246.26CCk8Sk073070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: 038a08951124 - main - www/trac-devel: fix build with a recent Python version, patch adopted from the upstream 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: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 038a08951124293872fa3f90afcc8d63c73e7600 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657629968; 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=A7F0BC7EsRm+Q4A88uRbYZ2efc9N2GNRBlNKsMsteVc=; b=s/EGT9yeGkttq4M8smukT6xK+2gCi7klrmYijmCJS3reidVlviuRFQ195U2XEYklztB8AL Sms57Z8W29CUSsKyHYKVh6ZLmhiRbe/4qBF0AL5BIwG2289GwkNO9IYzooTLkdOObgbrX7 8xnlT4hvaQbjruJE9dxmuGmcZYWqZDTR5q/qxZqTB7c7t3VdTO1vY70LWoM+AMSr81Dm2c uQtc1V9Qu7oPoDipfXsAciZ0GAyfnUwIQkFK8WAjSPXLSLjUmUqPz8YNH9jIz+B7+ogfU9 xzf1L/j4WEllJduvpklgXlnkl/SWAicGJCrZI5jfqjXUMzQ5emvv/l0sBILcVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657629968; a=rsa-sha256; cv=none; b=mz97JIhK0tCVWnk6KI2tkTrcW5iFBnmf7e2CTCnnvVTdEevcJ33PNXioc4Mnwx9FonfnxV 6gwg7PGfN1mzTFpu+D0jF7hFHVNaFLpUs2UhFTcLYILPxGbNmJ9hgPosAg+sCe6x69RYiP vdcz0z8h7N9jAL83Y7zeok3KYopxz6uLzZG0aMqaF0MFB64c1SySqaxa4XOj5YkurNQNMF kuRA5OkpYA9reNFCe1s9k2HQio07gL+qyu79afNZIeP+0MvuAOADq7RxHwEcoKfcLHjiop DVVSC+SuMU0BWHKaXm/O4pwyo4cO0U23uMTnFk0g35KmPGN5cK9O3ZE0E2dZWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=038a08951124293872fa3f90afcc8d63c73e7600 commit 038a08951124293872fa3f90afcc8d63c73e7600 Author: Oleksii Samorukov AuthorDate: 2022-07-12 12:39:03 +0000 Commit: Oleksii Samorukov CommitDate: 2022-07-12 12:45:48 +0000 www/trac-devel: fix build with a recent Python version, patch adopted from the upstream --- www/trac-devel/files/patch-trac_util_html.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www/trac-devel/files/patch-trac_util_html.py b/www/trac-devel/files/patch-trac_util_html.py index e99992efd7d1..fdb5c8fd3472 100644 --- a/www/trac-devel/files/patch-trac_util_html.py +++ b/www/trac-devel/files/patch-trac_util_html.py @@ -1,11 +1,13 @@ --- trac/util/html.py.orig 2021-05-09 23:08:49 UTC +++ trac/util/html.py -@@ -24,7 +24,7 @@ import sys - from html import entities +@@ -25,6 +25,10 @@ from html import entities from html.parser import HTMLParser --from markupsafe import Markup, escape as escape_quotes -+from markupsafe import Markup, escape as escape_quotes, soft_unicode + from markupsafe import Markup, escape as escape_quotes ++try: ++ from markupsafe import soft_str as soft_unicode ++except ImportError: ++ from markupsafe import soft_unicode try: from babel.support import LazyProxy