commit: 014738239a0908d3bdb47240c54bf04411cdaf31 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Jun 6 09:57:22 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Jun 6 10:01:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01473823
dev-lang/ghc: backport sphinx quoting fix Reported-by: Andrew Savchenko Closes: https://bugs.gentoo.org/792558 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch | 27 ++++++++++++++++++++++++ dev-lang/ghc/ghc-8.10.4.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch new file mode 100644 index 00000000000..e9517dbea06 --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/792558 + +From 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc Mon Sep 17 00:00:00 2001 +From: Krzysztof Gogolewski <[email protected]> +Date: Fri, 25 Sep 2020 02:52:19 +0200 +Subject: [PATCH] Various documentation fixes + +* Use r'' in conf.py. This fixes a Sphinx warning: + WARNING: Support for evaluating Python 2 syntax is deprecated and will be removed in Sphinx 4.0. Convert docs/users_guide/conf.py to Python 3 syntax. +--- a/docs/users_guide/conf.py ++++ b/docs/users_guide/conf.py +@@ -100,13 +100,13 @@ htmlhelp_basename = 'GHCUsersGuide' + latex_elements = { + 'inputenc': '', + 'utf8extra': '', +- 'preamble': ''' ++ 'preamble': r''' + \usepackage{fontspec} + \usepackage{makeidx} + \setsansfont{DejaVu Sans} + \setromanfont{DejaVu Serif} + \setmonofont{DejaVu Sans Mono} +-\setlength{\\tymin}{45pt} ++\setlength{\tymin}{45pt} + ''', + } + diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild index 3e4cfb0d0db..af942b11cd0 100644 --- a/dev-lang/ghc/ghc-8.10.4.ebuild +++ b/dev-lang/ghc/ghc-8.10.4.ebuild @@ -502,6 +502,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch + eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch # a bunch of crosscompiler patches # needs newer version:
