git: dedf16bf59c3 - 2022Q3 - www/trac-devel: fix build with a recent Python version, patch adopted from the upstream

The branch 2022Q3 has been updated by samm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dedf16bf59c3a82ad7b886557d685845a5e7b18a

commit dedf16bf59c3a82ad7b886557d685845a5e7b18a
Author:     Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2022-07-12 12:39:03 +0000
Commit:     Oleksii Samorukov <samm@FreeBSD.org>
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