[packages/docutils] - rel 4, upstream fix for pygments 2.19

[baggins]

commit ffdc69417b6b03abc3df571f5818aef70e34c077
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 12 20:40:11 2025 +0100

    - rel 4, upstream fix for pygments 2.19

 docutils.spec       |  4 ++-
 pygments-2.19.patch | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
---
diff --git a/docutils.spec b/docutils.spec
index 9a05c6d..5733ba9 100644
--- a/docutils.spec
+++ b/docutils.spec
@@ -6,13 +6,14 @@ Summary:	Documentation Utilities
 Summary(pl.UTF-8):	Narzędzia do tworzenia dokumentacji
 Name:		docutils
 Version:	0.21.2
-Release:	3
+Release:	4
 License:	Public Domain, BSD, GPL v3 (see COPYING.txt)
 Group:		Development/Tools
 # original URL, but only with major releases: http://downloads.sourceforge.net/docutils/%{name}-%{version}.tar.gz
 #Source0Download: https://pypi.org/simple/docutils/
 Source0:	https://pypi.debian.net/docutils/%{name}-%{version}.tar.gz
 # Source0-md5:	c4064e1e0e3cd142951fd2b95b830874
+Patch0:		pygments-2.19.patch
 URL:		http://docutils.sourceforge.net/
 BuildRequires:	python3-build
 BuildRequires:	python3-devel >= 1:3.5
@@ -63,6 +64,7 @@ Ten pakiet dostarcza moduły Docutils dla Pythona 3.
 
 %prep
 %setup -q
+%patch -P0 -p2
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
       docutils/__main__.py \
diff --git a/pygments-2.19.patch b/pygments-2.19.patch
new file mode 100644
index 0000000..2d9b7c9
--- /dev/null
+++ b/pygments-2.19.patch
@@ -0,0 +1,81 @@
+commit 26bc53a0ead4871bde3a6366d03f0c31725728a2
+Author: aa-turner <aa-turner at 929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
+Date:   Fri Mar 7 22:49:46 2025 +0000
+
+    Support Pygments 2.19 in tests
+    
+    
+    git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@10019 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
+
+diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code.py b/docutils/test/test_parsers/test_rst/test_directives/test_code.py
+index 0a3ca7e05..fc10ab267 100755
+--- a/docutils/test/test_parsers/test_rst/test_directives/test_code.py
++++ b/docutils/test/test_parsers/test_rst/test_directives/test_code.py
+@@ -25,10 +25,16 @@
+ 
+ if with_pygments:
+     import pygments
+-    _pv = re.match(r'^([0-9]+)\.([0-9]*)', pygments.__version__)
+-    PYGMENTS_2_14_PLUS = (int(_pv[1]), int(_pv[2])) >= (2, 14)
++
++    pygments_version = tuple(map(int, pygments.__version__.split('.')[:2]))
++else:
++    pygments_version = (0, 0)
++
++PYGMENTS_2_14_PLUS = pygments_version >= (2, 14)
++if pygments_version >= (2, 19):
++    def_ws = '<inline classes="whitespace">\n             '
+ else:
+-    PYGMENTS_2_14_PLUS = None
++    def_ws = ' '
+ 
+ 
+ class ParserTestCase(unittest.TestCase):
+@@ -159,14 +165,14 @@ def my_function():
+       # and now for something completely different
+       print(8/2)
+ """,
+-"""\
++f"""\
+ <document source="test data">
+     <literal_block classes="code python3 testclass" ids="my-function" names="my_function" xml:space="preserve">
+         <inline classes="ln">
+              7 \n\
+         <inline classes="keyword">
+             def
+-         \n\
++        {def_ws}
+         <inline classes="name function">
+             my_function
+         <inline classes="punctuation">
+diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
+index 89cb4b172..037768c01 100755
+--- a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
++++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
+@@ -22,8 +22,7 @@
+ from docutils.utils import new_document
+ from docutils.utils.code_analyzer import with_pygments
+ from test.test_parsers.test_rst.test_directives.test_code \
+-    import PYGMENTS_2_14_PLUS
+-
++    import PYGMENTS_2_14_PLUS, def_ws
+ 
+ @unittest.skipUnless(with_pygments, 'needs Pygments')
+ class ParserTestCase(unittest.TestCase):
+@@ -55,14 +54,14 @@ def my_function():
+       # and now for something completely different
+       print(8/2)
+ """,
+-"""\
++f"""\
+ <document source="test data">
+     <literal_block classes="code python3" xml:space="preserve">
+         <inline classes="ln">
+              7 \n\
+         <inline classes="keyword">
+             def
+-         \n\
++        {def_ws}
+         <inline classes="name function">
+             my_function
+         <inline classes="punctuation">
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docutils.git/commitdiff/ffdc69417b6b03abc3df571f5818aef70e34c077