From 18a24cd443a27d7ccc0601e1688e1701c7f7409a38b1c7b1a01e084ebb5e1f2e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 18 Jan 2023 12:09:32 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/ghc revision 96 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=918b5d89f290402eb2d39f50c3d1d58f --- fix_extlinks.patch | 34 ++++++++++++++++++++++++++++++++++ ghc.changes | 10 ++++++++++ ghc.spec | 3 +++ 3 files changed, 47 insertions(+) create mode 100644 fix_extlinks.patch diff --git a/fix_extlinks.patch b/fix_extlinks.patch new file mode 100644 index 0000000..dcd5315 --- /dev/null +++ b/fix_extlinks.patch @@ -0,0 +1,34 @@ +Index: ghc-8.10.7/docs/users_guide/ghc_config.py.in +=================================================================== +--- ghc-8.10.7.orig/docs/users_guide/ghc_config.py.in ++++ ghc-8.10.7/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' +Index: ghc-8.10.7/libraries/Cabal/Cabal/doc/conf.py +=================================================================== +--- ghc-8.10.7.orig/libraries/Cabal/Cabal/doc/conf.py ++++ ghc-8.10.7/libraries/Cabal/Cabal/doc/conf.py +@@ -24,12 +24,12 @@ master_doc = 'index' + + # extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html + extlinks = { +- 'issue': ('https://github.com/haskell/cabal/issues/%s', '#'), ++ 'issue': ('https://github.com/haskell/cabal/issues/%s', '#%s'), + +- 'ghc-wiki': ('http://ghc.haskell.org/trac/ghc/wiki/%s', ''), +- 'ghc-ticket': ('http://ghc.haskell.org/trac/ghc/ticket/%s', 'GHC #'), ++ 'ghc-wiki': ('http://ghc.haskell.org/trac/ghc/wiki/%s', None), ++ 'ghc-ticket': ('http://ghc.haskell.org/trac/ghc/ticket/%s', 'GHC #%s'), + +- 'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''), ++ 'hackage-pkg': ('http://hackage.haskell.org/package/%s', None), + } + + # General information about the project. diff --git a/ghc.changes b/ghc.changes index f60f8d1..24957fa 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 17 11:45:32 UTC 2023 - Peter Simons + +- Apply "fix_extlinks.patch" to work around a bug in Sphinx 6.1.x + that broke our documentation build. Remove this patch once Sphinx + is fixed. This patch is a variant of the ghc-9.4.4 patch from + https://gitlab.haskell.org/ghc/ghc/-/issues/22766. Upstream's + https://github.com/sphinx-doc/sphinx/issues/11094 has further + details. [boo#1207214] + ------------------------------------------------------------------- Mon Jun 27 17:04:51 UTC 2022 - Dirk Müller diff --git a/ghc.spec b/ghc.spec index a5e807f..9da5fc8 100644 --- a/ghc.spec +++ b/ghc.spec @@ -74,6 +74,8 @@ PreReq: update-alternatives Requires: ghc-compiler = %{version}-%{release} Requires: ghc-ghc-devel = %{version}-%{release} Requires: ghc-libraries = %{version}-%{release} +# Work around a bug in Sphinx 6.1.x to fix the documentation build. Remove this patch ASAP. +Patch1: fix_extlinks.patch # PATCH-FIX-OPENSUSE: use vfpv3-d16 and disable NEON Patch2: ghc-armv7-VFPv3D16--NEON.patch # PATCH-FIX-UPSTREAM Disable-unboxed-arrays.patch ptrommler@icloud.com -- Do not use unboxed arrays on big-endian platforms. See Haskell Trac #15411. @@ -189,6 +191,7 @@ except the ghc library, which is installed by the toplevel ghc metapackage. %prep %setup -q +%patch1 -p1 %patch2 -p1 %ifarch ppc64 s390 s390x %patch3 -p1