Open
[sync] PR-11: Fix runtime error during build with Sphinx 9.1.0 #13
openeuler-ci-botAdd on Sep 2
[sync] PR-11: Fix runtime error during build with Sphinx 9.1.0 #13
Open
Merged fromsync-pr11-fix-sphinx-9-to-openEuler-26.09intoopenEuler-26.09
Total: 2 files changed+38-1
| @@ -0,0 +1,31 @@ | |||
| 1 | +From 9653a2b9a9e3a756b287b0a59204860511e4abce Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: sterni <sternenseemann@systemli.org> | ||
| 3 | +Date: Wed, 28 Jan 2026 00:09:54 +0100 | ||
| 4 | +Subject: [PATCH] users_guide: fix runtime error during build with Sphinx 9.1.0 | ||
| 5 | + | ||
| 6 | +Appears that pathto is stricter about what it accepts now. | ||
| 7 | +Tested Sphinx 8.2.3 and 9.1.0 on the ghc-9.10 branch. | ||
| 8 | + | ||
| 9 | +Resolves #26810. | ||
| 10 | + | ||
| 11 | +Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de> | ||
| 12 | +--- | ||
| 13 | + docs/users_guide/rtd-theme/layout.html | 2 +- | ||
| 14 | + 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | + | ||
| 16 | +diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html | ||
| 17 | +index 94a40cc1c3a..f2441378a86 100644 | ||
| 18 | +--- a/docs/users_guide/rtd-theme/layout.html | ||
| 19 | ++++ b/docs/users_guide/rtd-theme/layout.html | ||
| 20 | +@@ -32,7 +32,7 @@ | ||
| 21 | + {%- if css|attr("rel") %} | ||
| 22 | + <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} /> | ||
| 23 | + {%- else %} | ||
| 24 | +- <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" /> | ||
| 25 | ++ <link rel="stylesheet" href="{{ pathto(css.filename, 1) }}" type="text/css" /> | ||
| 26 | + {%- endif %} | ||
| 27 | + {%- endfor %} | ||
| 28 | + | ||
| 29 | +-- | ||
| 30 | +GitLab | ||
| 31 | + | ||
| @@ -60,7 +60,7 @@ | |||
| 60 | 60 | ||
| 61 | Name: ghc | 61 | Name: ghc |
| 62 | Version: %{full_version} | 62 | Version: %{full_version} |
| 63 | -Release: 2 | 63 | +Release: 3 |
| 64 | Summary: The Glorious Glasgow Haskell Compiler | 64 | Summary: The Glorious Glasgow Haskell Compiler |
| 65 | License: BSD-3-Clause | 65 | License: BSD-3-Clause |
| 66 | URL: https://www.haskell.org/ghc | 66 | URL: https://www.haskell.org/ghc |
| @@ -86,6 +86,7 @@ Patch6: ghc-pie.patch | |||
| 86 | # riscv64 does not support the argument -qg of hadrian | 86 | # riscv64 does not support the argument -qg of hadrian |
| 87 | # https://src.fedoraproject.org/rpms/ghc/blob/2b31b684ce8b65747eb12acbe167b1b3d08515a4/f/ghc-hadrian-s390x-rts--qg.patch | 87 | # https://src.fedoraproject.org/rpms/ghc/blob/2b31b684ce8b65747eb12acbe167b1b3d08515a4/f/ghc-hadrian-s390x-rts--qg.patch |
| 88 | Patch7: ghc-hadrian-riscv64-rts--qg.patch | 88 | Patch7: ghc-hadrian-riscv64-rts--qg.patch |
| 89 | +Patch8: fix-build-with-sphinx-9.1.0.patch | ||
| 89 | 90 | ||
| 90 | BuildRequires: binutils-devel | 91 | BuildRequires: binutils-devel |
| 91 | BuildRequires: gcc-c++ | 92 | BuildRequires: gcc-c++ |
| @@ -279,6 +280,8 @@ rm libffi-tarballs/libffi-*.tar.gz | |||
| 279 | %patch -P7 -p1 | 280 | %patch -P7 -p1 |
| 280 | %endif | 281 | %endif |
| 281 | 282 | ||
| 283 | +%patch -P8 -p1 | ||
| 284 | + | ||
| 282 | %build | 285 | %build |
| 283 | %if %{with ghc_bootstrap} | 286 | %if %{with ghc_bootstrap} |
| 284 | export PATH=/opt/bin:$PATH | 287 | export PATH=/opt/bin:$PATH |
| @@ -561,6 +564,9 @@ $GHC --info | |||
| 561 | %endif | 564 | %endif |
| 562 | 565 | ||
| 563 | %changelog | 566 | %changelog |
| 567 | +* Tue Sep 01 2026 Lin Runze <lrzlin@163.com> - 9.10.1-3 | ||
| 568 | +- Fix runtime error during build with Sphinx 9.1.0 | ||
| 569 | + | ||
| 564 | * Sat Jul 05 2025 Suyun <ziyu.oerv@isrc.iscas.ac.cn> - 9.10.1-2 | 570 | * Sat Jul 05 2025 Suyun <ziyu.oerv@isrc.iscas.ac.cn> - 9.10.1-2 |
| 565 | - Add riscv64 support | 571 | - Add riscv64 support |
| 566 | 572 | ||