From f427a699740524c92f1544bedd7cb8346515d073 Mon Sep 17 00:00:00 2001 From: J Farkas Date: Sat, 10 Jul 2021 19:28:54 +0000 Subject: [PATCH] ghc: allow building with current Sphinx ./srcpkg build ghc fails with current tools: "inplace/bin/ghc-stage1" [...] /build/cbits/longlong.p_o Running Sphinx v4.0.2 Configuration error: There is a syntax error in your configuration file: (unicode error) 'unicodeescape' codec can't decode bytes in position 1-2: truncated \uXXXX escape (conf.py, line 87) ... make: *** [Makefile:128: all] Error 2 According to https://gitlab.haskell.org/ghc/ghc/-/issues/19962 >> This fix is to use raw strings, as already done in master: >> https://gitlab.haskell.org/ghc/ghc/-/blob/master/docs/users_guide/conf.py#L96 Sanitized from commit (only small parts apply) https://gitlab.haskell.org/ghc/ghc/-/commit/83407ffc7acc00cc025b9f6ed063add9ab9f9bcc --- srcpkgs/ghc/patches/sphinx-unicode.patch | 17 +++++++++++++++++ srcpkgs/ghc/template | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch new file mode 100644 index 000000000000..0286b9c2bd31 --- /dev/null +++ b/srcpkgs/ghc/patches/sphinx-unicode.patch @@ -0,0 +1,17 @@ +diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py +--- ghc-8.8.4-orig/docs/users_guide/conf.py 2020-07-08 16:43:03.000000000 +0000 ++++ ghc-8.8.4/docs/users_guide/conf.py 2021-07-10 20:25:33.536928487 +0000 +@@ -78,5 +78,5 @@ latex_elements = { + 'inputenc': '', + 'utf8extra': '', +- 'preamble': ''' ++ 'preamble': r''' + \usepackage{fontspec} + \usepackage{makeidx} +@@ -84,5 +84,5 @@ latex_elements = { + \setromanfont{DejaVu Serif} + \setmonofont{DejaVu Sans Mono} +-\setlength{\\tymin}{45pt} ++\setlength{\tymin}{45pt} + ''', + } diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index 082c56f70358..90ce760a09d6 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -2,7 +2,7 @@ pkgname=ghc # Keep this synchronized with http://www.stackage.org/lts version=8.8.4 -revision=2 +revision=3 wrksrc="ghc-${version%[!0-9]}" build_style=gnu-configure hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel