[haddock] patch for ghc-7.8.3
Jens Petersen
petersen at fedoraproject.org
Wed Sep 3 02:49:02 UTC 2014
commit f0e1d27bb8a433c712e8e9bd6e16027080f5820a
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Sep 3 11:48:48 2014 +0900
patch for ghc-7.8.3
https://github.com/haskell/haddock/issues/324
haddock-ghc78.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
haddock.spec | 3 ++
2 files changed, 65 insertions(+), 0 deletions(-)
---
diff --git a/haddock-ghc78.patch b/haddock-ghc78.patch
new file mode 100644
index 0000000..2b3d6c2
--- /dev/null
+++ b/haddock-ghc78.patch
@@ -0,0 +1,62 @@
+diff -up haddock-2.14.3/src/Haddock/Convert.hs~ haddock-2.14.3/src/Haddock/Convert.hs
+--- haddock-2.14.3/src/Haddock/Convert.hs~ 2014-07-18 09:07:19.000000000 +0900
++++ haddock-2.14.3/src/Haddock/Convert.hs 2014-09-03 11:19:41.973000000 +0900
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE CPP, PatternGuards #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Haddock.Convert
+@@ -94,10 +94,19 @@ tyThingToLHsDecl t = noLoc $ case t of
+ (synifyType ImplicitizeForAll (dataConUserType dc)))
+
+ AConLike (PatSynCon ps) ->
++#if MIN_VERSION_ghc(7,8,3)
++ let (_, _, (req_theta, prov_theta)) = patSynSig ps
++#else
+ let (_, _, req_theta, prov_theta, _, res_ty) = patSynSig ps
++#endif
+ in SigD $ PatSynSig (synifyName ps)
++#if MIN_VERSION_ghc(7,8,3)
++ (fmap (synifyType WithinType) (patSynTyDetails ps))
++ (synifyType WithinType (patSynType ps))
++#else
+ (fmap (synifyType WithinType) (patSynTyDetails ps))
+ (synifyType WithinType res_ty)
++#endif
+ (synifyCtx req_theta)
+ (synifyCtx prov_theta)
+
+diff -up haddock-2.14.3/src/Haddock/Interface/Create.hs~ haddock-2.14.3/src/Haddock/Interface/Create.hs
+--- haddock-2.14.3/src/Haddock/Interface/Create.hs~ 2014-07-18 09:07:19.000000000 +0900
++++ haddock-2.14.3/src/Haddock/Interface/Create.hs 2014-09-03 11:23:38.894000000 +0900
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TupleSections, BangPatterns #-}
++{-# LANGUAGE CPP, TupleSections, BangPatterns #-}
+ {-# OPTIONS_GHC -Wwarn #-}
+ -----------------------------------------------------------------------------
+ -- |
+@@ -364,7 +364,11 @@ classDecls class_ = filterDecls . collec
+ where
+ decls = docs ++ defs ++ sigs ++ ats
+ docs = mkDecls tcdDocs DocD class_
++#if MIN_VERSION_ghc(7,8,3)
++ defs = mkDecls (map snd . bagToList . tcdMeths) ValD class_
++#else
+ defs = mkDecls (bagToList . tcdMeths) ValD class_
++#endif
+ sigs = mkDecls tcdSigs SigD class_
+ ats = mkDecls tcdATs (TyClD . FamDecl) class_
+
+@@ -390,7 +394,11 @@ ungroup group_ =
+ mkDecls hs_docs DocD group_ ++
+ mkDecls hs_instds InstD group_ ++
+ mkDecls (typesigs . hs_valds) SigD group_ ++
++#if MIN_VERSION_ghc(7,8,3)
++ mkDecls (map snd . valbinds . hs_valds) ValD group_
++#else
+ mkDecls (valbinds . hs_valds) ValD group_
++#endif
+ where
+ typesigs (ValBindsOut _ sigs) = filter isVanillaLSig sigs
+ typesigs _ = error "expected ValBindsOut"
diff --git a/haddock.spec b/haddock.spec
index 0c347fe..9d07ce1 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -15,6 +15,7 @@ Summary: A documentation-generation tool for Haskell libraries
License: BSD
Url: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0: haddock-ghc78.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -61,6 +62,7 @@ This package provides the Haskell %{name} library development files.
%prep
%setup -q
+%patch0 -p1 -b .orig
%build
@@ -115,6 +117,7 @@ mv %{buildroot}%{_bindir}/%{name}{,-%{version}}
%changelog
* Fri Aug 29 2014 Jens Petersen <petersen at redhat.com> - 2.14.3-1
- update to 2.14.3
+- patch for ghc-7.8.3
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list