<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2509f250fb6f970e00618a23ad2605bd325a73b3">https://github.com/macports/macports-ports/commit/2509f250fb6f970e00618a23ad2605bd325a73b3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2509f250fb6 cabal: Fix sphinx bug in User Manual creation
</span>2509f250fb6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2509f250fb6f970e00618a23ad2605bd325a73b3
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Jan 15 17:02:57 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> cabal: Fix sphinx bug in User Manual creation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * See: https://trac.macports.org/ticket/66680#comment:12
</span>---
lang/cabal/Portfile | 10 +++++++++-
lang/cabal/files/patch-doc_conf_py.diff | 19 +++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/cabal/Portfile b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ad7c50379fb..77ba9e9cb5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name cabal
version 3.8.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories lang haskell devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,6 +148,13 @@ if {${name} eq ${subport}} {
</span> delete ${haskell_cabal.cabal_root}/bin/ghc-pkg
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/66680#comment:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # please remove afer this this sphinx issue is fixed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/haskell/cabal/issues/8681
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # diff -NaurdwB ./cabal-orig/doc/conf.py ./cabal-new/doc/conf.py | sed -E -e 's/\.\/cabal-(orig|new)/\./' | sed -E -e 's|/opt/local|@PREFIX@|g' > ~/Downloads/patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> haskell_cabal.env \
"CABAL_CONFIG=${haskell_cabal.cabal_root}/config" \
"GHC=${prefix}/bin/ghc"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,6 +190,7 @@ if {${name} eq ${subport}} {
</span> }
subport cabal-prebuilt {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> supported_archs arm64 x86_64
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/cabal/files/patch-doc_conf_py.diff b/lang/cabal/files/patch-doc_conf_py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aee88714788
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/cabal/files/patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./doc/conf.py 2023-01-15 15:54:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./doc/conf.py 2023-01-15 15:57:09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,12 +28,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extlinks = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'issue': ('https://github.com/haskell/cabal/issues/%s', '#'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'issue': ('https://github.com/haskell/cabal/issues/%s', '#%s'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', ''),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', None),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #%s'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'hackage-pkg': ('http://hackage.haskell.org/package/%s', None),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # General information about the project.
</span></pre><pre style='margin:0'>
</pre>