From 785ee2bac2fb27c4b6e2b5d3290bfa9d9f666c7f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 26 Jan 2024 19:14:21 -0800 Subject: [PATCH] ghc: fix build with python3.12 and sphinx7 --- srcpkgs/ghc/patches/fix-build-sphinx7.patch | 66 +++++++++++++++++++++ srcpkgs/ghc/template | 2 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ghc/patches/fix-build-sphinx7.patch diff --git a/srcpkgs/ghc/patches/fix-build-sphinx7.patch b/srcpkgs/ghc/patches/fix-build-sphinx7.patch new file mode 100644 index 00000000000..8d256945ad0 --- /dev/null +++ b/srcpkgs/ghc/patches/fix-build-sphinx7.patch @@ -0,0 +1,66 @@ +From 00dc51060881df81258ba3b3bdf447294618a4de Mon Sep 17 00:00:00 2001 +From: Matthew Pickering +Date: Tue, 3 Jan 2023 15:56:37 +0000 +Subject: [PATCH] sphinx: Use modern syntax for extlinks + +This fixes the following build error: + +``` + Command line: /opt/homebrew/opt/sphinx-doc/bin/sphinx-build -b man -d /private/tmp/extra-dir-55768274273/.doctrees-man -n -w /private/tmp/extra-dir-55768274273/.log docs/users_guide /private/tmp/extra-dir-55768274273 + ===> Command failed with error code: 2 + + Exception occurred: + File "/opt/homebrew/Cellar/sphinx-doc/6.0.0/libexec/lib/python3.11/site-packages/sphinx/ext/extlinks.py", line 101, in role + title = caption % part + ~~~~~~~~^~~~~~ + TypeError: not all arguments converted during string formatting +``` + +I tested on Sphinx-5.1.1 and Sphinx-6.0.0 + +Thanks for sterni for providing instructions about how to test using +sphinx-6.0.0. + +Fixes #22690 +--- + docs/users_guide/ghc_config.py.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/users_guide/ghc_config.py.in b/docs/users_guide/ghc_config.py.in +index dcc7fbaef624..c9888a13adc5 100644 +--- a/docs/users_guide/ghc_config.py.in ++++ b/docs/users_guide/ghc_config.py.in +@@ -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' +From 52d701b31dc4427b7e321a04be3f5f13a5fc271e Mon Sep 17 00:00:00 2001 +From: "mimi.vx" +Date: Wed, 24 May 2023 12:42:15 +0000 +Subject: [PATCH] Fix for Sphinx 7 removed style key + +Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23444 +--- + docs/users_guide/rtd-theme/layout.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html +index 2a61142514a..7ffeff7befc 100644 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -64,7 +64,7 @@ + {%- endif %} + + {# CSS #} +- ++ + + {%- for css in css_files %} + {%- if css|attr("rel") %} +-- +GitLab diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index c424d35b59b..189d4131c50 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -5,7 +5,7 @@ version=9.0.2 revision=1 build_style=gnu-configure hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel - ncurses-devel python3-Sphinx" + ncurses-devel python3-Sphinx python3-setuptools" makedepends="libnuma-devel" depends="perl gcc libffi-devel gmp-devel libnuma-devel" short_desc="Glorious Haskell Compiler"