[Python-modules-commits] [sphinxcontrib-doxylink] 01/05: Add patch fixing FTBFS with recent versions of pyparsing.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository sphinxcontrib-doxylink.

commit d3d91c997ab32df0ff9186bf3219039e376c9e4e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Nov 22 19:10:17 2016 +0000

    Add patch fixing FTBFS with recent versions of pyparsing.
    
    Gbp-Dch: full
    Closes: #841582
    Thanks: Paul McGuire for the patch
---
 ...ce-qualifier-result-to-be-a-single-string.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/Force-qualifier-result-to-be-a-single-string.patch b/debian/patches/Force-qualifier-result-to-be-a-single-string.patch
new file mode 100644
index 0000000..30e9d0d
--- /dev/null
+++ b/debian/patches/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()))
diff --git a/debian/patches/series b/debian/patches/series
index 5e0fbdb..9ab5cbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Fix-buggy-testsuite.patch
+Force-qualifier-result-to-be-a-single-string.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinxcontrib-doxylink.git