Date: Thu, 17 Aug 2017 12:50:58 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448092 - in branches/2017Q3/textproc/py-sphinx: . files Message-ID: <201708171250.v7HCowA3019802@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Thu Aug 17 12:50:58 2017 New Revision: 448092 URL: https://svnweb.freebsd.org/changeset/ports/448092 Log: MFH: r447275 Backport fix for issue #3212 PR: 221116 Submitted by: pgj Approved by: araujo (maintainer) Obtained from: https://github.com/sphinx-doc/sphinx/issues/3212 Approved by: ports-secteam (with hat) Added: branches/2017Q3/textproc/py-sphinx/files/patch-sphinx_writers_html.py - copied unchanged from r447275, head/textproc/py-sphinx/files/patch-sphinx_writers_html.py Modified: branches/2017Q3/textproc/py-sphinx/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/textproc/py-sphinx/Makefile ============================================================================== --- branches/2017Q3/textproc/py-sphinx/Makefile Thu Aug 17 12:29:52 2017 (r448091) +++ branches/2017Q3/textproc/py-sphinx/Makefile Thu Aug 17 12:50:58 2017 (r448092) @@ -3,7 +3,7 @@ PORTNAME= sphinx PORTVERSION= 1.4.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP Copied: branches/2017Q3/textproc/py-sphinx/files/patch-sphinx_writers_html.py (from r447275, head/textproc/py-sphinx/files/patch-sphinx_writers_html.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/textproc/py-sphinx/files/patch-sphinx_writers_html.py Thu Aug 17 12:50:58 2017 (r448092, copy of r447275, head/textproc/py-sphinx/files/patch-sphinx_writers_html.py) @@ -0,0 +1,27 @@ +--- sphinx/writers/html.py.orig 2016-10-01 15:14:37 UTC ++++ sphinx/writers/html.py +@@ -16,6 +16,7 @@ import copy + import warnings + + from six import string_types ++import docutils + from docutils import nodes + from docutils.writers.html4css1 import Writer, HTMLTranslator as BaseTranslator + +@@ -497,6 +498,16 @@ class HTMLTranslator(BaseTranslator): + if 'height' not in node: + node['height'] = str(size[1]) + BaseTranslator.visit_image(self, node) ++ ++ # overwritten ++ def depart_image(self, node): ++ if docutils.__version__ >= "0.13": ++ # since docutils-0.13, HTMLWriter does not push context data on visit_image() ++ if node['uri'].lower().endswith(('svg', 'svgz')): ++ self.body.append(self.context.pop()) ++ else: ++ # docutils-0.12 or below, HTML Writer always push context data on visit_image() ++ self.body.append(self.context.pop()) + + def visit_toctree(self, node): + # this only happens when formatting a toc from env.tocs -- in this
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708171250.v7HCowA3019802>