From d39fb64f3f7b85e00b27343ecb6fad16b0f00e15 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 21 Jun 2020 10:30:15 +0200 Subject: [PATCH] update the patch to be a revert --- debian/patches/revert-sphinx-deprecation.diff | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/patches/revert-sphinx-deprecation.diff b/debian/patches/revert-sphinx-deprecation.diff index aa345d9a..4bf60746 100644 --- a/debian/patches/revert-sphinx-deprecation.diff +++ b/debian/patches/revert-sphinx-deprecation.diff @@ -14,28 +14,28 @@ Date: Thu Jun 18 14:04:34 2020 -0700 Differential revision: https://reviews.llvm.org/D75284 -diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py -index c92ede3ea44..13bbc826de8 100644 ---- a/llvm/docs/conf.py -+++ b/llvm/docs/conf.py -@@ -26,15 +26,16 @@ from datetime import date +diff --git b/llvm/docs/conf.py a/llvm/docs/conf.py +index 13bbc826de8..c92ede3ea44 100644 +--- b/llvm/docs/conf.py ++++ a/llvm/docs/conf.py +@@ -26,16 +26,15 @@ from datetime import date # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. --extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo'] -+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 'recommonmark'] +-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 'recommonmark'] ++extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] # The suffix of source filenames. --source_suffix = ['.rst', '.md'] -- --source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'} -+source_suffix = { -+ '.rst': 'restructuredtext', -+ '.md': 'markdown', -+} +-source_suffix = { +- '.rst': 'restructuredtext', +- '.md': 'markdown', +-} ++source_suffix = ['.rst', '.md'] ++ ++source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'} # The encoding of source files. #source_encoding = 'utf-8-sig'