[kaya] fix patch to REPL.hs

Jochen Schmitt s4504kr at fedoraproject.org
Tue Aug 27 19:35:48 UTC 2013


commit 57190e8d3a658b8c3a186c4d0403df1cfc0a1a60
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Aug 27 21:35:32 2013 +0200

    fix patch to REPL.hs

 kaya-0.5.2-ghc76.patch |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
index 4a1009c..33fe890 100644
--- a/kaya-0.5.2-ghc76.patch
+++ b/kaya-0.5.2-ghc76.patch
@@ -1,6 +1,6 @@
 diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
---- kaya-0.5.2/compiler/Module.hs.ghc76	2013-08-27 19:21:23.940053299 +0200
-+++ kaya-0.5.2/compiler/Module.hs	2013-08-27 20:06:22.148325901 +0200
+--- kaya-0.5.2/compiler/Module.hs.ghc76	2013-08-27 21:33:00.658326051 +0200
++++ kaya-0.5.2/compiler/Module.hs	2013-08-27 21:33:00.689323999 +0200
 @@ -14,8 +14,9 @@ module Module(importVersion, findFile, f
                getAllLibDirs, linkFiles, getObjs) where
  
@@ -23,7 +23,7 @@ diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
  -- KAYA_LIBRARY_PATH environment variable.
 diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portability64.hs
 --- kaya-0.5.2/compiler/Portability64.hs.ghc76	2009-04-12 12:02:24.000000000 +0200
-+++ kaya-0.5.2/compiler/Portability64.hs	2013-08-27 20:50:43.103460218 +0200
++++ kaya-0.5.2/compiler/Portability64.hs	2013-08-27 21:33:00.692323801 +0200
 @@ -5,12 +5,14 @@ import System.IO
  import System.Environment
  import qualified Data.Map as Map
@@ -40,14 +40,14 @@ diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portabil
  
  tempfile :: IO (FilePath, Handle)
  tempfile = do env <- environment "TMPDIR"
-diff -up kaya-0.5.2/compiler/REPL.hs.in.haskell98.ghc76 kaya-0.5.2/compiler/REPL.hs.in.haskell98
---- kaya-0.5.2/compiler/REPL.hs.in.haskell98.ghc76	2013-08-27 20:46:52.615742178 +0200
-+++ kaya-0.5.2/compiler/REPL.hs.in.haskell98	2013-08-27 20:48:30.549247731 +0200
-@@ -35,6 +35,8 @@ import IO
+diff -up kaya-0.5.2/compiler/REPL.hs.in.ghc76 kaya-0.5.2/compiler/REPL.hs.in
+--- kaya-0.5.2/compiler/REPL.hs.in.ghc76	2013-08-27 21:33:35.693007532 +0200
++++ kaya-0.5.2/compiler/REPL.hs.in	2013-08-27 21:34:53.229876977 +0200
+@@ -35,6 +35,8 @@ import System.IO
  import @readlinemodule@
  import System.Directory
  
-+Import Control.Exception
++import Control.Exception
 +
  foreign import ccall "repl_load.h" interp_load :: Ptr CChar -> IO ()
  foreign import ccall "repl_load.h" interp_close :: IO ()
@@ -57,7 +57,7 @@ diff -up kaya-0.5.2/compiler/REPL.hs.in.haskell98.ghc76 kaya-0.5.2/compiler/REPL
                       let xinft = subst phi ity
                       catch (runProg xfn xinft)
 -                           (\e -> putStrLn(show e))
-+                           (\(e :: SomeException) -> putStrLn(show e))
++                           (\ (e :: SomeException)  -> putStrLn(show e))
                    Failure err file line -> do reportError err
      processREPL (Failure err file line)
          = do reportError err


More information about the scm-commits mailing list