summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2023-10-26 18:54:17 +0000
committerCoprDistGit <infra@openeuler.org>2023-10-26 18:54:17 +0000
commitfd1a760a86f604ed8f4556dc73a63e659480314d (patch)
tree97af32bee23f776851eecf089aedaf6271b6a5d3
parentd9ef25dadb93562a146ab529c049ab5ee36b3d12 (diff)
automatic import of ghc
-rw-r--r--fix-sphinx-extlinks.patch12
-rw-r--r--ghc.spec5
2 files changed, 17 insertions, 0 deletions
diff --git a/fix-sphinx-extlinks.patch b/fix-sphinx-extlinks.patch
new file mode 100644
index 0000000..ab4ff7f
--- /dev/null
+++ b/fix-sphinx-extlinks.patch
@@ -0,0 +1,12 @@
+diff --color -Naur ghc-9.4.5-orig/docs/users_guide/ghc_config.py.in ghc-9.4.5/docs/users_guide/ghc_config.py.in
+--- ghc-9.4.5-orig/docs/users_guide/ghc_config.py.in 2023-10-27 00:22:40.258287961 +0800
++++ ghc-9.4.5/docs/users_guide/ghc_config.py.in 2023-10-27 00:23:38.693278198 +0800
+@@ -1,6 +1,6 @@
+ extlinks = {
+- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
+- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
++ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'),
++ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
+ }
+
+ libs_base_uri = '../libraries'
diff --git a/ghc.spec b/ghc.spec
index d5a346c..21c4cfc 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -64,6 +64,8 @@ Patch2: execstack.patch
Patch3: ghc-pie.patch
# Fix sphinx7 issues
Patch4: sphinx7.patch
+# Fix sphinx extlinks
+Patch5: fix-sphinx-extlinks.patch
BuildRequires: binutils-devel
BuildRequires: gcc-c++
@@ -221,6 +223,7 @@ Installing this package causes %{name}-*-prof packages corresponding to
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
rm libffi-tarballs/libffi-*.tar.gz
@@ -491,5 +494,7 @@ $GHC --info
%endif
%changelog
+* Fri Oct 27 2023 Lin Runze <lrzlin@163.com> 9.4.5-1
+- Fix newer version of sphinx related bugs.
* Tue Jul 25 2023 Lin Runze <lrzlin@163.com> 9.4.5-1
- Initial packaging (Version 9.4.5)