[Pkg-haskell-commits] darcs: ghc: Removing patch haddock-no-irrefutable-docname

[Joachim Breitner]

Sat Jan 15 07:08:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Removing patch haddock-no-irrefutable-docname
  Ignore-this: a7cb3d0e77d0cbecfbfecdf9854f1849
  The patched haddock code has changed a lot. Probably fixed by now.

    R ./patches/haddock-no-irrefutable-docname
    M ./patches/series -1

Sat Jan 15 07:08:00 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Removing patch haddock-no-irrefutable-docname
  Ignore-this: a7cb3d0e77d0cbecfbfecdf9854f1849
  The patched haddock code has changed a lot. Probably fixed by now.
diff -rN -u old-ghc/patches/haddock-no-irrefutable-docname new-ghc/patches/haddock-no-irrefutable-docname
--- old-ghc/patches/haddock-no-irrefutable-docname	2011-01-15 07:13:00.003631018 +0000
+++ new-ghc/patches/haddock-no-irrefutable-docname	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Index: ghc6-6.12.1/utils/haddock/src/Haddock/Backends/Html.hs
-===================================================================
---- ghc6-6.12.1.orig/utils/haddock/src/Haddock/Backends/Html.hs	2010-02-09 12:27:23.000000000 +0200
-+++ ghc6-6.12.1/utils/haddock/src/Haddock/Backends/Html.hs	2010-02-09 12:29:30.000000000 +0200
-@@ -1855,7 +1855,7 @@
-           case maybe_wiki_url of
-             Nothing  -> Html.emptyTable
-             Just url -> tda [theclass "declbut"] <<
--                          let url' = spliceURL (Just fname) (Just mdl)
-+                          let url' = spliceURL (Just fname) mdl
-                                                (Just n) (Just loc) url
-                            in anchor ! [href url'] << toHtml "Comments"
-   
-@@ -1865,8 +1865,9 @@
-         -- the module defining the type family, which is wrong.
-         origMod = nameModule n
- 
--        -- Name must be documented, otherwise we wouldn't get here
--        Documented n mdl = name
-+        (n,mdl) = case name of
-+                    Documented n' mdl' -> (n', Just mdl')
-+                    Undocumented n' -> (n', Nothing)
- 
-         fname = unpackFS (srcSpanFile loc)
- 
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 07:13:00.003631018 +0000
+++ new-ghc/patches/series	2011-01-15 07:13:00.031632493 +0000
@@ -2,7 +2,6 @@
 panic-debian-message
 kfreebsd-_gnu_source-565818
 getallinfo-nothing-ghci-566331
-haddock-no-irrefutable-docname
 haddock-hardcode-ghc-paths
 ghc-6.12.3-ia64-fixed-relax
 ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper