From 3b035c500e3e5d09485efef1b8bc8aae2967edbe Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 14 Mar 2024 23:28:19 +0000 Subject: [PATCH] Drop myst_parser patches These were obsoleted by 7d55a3ba92368be55b392c20d623fde6ac82d86d. --- 0009-disable-myst-parser.patch | 26 -------------------------- 0101-Deactivate-markdown-doc.patch | 24 ------------------------ patches.spec.inc | 7 ------- 3 files changed, 57 deletions(-) delete mode 100644 0009-disable-myst-parser.patch delete mode 100644 0101-Deactivate-markdown-doc.patch diff --git a/0009-disable-myst-parser.patch b/0009-disable-myst-parser.patch deleted file mode 100644 index 12a5154..0000000 --- a/0009-disable-myst-parser.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 988dd3f3363d8ab4ee53f61e0eb5afc6646c9d4f Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Tue, 26 Sep 2023 13:06:29 +0200 -Subject: [PATCH] disable myst parser - ---- - clang/docs/conf.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/clang/docs/conf.py b/clang/docs/conf.py -index ca310026f53e..dfb74273b5b2 100644 ---- a/clang/docs/conf.py -+++ b/clang/docs/conf.py -@@ -35,9 +35,6 @@ templates_path = ["_templates"] - - import sphinx - --if sphinx.version_info >= (3, 0): -- extensions.append("myst_parser") -- - # The encoding of source files. - # source_encoding = 'utf-8-sig' - --- -2.41.0 - diff --git a/0101-Deactivate-markdown-doc.patch b/0101-Deactivate-markdown-doc.patch deleted file mode 100644 index 0c66452..0000000 --- a/0101-Deactivate-markdown-doc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a9fb2cb9a29e50bf4ba3c2e470e52ea091a807e5 Mon Sep 17 00:00:00 2001 -From: Konrad Kleine -Date: Fri, 3 Nov 2023 20:55:14 +0000 -Subject: [PATCH] Deactivate-markdown-doc - ---- - llvm/docs/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py -index 0a3905201c85..81326257856a 100644 ---- a/llvm/docs/conf.py -+++ b/llvm/docs/conf.py -@@ -26,7 +26,7 @@ sys.path.insert(0, os.path.abspath(".")) - - # 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"] - - # Automatic anchors for markdown titles - from llvm_slug import make_slug --- -2.41.0 diff --git a/patches.spec.inc b/patches.spec.inc index 5845d19..4345f3f 100644 --- a/patches.spec.inc +++ b/patches.spec.inc @@ -1,6 +1,3 @@ -# RHEL-specific patch to avoid unwanted python3-myst-parser dep -Patch1000: 0101-Deactivate-markdown-doc.patch - #region CLANG patches Patch2001: 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch Patch2002: 0003-PATCH-clang-Don-t-install-static-libraries.patch @@ -21,10 +18,6 @@ Patch2005: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch Patch2009: 0001-Restore-fopenmp-implicit-rpath-disabled-by-default.patch %endif -# RHEL specific patches -# Avoid unwanted dependency on python-myst-parser -Patch2100: 0009-disable-myst-parser.patch - %if %{without compat_build} # Patches for clang-tools-extra # See https://reviews.llvm.org/D120301