[gentoo-commits] gentoo-x86 commit in dev-haskell/haskeline/files: haskeline-0.6.4.7-ghc-6.12.patch haskeline-0.6.4.7-ghc-7.6.patch haskeline-0.6.4.7-ghc-7.5.patch

["Sergei Trofimovich (slyfox)" <slyfox@gentoo.org>]

slyfox      12/10/23 10:51:57

  Added:                haskeline-0.6.4.7-ghc-6.12.patch
                        haskeline-0.6.4.7-ghc-7.6.patch
                        haskeline-0.6.4.7-ghc-7.5.patch
  Log:
  Fix build failure against ghc-6.12 (bug #435128 by Vicente Olivert Riera).
  
  (Portage version: 2.2.0_alpha133_p5/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch?rev=1.1&content-type=text/plain

Index: haskeline-0.6.4.7-ghc-6.12.patch
===================================================================
Workarounds build failure for ghc-6.12

[18 of 27] Compiling System.Console.Haskeline.Backend.Terminfo ( System/Console/Haskeline/Backend/Terminfo.hs, dist/build/System/Console/Haskeline/Backend/Terminfo.o )

System/Console/Haskeline/Backend/Terminfo.hs:200:9:
    Inferred type is less polymorphic than expected
          Quantified type variable `m' escapes
              In the expression: Writer.tell
                  In the definition of `output': output = Writer.tell
diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs
index 1bd0373..d01e9ba 100644
--- a/System/Console/Haskeline/Backend/Terminfo.hs
+++ b/System/Console/Haskeline/Backend/Terminfo.hs
@@ -197,7 +197,7 @@ runActionT m = do
     return x
 
 output :: TermAction -> ActionM ()
-output = Writer.tell
+output = \x -> Writer.tell x
 
 outputText :: String -> ActionM ()
 outputText str = posixEncode str >>= output . const . termText . B.unpack



1.1                  dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch?rev=1.1&content-type=text/plain

Index: haskeline-0.6.4.7-ghc-7.6.patch
===================================================================
diff --git a/haskeline.cabal b/haskeline.cabal
index 2fa8d2e..0f43bfe 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -50,7 +50,7 @@ Library
     }
     else {
         if impl(ghc>=6.11) {
-            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
+            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.3,
                            bytestring>=0.9 && < 0.11
         }
         else {
@@ -102,7 +102,7 @@ Library
         install-includes: win_console.h
         cpp-options: -DMINGW
     } else {
-        Build-depends: unix>=2.0 && < 2.6
+        Build-depends: unix>=2.0 && < 2.7
                         -- unix-2.3 doesn't build on ghc-6.8.1 or earlier
         c-sources: cbits/h_iconv.c
                    cbits/h_wcwidth.c



1.1                  dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch?rev=1.1&content-type=text/plain

Index: haskeline-0.6.4.7-ghc-7.5.patch
===================================================================
--- haskeline-0.6.4.7-orig/haskeline.cabal	2012-05-14 04:29:12.000000000 +1000
+++ haskeline-0.6.4.7/haskeline.cabal	2012-06-30 22:20:29.154377863 +1000
@@ -50,7 +50,7 @@
     }
     else {
         if impl(ghc>=6.11) {
-            Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
+            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
                            bytestring>=0.9 && < 0.11
         }
         else {
--- haskeline-0.6.4.7-orig/System/Console/Haskeline/Monads.hs	2012-05-14 04:29:12.000000000 +1000
+++ haskeline-0.6.4.7/System/Console/Haskeline/Monads.hs	2012-06-30 22:21:34.478861860 +1000
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module System.Console.Haskeline.Monads(
                 module Control.Monad.Trans,
                 module System.Console.Haskeline.MonadException,
@@ -18,7 +19,9 @@
 
 import Control.Monad.Trans
 import System.Console.Haskeline.MonadException
+#if !MIN_VERSION_base(4,6,0)
 import Prelude hiding (catch)
+#endif
 
 import Control.Monad.Reader hiding (MonadReader,ask,asks,local)
 import qualified Control.Monad.Reader as Reader
--- haskeline-0.6.4.7-orig/System/Console/Haskeline/MonadException.hs	2012-05-14 04:29:12.000000000 +1000
+++ haskeline-0.6.4.7/System/Console/Haskeline/MonadException.hs	2012-06-30 22:21:29.657752340 +1000
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- | This module redefines some of the functions in "Control.Exception.Extensible" to
 work for more general monads than only 'IO'.
 -}
@@ -18,7 +19,9 @@
 
 import qualified Control.Exception.Extensible as E
 import Control.Exception.Extensible(Exception,SomeException)
+#if !MIN_VERSION_base(4,6,0)
 import Prelude hiding (catch)
+#endif
 import Control.Monad.Reader
 import Control.Monad.State
 import Control.Concurrent(ThreadId)