pool/ghc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1059044 from devel:languages:haskell

Browse Source 
version update

OBS-URL: https://build.opensuse.org/request/show/1059044
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2023-01-18 12:09:32 +00:00 committed by Git OBS Bridge
commit 5417b2aaf2
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fix_extlinks.patch Normal file
View File

@ -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.

10
ghc.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jan 17 11:45:32 UTC 2023 - Peter Simons <psimons@suse.com>
- 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 <dmueller@suse.com>

3
ghc.spec
View File

@ -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