diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2010-07-02 11:58:22 +0400 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2010-07-02 11:58:22 +0400 |
| commit | fabaca0eac623540e8c4cfbb39e0b3064a4c0553 (patch) | |
| tree | 3a0c6b7038f53893a7aaa0f1d84031d71eb363fc /p/haskell-haddock/debian | |
| parent | e4241da7dfab5e660c10b93577dc3ea6e00318af (diff) | |
| download | DHG_packages-fabaca0eac623540e8c4cfbb39e0b3064a4c0553.tar.gz | |
haskell-haddock: Further patch around missing ghci support, complete patch taken from getallinfo-nothing-ghci-566331 in ghc6.
Diffstat (limited to 'p/haskell-haddock/debian')
| -rw-r--r-- | p/haskell-haddock/debian/changelog | 7 | ||||
| -rw-r--r-- | p/haskell-haddock/debian/patches/build_without_ghci.patch | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/p/haskell-haddock/debian/changelog b/p/haskell-haddock/debian/changelog index c66815e43..2b08b4b45 100644 --- a/p/haskell-haddock/debian/changelog +++ b/p/haskell-haddock/debian/changelog @@ -1,3 +1,10 @@ +haskell-haddock (2.7.2-4) UNRELEASED; urgency=low + + * Further patch around missing ghci support, complete patch taken from + getallinfo-nothing-ghci-566331 in ghc6. + + -- Joachim Breitner <nomeata@debian.org> Fri, 02 Jul 2010 09:57:42 +0200 + haskell-haddock (2.7.2-3) unstable; urgency=low * Patch around missing ghci support, reusing a patch by Marco Túlio Gontijo diff --git a/p/haskell-haddock/debian/patches/build_without_ghci.patch b/p/haskell-haddock/debian/patches/build_without_ghci.patch index ab8a85de9..76d971cfd 100644 --- a/p/haskell-haddock/debian/patches/build_without_ghci.patch +++ b/p/haskell-haddock/debian/patches/build_without_ghci.patch @@ -63,3 +63,19 @@ Index: haskell-haddock-2.7.2/haddock.cabal hs-source-dirs: src extensions: CPP, PatternGuards, DeriveDataTypeable, ScopedTypeVariables, MagicHash +Index: haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs +=================================================================== +--- haskell-haddock-2.7.2.orig/src/Haddock/Interface/Create.hs 2010-03-20 15:47:22.000000000 +0100 ++++ haskell-haddock-2.7.2/src/Haddock/Interface/Create.hs 2010-07-02 09:57:33.000000000 +0200 +@@ -501,7 +501,11 @@ + Nothing -> do + -- If we can't find the declaration, it must belong to + -- another package ++#ifdef GHCI + mbTyThing <- liftGhcToErrMsgGhc $ lookupName t ++#else ++ mbTyThing <- liftGhcToErrMsgGhc $ lookupGlobalName t ++#endif + -- show the name as exported as well as the name's + -- defining module (because the latter is where we + -- looked for the .hi/.haddock). It's to help people |