rpms/haddock/devel haddock-2.0.0.0-ghc683-process.patch,NONE,1.1

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13484

Added Files:
	haddock-2.0.0.0-ghc683-process.patch 
Log Message:
add haddock-2.0.0.0-ghc683-process.patch


haddock-2.0.0.0-ghc683-process.patch:

--- NEW FILE haddock-2.0.0.0-ghc683-process.patch ---
diff -up haddock-2.0.0.0/haddock.cabal~ haddock-2.0.0.0/haddock.cabal
--- haddock-2.0.0.0/haddock.cabal~	2008-01-08 04:35:53.000000000 +1000
+++ haddock-2.0.0.0/haddock.cabal	2008-06-26 13:13:35.000000000 +1000
@@ -20,7 +20,8 @@ build-depends:
   directory,
   pretty,
   containers,
-  array
+  array,
+  process
 extensions:           CPP, PatternGuards
 ghc-options:          -fglasgow-exts
 hs-source-dirs:       src
diff -up haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs~ haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs
--- haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs~	2008-01-08 04:35:53.000000000 +1000
+++ haddock-2.0.0.0/src/Haddock/GHC/Typecheck.hs	2008-06-26 14:48:40.000000000 +1000
@@ -23,6 +23,7 @@ import SrcLoc
 
 import Data.List
 
+import FastString
 
 type CheckedMod = (Module, FilePath, FullyCheckedMod)
 
@@ -69,7 +70,7 @@ mkGhcModule :: CheckedMod -> DynFlags ->
 mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
   ghcModule         = mod,
   ghcFilename       = file,
-  ghcMbDocOpts      = mbOpts,
+  ghcMbDocOpts      = fmap unpackFS mbOpts,
   ghcHaddockModInfo = info,
   ghcMbDoc          = mbDoc,
   ghcGroup          = group,
@@ -79,6 +80,6 @@ mkGhcModule (mod, file, checkedMod) dynf
   ghcInstances      = modInfoInstances modInfo
 }
   where
-    HsModule _ _ _ _ _ mbOpts _ _      = unLoc parsed
+    HsModule _ _ _ _ mbOpts _ _      = unLoc parsed
     (group, _, mbExports, mbDoc, info) = renamed
     (parsed, renamed, _, modInfo)      = checkedMod