[Pkg-haskell-commits] darcs: gitit: Comment out type signature in readFile function

[Giovanni Mascellani]

Wed Apr 25 15:33:44 UTC 2012  Giovanni Mascellani <gio at debian.org>
  * Comment out type signature in readFile function
  Ignore-this: 523115c21c90a4ed876e40a9d3d7b15d
  Ubuntu patch by Iain Lane.

    M ./changelog +9
    A ./patches/
    A ./patches/comment-type-signature
    A ./patches/series

Wed Apr 25 15:33:44 UTC 2012  Giovanni Mascellani <gio at debian.org>
  * Comment out type signature in readFile function
  Ignore-this: 523115c21c90a4ed876e40a9d3d7b15d
  Ubuntu patch by Iain Lane.
diff -rN -u old-gitit//changelog new-gitit//changelog
--- old-gitit//changelog	2012-04-25 15:45:04.463287917 +0000
+++ new-gitit//changelog	2012-04-25 15:45:04.470767452 +0000
@@ -1,3 +1,12 @@
+gitit (0.9-2) UNRELEASED; urgency=low
+
+  * Add a new patch to comment out a type signature which, when present,
+    causes the build to fail at the documentation generation stage. This is
+    due to an as-yet undiscovered bug elsewhere in the stack. The patch was
+    written by Iain Lane for the Ubuntu package.
+
+ -- Giovanni Mascellani <gio at debian.org>  Wed, 25 Apr 2012 16:47:54 +0200
+
 gitit (0.9-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-gitit//patches/comment-type-signature new-gitit//patches/comment-type-signature
--- old-gitit//patches/comment-type-signature	1970-01-01 00:00:00.000000000 +0000
+++ new-gitit//patches/comment-type-signature	2012-04-25 15:45:04.475250883 +0000
@@ -0,0 +1,26 @@
+Description: Comment out type signature in readFile function
+ When this type signature is present, a bug elsewhere (possibly in Haddock)
+ causes the document generation (and thus the build) to fail with a message
+ about this function's use of the FlexibleContexts extension to Haskell. If we
+ comment it out then the bug is not triggered and everything still works
+ because GHC can infer the type of the function.
+Author: Iain Lane <laney at debian.org>
+Forwarded: no
+
+--- gitit-0.9.0.1.orig/Network/Gitit/Config.hs
++++ gitit-0.9.0.1/Network/Gitit/Config.hs
+@@ -50,10 +50,10 @@ getConfigFromFile fname = do
+   readfile cp fname >>= extractConfig . forceEither
+ 
+ -- | A version of readfile that treats the file as UTF-8.
+-readfile :: MonadError CPError m
+-          => ConfigParser
+-          -> FilePath
+-          -> IO (m ConfigParser)
++-- readfile :: MonadError CPError m
++--           => ConfigParser
++--           -> FilePath
++--           -> IO (m ConfigParser)
+ readfile cp path' = do
+   contents <- readFileUTF8 path'
+   return $ readstring cp contents
diff -rN -u old-gitit//patches/series new-gitit//patches/series
--- old-gitit//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-gitit//patches/series	2012-04-25 15:45:04.475250883 +0000
@@ -0,0 +1 @@
+comment-type-signature