fix build with sphinx4 (#1977317)
use rawstring in conf.py (already in ghc-9)
This commit is contained in:
parent
71ccb69965
commit
bad2a2b5a9
11
ghc-userguide-sphinx4.patch
Normal file
11
ghc-userguide-sphinx4.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- ghc-8.8.4/docs/users_guide/conf.py~ 2020-07-09 00:43:03.000000000 +0800
|
||||||
|
+++ ghc-8.8.4/docs/users_guide/conf.py 2021-07-01 00:09:03.537324304 +0800
|
||||||
|
@@ -77,7 +77,7 @@
|
||||||
|
latex_elements = {
|
||||||
|
'inputenc': '',
|
||||||
|
'utf8extra': '',
|
||||||
|
- 'preamble': '''
|
||||||
|
+ 'preamble': r'''
|
||||||
|
\usepackage{fontspec}
|
||||||
|
\usepackage{makeidx}
|
||||||
|
\setsansfont{DejaVu Sans}
|
8
ghc.spec
8
ghc.spec
@ -49,7 +49,7 @@ Version: 8.8.4
|
|||||||
# - release can only be reset if *all* library versions get bumped simultaneously
|
# - release can only be reset if *all* library versions get bumped simultaneously
|
||||||
# (sometimes after a major release)
|
# (sometimes after a major release)
|
||||||
# - minor release numbers for a branch should be incremented monotonically
|
# - minor release numbers for a branch should be incremented monotonically
|
||||||
Release: 110%{?dist}
|
Release: 111%{?dist}
|
||||||
Summary: Glasgow Haskell Compiler
|
Summary: Glasgow Haskell Compiler
|
||||||
|
|
||||||
License: BSD and HaskellReport
|
License: BSD and HaskellReport
|
||||||
@ -68,6 +68,8 @@ Patch2: ghc-Cabal-install-PATH-warning.patch
|
|||||||
Patch3: ghc-gen_contents_index-nodocs.patch
|
Patch3: ghc-gen_contents_index-nodocs.patch
|
||||||
# https://phabricator.haskell.org/rGHC4eebc8016f68719e1ccdf460754a97d1f4d6ef05
|
# https://phabricator.haskell.org/rGHC4eebc8016f68719e1ccdf460754a97d1f4d6ef05
|
||||||
Patch6: ghc-8.6.3-sphinx-1.8.patch
|
Patch6: ghc-8.6.3-sphinx-1.8.patch
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1977317
|
||||||
|
Patch7: ghc-userguide-sphinx4.patch
|
||||||
|
|
||||||
# Arch dependent patches
|
# Arch dependent patches
|
||||||
|
|
||||||
@ -312,6 +314,7 @@ packages to be automatically installed too.
|
|||||||
|
|
||||||
%patch2 -p1 -b .orig
|
%patch2 -p1 -b .orig
|
||||||
%patch6 -p1 -b .orig
|
%patch6 -p1 -b .orig
|
||||||
|
%patch7 -p1 -b .orig
|
||||||
|
|
||||||
rm -r libffi-tarballs
|
rm -r libffi-tarballs
|
||||||
|
|
||||||
@ -655,6 +658,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 30 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-111
|
||||||
|
- fix build with sphinx4 (#1977317)
|
||||||
|
|
||||||
* Tue May 25 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-110
|
* Tue May 25 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-110
|
||||||
- ghc-compiler now requires ghc-filesystem for html docdirs
|
- ghc-compiler now requires ghc-filesystem for html docdirs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user