Attachment 213582 Details for Bug 245750 – py-sphinxcontrib-adadomain-patch-Sphinx.patch

[patch] py-sphinxcontrib-adadomain-patch-Sphinx.patch

py-sphinxcontrib-adadomain-patch-Sphinx.patch (text/plain), 3.68 KB, created by Danilo G. Baio on 2020-04-19 22:27:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2020-04-19 22:27:16 UTC

Size: 3.68 KB

patch

obsolete

>Index: textproc/py-sphinxcontrib-adadomain/Makefile
>===================================================================
>--- textproc/py-sphinxcontrib-adadomain/Makefile	(revisÃ£o 532162)
>+++ textproc/py-sphinxcontrib-adadomain/Makefile	(cÃ³pia de trabalho)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sphinxcontrib-adadomain
> PORTVERSION=	0.2
>+PORTREVISION=	1
> CATEGORIES=	textproc
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: textproc/py-sphinxcontrib-adadomain/files/patch-sphinx14
>===================================================================
>--- textproc/py-sphinxcontrib-adadomain/files/patch-sphinx14	(nonexistent)
>+++ textproc/py-sphinxcontrib-adadomain/files/patch-sphinx14	(cÃ³pia de trabalho)
>@@ -0,0 +1,73 @@
>+https://bitbucket.org/tkoskine/sphinxcontrib-adadomain/commits/0adaafc635791511af623027bd2cf57375763a27/raw
>+
>+From 0adaafc635791511af623027bd2cf57375763a27 Mon Sep 17 00:00:00 2001
>+From: Tero Koskinen <tero.koskinen@iki.fi>
>+Date: Fri, 19 Jan 2018 21:53:15 +0200
>+Subject: [PATCH] Make index nodes work on Sphinx >= 1.4.
>+
>+This also means that minimum supported Sphinx version is 1.4.
>+---
>+ setup.py                   |  2 +-
>+ sphinxcontrib/adadomain.py | 10 +++++-----
>+ 2 files changed, 6 insertions(+), 6 deletions(-)
>+
>+diff --git a/setup.py b/setup.py
>+index ce20c9b..4daab18 100644
>+--- setup.py
>++++ setup.py
>+@@ -12,7 +12,7 @@ This package contains the adadomain Sphinx extension.
>+ 
>+ '''
>+ 
>+-requires = ['Sphinx>=1.0']
>++requires = ['Sphinx>=1.4']
>+ 
>+ with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
>+     long_description = f.read()
>+diff --git a/sphinxcontrib/adadomain.py b/sphinxcontrib/adadomain.py
>+index 451e651..241182f 100644
>+--- sphinxcontrib/adadomain.py
>++++ sphinxcontrib/adadomain.py
>+@@ -18,13 +18,13 @@ import string
>+ 
>+ from docutils import nodes
>+ from docutils.parsers.rst import directives
>++from docutils.parsers.rst import Directive
>+ 
>+-from sphinx import addnodes
>++from sphinx import addnodes, version_info
>+ from sphinx.roles import XRefRole
>+ from sphinx.locale import l_, _
>+ from sphinx.directives import ObjectDescription
>+ from sphinx.domains import Domain, ObjType, Index
>+-from sphinx.util.compat import Directive
>+ from sphinx.util.nodes import make_refnode
>+ from sphinx.util.docfields import Field, TypedField
>+ 
>+@@ -269,12 +269,12 @@ class AdaObject(ObjectDescription):
>+ 
>+         indextext = self._get_index_text(name)
>+         if indextext:
>+-            self.indexnode['entries'].append(('single', indextext, name, name))
>++            self.indexnode['entries'].append(('single', indextext, name, name, None))
>+ 
>+         plain_name = pieces[-1]
>+         indextext = self._get_index_text(plain_name)
>+         if indextext:
>+-            self.indexnode['entries'].append(('single', indextext, name, plain_name))
>++            self.indexnode['entries'].append(('single', indextext, name, plain_name, None))
>+ 
>+ 
>+ class AdaModule(Directive):
>+@@ -316,7 +316,7 @@ class AdaModule(Directive):
>+         if not noindex:
>+             indextext = _('%s (module)') % modname
>+             inode = addnodes.index(entries=[('single', indextext,
>+-                                             'module-' + modname, modname)])
>++                                             'module-' + modname, modname, None)])
>+             ret.append(inode)
>+         return ret
>+ 
>+-- 
>+2.10.5
>+
>
>Property changes on: textproc/py-sphinxcontrib-adadomain/files/patch-sphinx14
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

dbaio: maintainer-approval? (sunpoet)

Actions: View | Diff

Attachments on bug 245750: 213582