[packages/python-sphinxcontrib-doxylink] - added patch from Debian to fix breakage caused by python-pyparsing 2.1.10 - rel 6

baggins baggins at pld-linux.org
Fri Jan 27 10:42:36 CET 2017


commit 771c074144298dac181a42824805a32f94f3ca9e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jan 27 10:41:58 2017 +0100

    - added patch from Debian to fix breakage caused by python-pyparsing 2.1.10
    - rel 6

 Force-qualifier-result-to-be-a-single-string.patch | 28 ++++++++++++++++++++++
 python-sphinxcontrib-doxylink.spec                 |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/python-sphinxcontrib-doxylink.spec b/python-sphinxcontrib-doxylink.spec
index a3e25a7..866350d 100644
--- a/python-sphinxcontrib-doxylink.spec
+++ b/python-sphinxcontrib-doxylink.spec
@@ -7,11 +7,12 @@ Summary:	Sphinx extension to link to external Doxygen API documentation
 Summary(pl.UTF-8):	Rozszerzenie Sphinksa do łączenia z zewnętrzną dokumentacją API z Doxygena
 Name:		python-sphinxcontrib-doxylink
 Version:	1.3
-Release:	5
+Release:	6
 License:	BSD
 Group:		Development/Languages/Python
 Source0:	http://pypi.python.org/packages/source/s/sphinxcontrib-doxylink/sphinxcontrib-doxylink-%{version}.tar.gz
 # Source0-md5:	f6800726c2d31bcd6b4a65d40852881f
+Patch0:		Force-qualifier-result-to-be-a-single-string.patch
 URL:		http://packages.python.org/sphinxcontrib-doxylink/
 %if %{with python2}
 BuildRequires:	python-modules
@@ -50,6 +51,7 @@ Doxygena.
 
 %prep
 %setup -q -n sphinxcontrib-doxylink-%{version}
+%patch0 -p1
 
 %build
 %if %{with python2}
diff --git a/Force-qualifier-result-to-be-a-single-string.patch b/Force-qualifier-result-to-be-a-single-string.patch
new file mode 100644
index 0000000..30e9d0d
--- /dev/null
+++ b/Force-qualifier-result-to-be-a-single-string.patch
@@ -0,0 +1,28 @@
+From: Paul McGuire <ptmcg at austin.rr.com>
+Date: Tue, 22 Nov 2016 19:00:59 +0000
+Subject: Force qualifier result to be a single string.
+
+---
+ sphinxcontrib/doxylink/parsing.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sphinxcontrib/doxylink/parsing.py b/sphinxcontrib/doxylink/parsing.py
+index 4e42f44..54172f9 100644
+--- a/sphinxcontrib/doxylink/parsing.py
++++ b/sphinxcontrib/doxylink/parsing.py
+@@ -1,13 +1,14 @@
+ #import multiprocessing
+ import itertools
+ 
+-from pyparsing import Word, Literal, alphas, nums, alphanums, OneOrMore, Optional, SkipTo, ParseException, Group, ZeroOrMore, Suppress, Combine, delimitedList, quotedString, nestedExpr, ParseResults, oneOf
++from pyparsing import Word, Literal, alphas, nums, alphanums, OneOrMore, Optional, SkipTo, ParseException, Group, ZeroOrMore, Suppress, Combine, delimitedList, quotedString, nestedExpr, ParseResults, oneOf, ungroup
+ 
+ # define punctuation - reuse of expressions helps packratting work better
+ LPAR,RPAR,LBRACK,RBRACK,COMMA,EQ = map(Literal,"()[],=")
+ 
+ #Qualifier to go in front of type in the argument list (unsigned const int foo)
+ qualifier = OneOrMore(oneOf('const unsigned typename struct enum'))
++qualifier = ungroup(qualifier.addParseAction(' '.join))
+ 
+ def turn_parseresults_to_list(s, loc, toks):
+ 	return ParseResults(normalise_templates(toks[0].asList()))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-sphinxcontrib-doxylink.git/commitdiff/771c074144298dac181a42824805a32f94f3ca9e



More information about the pld-cvs-commit mailing list