From 19db1ff8da3613e93a5ef60da7a397db99bef082 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Tue, 26 Sep 2023 08:58:16 +0200
Subject: [PATCH] Switch from recommonmark to myst-parser

---
 0101-Deactivate-markdown-doc.patch | 34 ++++++++++--------------------
 llvm.spec                          |  4 ++--
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/0101-Deactivate-markdown-doc.patch b/0101-Deactivate-markdown-doc.patch
index 92e048d..cbf4580 100644
--- a/0101-Deactivate-markdown-doc.patch
+++ b/0101-Deactivate-markdown-doc.patch
@@ -1,25 +1,13 @@
-diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py
---- a/llvm/docs/conf.py	2020-09-15 09:12:24.318287611 +0000
-+++ b/llvm/docs/conf.py	2020-09-15 15:01:00.025893199 +0000
-@@ -36,20 +36,7 @@
-     '.rst': 'restructuredtext',
- }
+diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
+index cf8a75980b53..b208ad138e89 100644
+--- a/llvm/docs/conf.py
++++ b/llvm/docs/conf.py
+@@ -26,7 +26,7 @@ from datetime import date
  
--try:
--  import recommonmark
--except ImportError:
--  # manpages do not use any .md sources
--  if not tags.has('builder-man'):
--    raise
--else:
--  import sphinx
--  if sphinx.version_info >= (3, 0):
--    # This requires 0.5 or later.
--    extensions.append('recommonmark')
--  else:
--    source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
--  source_suffix['.md'] = 'markdown'
-+import sphinx
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ["myst_parser", "sphinx.ext.intersphinx", "sphinx.ext.todo"]
++extensions = ["sphinx.ext.intersphinx", "sphinx.ext.todo"]
  
- # The encoding of source files.
- #source_encoding = 'utf-8-sig'
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ["_templates"]
diff --git a/llvm.spec b/llvm.spec
index e4331df..6b02655 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -110,7 +110,7 @@ Source5:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve
 Source6:	release-keys.asc
 %endif
 
-# RHEL-specific patch to avoid unwanted recommonmark dep
+# RHEL-specific patch to avoid unwanted python3-myst-parser dep
 Patch101:	0101-Deactivate-markdown-doc.patch
 
 BuildRequires:	gcc
@@ -124,7 +124,7 @@ BuildRequires:	ncurses-devel
 BuildRequires:	python3-psutil
 BuildRequires:	python3-sphinx
 %if %{undefined rhel}
-BuildRequires:	python3-recommonmark
+BuildRequires:	python3-myst-parser
 %endif
 BuildRequires:	multilib-rpm-config
 %if %{with gold}