diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-10-26 13:49:19 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-10-26 13:49:19 +0000 |
| commit | d9ef25dadb93562a146ab529c049ab5ee36b3d12 (patch) | |
| tree | 3f26b19820f8af0906e0d3c6e117c3dc24dff6bc | |
| parent | 271992aa0e2e7ff632cec314a5bbb6070c5b4a73 (diff) | |
automatic import of ghc
| -rw-r--r-- | ghc.spec | 4 | ||||
| -rw-r--r-- | sphinx7.patch | 26 |
2 files changed, 30 insertions, 0 deletions
@@ -62,6 +62,8 @@ Patch1: ghc-gen_contents_index-haddock-path.patch Patch2: execstack.patch # Set Linux as default PIE platform Patch3: ghc-pie.patch +# Fix sphinx7 issues +Patch4: sphinx7.patch BuildRequires: binutils-devel BuildRequires: gcc-c++ @@ -190,6 +192,7 @@ GHC Haskell libraries documentation. %ghc_lib_subpackage -d xhtml-3000.2.2.1 + %package devel %{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/%{name}-\1-devel = \2-%{release},/g")} Summary: GHC development libraries meta package @@ -217,6 +220,7 @@ Installing this package causes %{name}-*-prof packages corresponding to %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 rm libffi-tarballs/libffi-*.tar.gz diff --git a/sphinx7.patch b/sphinx7.patch new file mode 100644 index 0000000..0eb1dbd --- /dev/null +++ b/sphinx7.patch @@ -0,0 +1,26 @@ +From 52d701b31dc4427b7e321a04be3f5f13a5fc271e Mon Sep 17 00:00:00 2001 +From: "mimi.vx" <mimi.vx@gmail.com> +Date: Wed, 24 May 2023 12:42:15 +0000 +Subject: [PATCH] Fix for Sphinx 7 removed style key + +Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23444 +--- + docs/users_guide/rtd-theme/layout.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html +index 2a61142514a..7ffeff7befc 100644 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -64,7 +64,7 @@ + {%- endif %} + + {# CSS #} +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> + <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" /> + {%- for css in css_files %} + {%- if css|attr("rel") %} +-- +GitLab + |