public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jens Petersen <petersen@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ghc9.4] rawhide: fix build with sphinx 9
Date: Sun, 09 Aug 2026 05:30:12 GMT [thread overview]
Message-ID: <178625341275.1.9767756460139986487.rpms-ghc9.4-8f1ef8d964b2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ghc9.4
Branch : rawhide
Commit : 8f1ef8d964b202b9747055cc2811e59af9aa9382
Author : Jens Petersen <petersen@redhat.com>
Date : 2026-08-09T13:27:34+08:00
Stats : +34/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/ghc9.4/c/8f1ef8d964b202b9747055cc2811e59af9aa9382?branch=rawhide
Log:
fix build with sphinx 9
---
diff --git a/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch b/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
new file mode 100644
index 0000000..f75e4b1
--- /dev/null
+++ b/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
@@ -0,0 +1,30 @@
+Fedora backport to 9.4
+
+From e8f5a45de561ec80c88cd3da2c66502deb32d4c3 Mon Sep 17 00:00:00 2001
+From: sterni <sternenseemann@systemli.org>
+Date: Wed, 28 Jan 2026 00:09:54 +0100
+Subject: [PATCH] users_guide: fix runtime error during build with Sphinx 9.1.0
+
+Appears that pathto is stricter about what it accepts now.
+Tested Sphinx 8.2.3 and 9.1.0 on the ghc-9.10 branch.
+
+Resolves #26810.
+
+Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
+---
+ 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 94a40cc1c3a1..f2441378a868 100644
+--- a/docs/users_guide/rtd-theme/layout.html
++++ b/docs/users_guide/rtd-theme/layout.html
+@@ -70,7 +70,7 @@
+ {%- if css|attr("rel") %}
+ <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
+ {%- else %}
+- <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
++ <link rel="stylesheet" href="{{ pathto(css.filename, 1) }}" type="text/css" />
+ {%- endif %}
+ {%- endfor %}
+
diff --git a/ghc9.4.spec b/ghc9.4.spec
index ea2b759..665db93 100644
--- a/ghc9.4.spec
+++ b/ghc9.4.spec
@@ -137,6 +137,9 @@ Patch16: ghc-hadrian-s390x-rts--qg.patch
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662
Patch17: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662.patch
+# sphinx9
+Patch20: e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
+
# Debian patches:
Patch26: no-missing-haddock-file-warning.patch
Patch27: haddock-remove-googleapis-fonts.patch
@@ -482,6 +485,7 @@ rm libffi-tarballs/libffi-*.tar.gz
%endif
%patch -P17 -p1 -b .orig
+%patch -P20 -p1 -b .orig
#debian
%patch -P26 -p1 -b .orig
reply other threads:[~2026-08-09 5:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178625341275.1.9767756460139986487.rpms-ghc9.4-8f1ef8d964b2@fedoraproject.org \
--to=petersen@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox