From nobody Wed Nov 24 20:26:07 2021 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 DB79918AE041; Wed, 24 Nov 2021 20:26: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 4HzswH4SwWz3GNf; Wed, 24 Nov 2021 20:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6AFD410835; Wed, 24 Nov 2021 20:26:07 +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 1AOKQ70K042277; Wed, 24 Nov 2021 20:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOKQ7bO042276; Wed, 24 Nov 2021 20:26:07 GMT (envelope-from git) Date: Wed, 24 Nov 2021 20:26:07 GMT Message-Id: <202111242026.1AOKQ7bO042276@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: 29c0aa77578b - main - www/trac-devel: Upgrade to 1.5.3 and unbreak 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: 29c0aa77578b766ac518e948c76834869e9813e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637785567; 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=+F+43nxEjpu5ult1nahYxHtj/rba0I3I1Mzamt0HMKc=; b=UMW2wJWHBoyxYrp786oHBNcKh5xPBVsnRT/e27FpjDKMhj6DJ08MccrOlQqrzmaIq5LVz/ ZZDQhZvUjxELo+pszIPwITtxSW1Y6wOffH9UchieIcVG7rAXNWb/5jMw8NJnAtDkxGQxbB I7wLKYd+J8wA/LuTGq31auwjNhCgZTmue/biVJ23/cMpjmiDJNWIYPVqh4B97+hlqvH//i cCmtrYKyF+2ztRFAWi9IR1gEtsooeATe+xQRdbB5Urv50a9sHHnxshPzq98vmKgYZHRzNW /yXvcfUr9L34SHMZfFhG/pR54fYgR0vvKiUOeRypdozAZ5AIt+F4nxsrUeZbYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637785567; a=rsa-sha256; cv=none; b=matsJW83dy+6CEUkYLQZEo/o32WIVgYoHg3/iYLxKVr0TNg6R2lnZ67byAXhmZVY0nLKu1 MGQ+XcDRLIiLdixg1w7xlgO6pw6nFoZS3/dzy+EDjx1iNO1USXvz6gbffuT16KMVXYD7P6 xobV54ksnbPmUH659Rhzg2XnVmNKIOlzw940L0yYG5EVWOlqkfwPs6ZMqoMCzirX5wEhrB FD3sYexZhQSMxMi21DGUI7cJk2SNc1Bp4MFGAos8mnTZyHjHCLNnRW3r611XdyOEEy042v yxM2z+qdTMfR7j6cEcSKVhizDmpNCUkC47FfNuDYrPpW9/rUhaWTimsjBDRZNg== 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=29c0aa77578b766ac518e948c76834869e9813e5 commit 29c0aa77578b766ac518e948c76834869e9813e5 Author: Oleksii Samorukov AuthorDate: 2021-11-24 20:22:39 +0000 Commit: Oleksii Samorukov CommitDate: 2021-11-24 20:22:39 +0000 www/trac-devel: Upgrade to 1.5.3 and unbreak PR: 258942 Reported by: lapo@lapo.it --- www/trac-devel/Makefile | 4 +-- www/trac-devel/distinfo | 6 ++--- .../patch-trac_ticket_templates_report__view.html | 10 +++++++ www/trac-devel/files/patch-trac_util_html.py | 11 ++++++++ .../files/patch-trac_util_presentation.py | 19 +++++++++++++ www/trac-devel/files/patch-trac_util_text.py | 31 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 6 deletions(-) diff --git a/www/trac-devel/Makefile b/www/trac-devel/Makefile index 5aa9fe0f7bea..2f61b7d8ddc2 100644 --- a/www/trac-devel/Makefile +++ b/www/trac-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= trac -DISTVERSION= 1.5.2 +DISTVERSION= 1.5.3 PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ @@ -13,8 +13,6 @@ COMMENT= Enhanced wiki and issue tracking system for software projects LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= does not build (cannot import name 'soft_unicode' from 'jinja2.utils') - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ diff --git a/www/trac-devel/distinfo b/www/trac-devel/distinfo index a5cb0f6307e4..bc1e278bd51b 100644 --- a/www/trac-devel/distinfo +++ b/www/trac-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609593024 -SHA256 (Trac-1.5.2.tar.gz) = dac241e8018e11374cfabe68f902d815948611481f4ecb565e4f076768547e39 -SIZE (Trac-1.5.2.tar.gz) = 5416364 +TIMESTAMP = 1637782544 +SHA256 (Trac-1.5.3.tar.gz) = 699f5dd3ce82fb7138c726ef55a653f09531823e26170a1fb4d71d31b4adeaa5 +SIZE (Trac-1.5.3.tar.gz) = 5423354 diff --git a/www/trac-devel/files/patch-trac_ticket_templates_report__view.html b/www/trac-devel/files/patch-trac_ticket_templates_report__view.html new file mode 100644 index 000000000000..de20599c2244 --- /dev/null +++ b/www/trac-devel/files/patch-trac_ticket_templates_report__view.html @@ -0,0 +1,10 @@ +--- trac/ticket/templates/report_view.html.orig 2021-05-09 23:08:49 UTC ++++ trac/ticket/templates/report_view.html +@@ -162,6 +162,7 @@ history and logs, available at https://trac.edgewall.o + # for value_for_group, row_group in row_groups: + # if loop.first: + ++ # set header_group, header = None, None + # set column_headers + # for header_group in header_groups: + diff --git a/www/trac-devel/files/patch-trac_util_html.py b/www/trac-devel/files/patch-trac_util_html.py new file mode 100644 index 000000000000..e99992efd7d1 --- /dev/null +++ b/www/trac-devel/files/patch-trac_util_html.py @@ -0,0 +1,11 @@ +--- 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 + from html.parser import HTMLParser + +-from markupsafe import Markup, escape as escape_quotes ++from markupsafe import Markup, escape as escape_quotes, soft_unicode + + try: + from babel.support import LazyProxy diff --git a/www/trac-devel/files/patch-trac_util_presentation.py b/www/trac-devel/files/patch-trac_util_presentation.py new file mode 100644 index 000000000000..f04f3a8bab1d --- /dev/null +++ b/www/trac-devel/files/patch-trac_util_presentation.py @@ -0,0 +1,19 @@ +--- trac/util/presentation.py.orig 2021-05-09 23:08:49 UTC ++++ trac/util/presentation.py +@@ -21,13 +21,13 @@ from datetime import datetime + from math import ceil + import re + +-from jinja2 import Markup, Undefined, contextfilter, evalcontextfilter ++from jinja2 import Undefined, contextfilter, evalcontextfilter + from jinja2.filters import make_attrgetter +-from jinja2.utils import soft_unicode + + from trac.core import TracError + from .datefmt import to_utimestamp, utc +-from .html import Fragment, classes, html_attribute, styles, tag ++from .html import (Fragment, Markup, classes, html_attribute, soft_unicode, ++ styles, tag) + from .text import javascript_quote + + __all__ = ['captioned_button', 'classes', 'first_last', 'group', 'istext', diff --git a/www/trac-devel/files/patch-trac_util_text.py b/www/trac-devel/files/patch-trac_util_text.py new file mode 100644 index 000000000000..64e40a62758c --- /dev/null +++ b/www/trac-devel/files/patch-trac_util_text.py @@ -0,0 +1,31 @@ +--- trac/util/text.py.orig 2021-05-09 23:08:49 UTC ++++ trac/util/text.py +@@ -22,6 +22,7 @@ import base64 + import configparser + import locale + import os ++import pkg_resources + import re + import sys + import textwrap +@@ -43,6 +44,11 @@ del Empty # shouldn't be used outside of Trac core + + # -- Jinja2 + ++_jinja2_ver = pkg_resources.parse_version(jinja2.__version__) ++_jinja2_exts = ['jinja2.ext.do', 'jinja2.ext.i18n'] ++if _jinja2_ver < pkg_resources.parse_version('3'): ++ _jinja2_exts.append('jinja2.ext.with_') ++ + def jinja2env(**kwargs): + """Creates a Jinja2 ``Environment`` configured with Trac conventions. + +@@ -65,7 +71,7 @@ def jinja2env(**kwargs): + line_comment_prefix='##', + trim_blocks=True, + lstrip_blocks=True, +- extensions=['jinja2.ext.do', 'jinja2.ext.i18n', 'jinja2.ext.with_'], ++ extensions=list(_jinja2_exts), + finalize=filterout_none, + autoescape=autoescape_extensions, + )