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.10] f44: fix build with sphinx9 (sterni)
Date: Tue, 09 Jun 2026 07:14:24 GMT	[thread overview]
Message-ID: <178098926430.1.13284498433202944206.rpms-ghc9.10-8c4d9ef8cc00@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/ghc9.10
Branch : f44
Commit : 8c4d9ef8cc002ea83cae7bdaded8b336cf1298d5
Author : Jens Petersen <petersen@redhat.com>
Date   : 2026-06-08T21:34:16+02:00
Stats  : +40/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ghc9.10/c/8c4d9ef8cc002ea83cae7bdaded8b336cf1298d5?branch=f44

Log:
fix build with sphinx9 (sterni)

---
diff --git a/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch b/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
new file mode 100644
index 0000000..5b6255f
--- /dev/null
+++ b/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
@@ -0,0 +1,31 @@
+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
+@@ -32,7 +32,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 %}
+ 
+-- 
+GitLab
+

diff --git a/ghc9.10.spec b/ghc9.10.spec
index 90e3382..4c46156 100644
--- a/ghc9.10.spec
+++ b/ghc9.10.spec
@@ -76,7 +76,7 @@ Version: %{ghc_major}.%{ghc_patchlevel}
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD-3-Clause AND HaskellReport
@@ -97,6 +97,10 @@ Patch3: ghc-gen_contents_index-nodocs.patch
 # https://gitlab.haskell.org/ghc/ghc/-/issues/26792 (hadrian speedhack)
 Patch4: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15370.patch
 
+# sphinx9
+Patch9: https://gitlab.haskell.org/ghc/ghc/-/commit/e8f5a45de561ec80c88cd3da2c66502deb32d4c3.patch
+
+# ix86
 Patch10: ghc-9.8.4-ix86-disables-Unique-Word64.patch
 
 # for unregisterized
@@ -423,6 +427,7 @@ Installing this package causes %{name}-*-prof packages corresponding to
 #%%patch -P2 -p1 -b .orig
 %patch -P3 -p1 -b .orig
 %patch -P4 -p1 -b .orig
+%patch -P9 -p1 -b .orig
 
 rm libffi-tarballs/libffi-*.tar.gz
 
@@ -881,6 +886,9 @@ make test
 
 
 %changelog
+* Mon Jun 08 2026 Jens Petersen <petersen@redhat.com> - 9.10.3-14
+- f45: fix build with sphinx 9
+
 * Sat Feb 14 2026 Jens Petersen <petersen@redhat.com> - 9.10.3-13
 - rebuild with ghc-rpm-macros-2.11
 

                 reply	other threads:[~2026-06-09  7:14 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=178098926430.1.13284498433202944206.rpms-ghc9.10-8c4d9ef8cc00@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