Control: tags -1 patch Control: tags -1 pending On Sat, 23 Oct 2021 21:41:50 +0200 Lucas Nussbaum <[email protected]> wrote:
Source: speedcrunch Version: 0.12.0-5 Severity: serious Justification: FTBFS Tags: bookworm sid ftbfsHi, During a rebuild of all packages in sid, your package failed to build on amd64.
I've prepared a fix for building against Sphinx >= 4 and uploaded it to DELAYED/5. Please feel free to tell me if I should cancel it. The debdiff is attached. Felix
diff -Nru speedcrunch-0.12.0/debian/changelog speedcrunch-0.12.0/debian/changelog --- speedcrunch-0.12.0/debian/changelog 2020-04-19 14:13:08.000000000 +0200 +++ speedcrunch-0.12.0/debian/changelog 2022-10-29 09:59:26.000000000 +0200 @@ -1,3 +1,11 @@ +speedcrunch (0.12.0-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix docs build with Sphinx >= 4. (Closes: #997366) + - Add 0007-fix-docs-build-with-Sphinx-4.patch + + -- Felix Geyer <[email protected]> Sat, 29 Oct 2022 09:59:26 +0200 + speedcrunch (0.12.0-5) unstable; urgency=medium * d/patches, d/control: fix docs build with Sphinx >= 2.0 diff -Nru speedcrunch-0.12.0/debian/patches/0007-fix-docs-build-with-Sphinx-4.patch speedcrunch-0.12.0/debian/patches/0007-fix-docs-build-with-Sphinx-4.patch --- speedcrunch-0.12.0/debian/patches/0007-fix-docs-build-with-Sphinx-4.patch 1970-01-01 01:00:00.000000000 +0100 +++ speedcrunch-0.12.0/debian/patches/0007-fix-docs-build-with-Sphinx-4.patch 2022-10-29 09:59:26.000000000 +0200 @@ -0,0 +1,33 @@ +Description: Fix FTBFS with Sphinx >= 4 + +Pass the type instead of an instance to add_lexer(). + +> Sphinx.add_lexer(): +> Take a lexer class as an argument. +> An instance of lexers are still supported until Sphinx-3.x. + +--- speedcrunch-0.12.0.orig/doc/src/extensions/sc_lexer.py ++++ speedcrunch-0.12.0/doc/src/extensions/sc_lexer.py +@@ -108,16 +108,18 @@ class SpeedCrunchSessionLexer(SpeedCrunc + ] + } + ++ def __init__(self): ++ super().__init__(stripnl=False) ++ self.add_filter('raiseonerror') ++ + + __all__ = ['SpeedCrunchLexer', 'SpeedCrunchSessionLexer'] + + + # Sphinx extension interface + def setup(app): +- sc_lexer = SpeedCrunchSessionLexer(stripnl=False) +- sc_lexer.add_filter('raiseonerror') +- app.add_lexer('sc', sc_lexer) +- app.add_lexer('speedcrunch', sc_lexer) ++ app.add_lexer('sc', SpeedCrunchSessionLexer) ++ app.add_lexer('speedcrunch', SpeedCrunchSessionLexer) + return { + 'version': '0.1', + 'parallel_read_safe': True, diff -Nru speedcrunch-0.12.0/debian/patches/series speedcrunch-0.12.0/debian/patches/series --- speedcrunch-0.12.0/debian/patches/series 2020-04-19 11:13:12.000000000 +0200 +++ speedcrunch-0.12.0/debian/patches/series 2022-10-29 09:59:14.000000000 +0200 @@ -4,3 +4,4 @@ 0004-Replace-the-REBUILD_MANUAL-option-with-a-path.patch 0005-docs-fix-docs-build-with-Sphinx-2.0.patch 0006-Use-CMake-s-CXX_STANDARD-property.patch +0007-fix-docs-build-with-Sphinx-4.patch
