From nobody Thu Jul 14 15:39:52 2022 X-Original-To: dev-commits-ports-branches@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 4LkJZw2hKbz2pQJH; Thu, 14 Jul 2022 15:39:52 +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 4LkJZw2Cmlz4Frc; Thu, 14 Jul 2022 15:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657813192; 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=AumcVly9kkNQ2+sucy4oBIN/8tY+mlcrIP7o+CCBwao=; b=lmkfN1LzY+9fE3AEfaMlSEZwK6V04kZNE6paB2vRA23Z0xVkDMWlTF9hcNLfYf4WDonmI2 K9KcdyzAFtteE9Z2mvT14MOL5zIJe6aBD7OLo3eNzKE5oDCM28bYwTXKMmhIleob6jqkp3 n+IoxwbaOI2VLMKPBjekpY60DNtqsahrIrOn5/lkqucpxc0TCKgKC/r7uv9HOAvtej9hRl d2GH4mfb9rABhus/LeD/4MQxxTKzdTogy07wzQ6QNHkZ9+3lXejhg8n/pvf4H6CpGH+LSh xSYmwJbx6lwhe0lScv29FsIbl5Pum7DFWV/I2fYePwmIXrk80CgqIFhOZ1Ogtg== 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 4LkJZw170zz17Q3; Thu, 14 Jul 2022 15:39:52 +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 26EFdq7e008886; Thu, 14 Jul 2022 15:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26EFdqJH008885; Thu, 14 Jul 2022 15:39:52 GMT (envelope-from git) Date: Thu, 14 Jul 2022 15:39:52 GMT Message-Id: <202207141539.26EFdqJH008885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Oleksii Samorukov Subject: git: dedf16bf59c3 - 2022Q3 - www/trac-devel: fix build with a recent Python version, patch adopted from the upstream List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: dedf16bf59c3a82ad7b886557d685845a5e7b18a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657813192; 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=AumcVly9kkNQ2+sucy4oBIN/8tY+mlcrIP7o+CCBwao=; b=HAQUZmgTDsd5Nvmx3sFEDqHshyQjiwociRPBcdottOayYrNtAbNlzdYFwHuYvONRMA/Lat wdF+N8qgeJhE9AMY2rYoCpXLiT2pONP571+Q46XD60VPnFtrnqceGNb3KAkHdFQQfOj+vj 5VDjUxrmBbyhFRfFM4Hp6eoP93x1lLbz85i4gUnxzI/f6M3NaJemkO1e71SB6I+opWJtsi uJ0Z+M7j41cmuLdD93YUE1wf5Wgu9jnRp2t5isWUyMQOAl/9kXFbBgMXGtjqAORKZ3jaE9 3FFpHCJruIcYaKszK6mNxJbEAwEQo/XOFaoD1JWiLh5CwT+9BqMpbWrx4DUxbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657813192; a=rsa-sha256; cv=none; b=OT300gD9jszqhDMKdcJSeqIy1O/e6eLQYYlDix/3NY0EoLkEhZUVLOiWNK+cPvPcFs/Fo+ Q2alTF8/vSVi8X9blAvKObdiM4I3NfA81QAdK3mij/R4Wcg/rMbz6Nd0TS2tH7ZuytSO/7 4eIy4ntFF+diRRZsxWCMLDTiHfRiXnc+BGzceEYy0VrIs6XTOjWYGW86J4Yr7n5BQ31+BC WqOUMDPDxg9UUjjCvzvuqgILt2LaJq6Go8NsdQMaj3t7nxrTAU8HqmlOsqX+arU1G7haqF jInfOiIk4ka93VRnef1k/NkaizkBnUnfvDWTj4ac/Ok4petbW0IMKBKaHZys6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=dedf16bf59c3a82ad7b886557d685845a5e7b18a commit dedf16bf59c3a82ad7b886557d685845a5e7b18a Author: Oleksii Samorukov AuthorDate: 2022-07-12 12:39:03 +0000 Commit: Oleksii Samorukov CommitDate: 2022-07-14 15:39:00 +0000 www/trac-devel: fix build with a recent Python version, patch adopted from the upstream (cherry picked from commit 038a08951124293872fa3f90afcc8d63c73e7600) --- 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