Date: Tue, 6 Jun 2023 05:56:36 GMT From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee34ecfe846e - main - www/trac-devel: upgrqde to 1.5.4 Message-ID: <202306060556.3565uaic057930@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee34ecfe846e116b2bee2f8035d9cee98191e0ad commit ee34ecfe846e116b2bee2f8035d9cee98191e0ad Author: Oleksii Samorukov <samm@FreeBSD.org> AuthorDate: 2023-06-06 05:55:14 +0000 Commit: Oleksii Samorukov <samm@FreeBSD.org> CommitDate: 2023-06-06 05:55:14 +0000 www/trac-devel: upgrqde to 1.5.4 - Remove outdated patches - Unbreak the build Reported by: repology --- www/trac-devel/Makefile | 5 +--- www/trac-devel/distinfo | 6 ++--- .../patch-trac_ticket_templates_report__view.html | 10 ------- www/trac-devel/files/patch-trac_util_html.py | 13 --------- .../files/patch-trac_util_presentation.py | 19 ------------- www/trac-devel/files/patch-trac_util_text.py | 31 ---------------------- 6 files changed, 4 insertions(+), 80 deletions(-) diff --git a/www/trac-devel/Makefile b/www/trac-devel/Makefile index 7a4951e73500..6aa275751bb3 100644 --- a/www/trac-devel/Makefile +++ b/www/trac-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= trac -DISTVERSION= 1.5.3 -PORTREVISION= 2 +DISTVERSION= 1.5.4 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ ftp://ftp.edgewall.com/pub/trac/ @@ -14,8 +13,6 @@ WWW= https://trac.edgewall.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build - 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 bc1e278bd51b..5db5fff8eb92 100644 --- a/www/trac-devel/distinfo +++ b/www/trac-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637782544 -SHA256 (Trac-1.5.3.tar.gz) = 699f5dd3ce82fb7138c726ef55a653f09531823e26170a1fb4d71d31b4adeaa5 -SIZE (Trac-1.5.3.tar.gz) = 5423354 +TIMESTAMP = 1686028534 +SHA256 (Trac-1.5.4.tar.gz) = 59fc453b4f6700f7e79917f1990aa20634d3cf85db2d3888111433725b9796e8 +SIZE (Trac-1.5.4.tar.gz) = 6161372 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 deleted file mode 100644 index de20599c2244..000000000000 --- a/www/trac-devel/files/patch-trac_ticket_templates_report__view.html +++ /dev/null @@ -1,10 +0,0 @@ ---- 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: - <thead> -+ # set header_group, header = None, None - # set column_headers - # for header_group in header_groups: - <tr class="trac-columns"> diff --git a/www/trac-devel/files/patch-trac_util_html.py b/www/trac-devel/files/patch-trac_util_html.py deleted file mode 100644 index fdb5c8fd3472..000000000000 --- a/www/trac-devel/files/patch-trac_util_html.py +++ /dev/null @@ -1,13 +0,0 @@ ---- trac/util/html.py.orig 2021-05-09 23:08:49 UTC -+++ trac/util/html.py -@@ -25,6 +25,10 @@ from html import entities - from html.parser import HTMLParser - - 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 diff --git a/www/trac-devel/files/patch-trac_util_presentation.py b/www/trac-devel/files/patch-trac_util_presentation.py deleted file mode 100644 index f04f3a8bab1d..000000000000 --- a/www/trac-devel/files/patch-trac_util_presentation.py +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 64e40a62758c..000000000000 --- a/www/trac-devel/files/patch-trac_util_text.py +++ /dev/null @@ -1,31 +0,0 @@ ---- 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, - )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306060556.3565uaic057930>