misc/ghc-6.5-patch

   1 --- Haskell/Makefile.am 2006-09-02 23:50:38.000000000 -0700
   2 +++ Haskell/Makefile.am 2003-11-03 12:49:54.000000000 -0800
   3 @@ -3,7 +3,8 @@
   4
   5  JVMFILE                        = $(datadir)/current.jvm
   6
   7 +#HCPACKAGES            = -package lang -package concurrent
   8 +HCPACKAGES             = -package rts
   9 -HCPACKAGES             = -package lang -package concurrent
  10  HCIMPORTDIRS   = -i.
  11  HCCOPTS                        = -I$(includedir_FIX) $${JVM_INCLUDES}
  12  HCHOPTS                        = -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
  13 diff -u ./MonadException.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/MonadException.hs
  14 --- Haskell/MonadException.hs   2006-09-02 23:42:19.000000000 -0700
  15 +++ Haskell/MonadException.hs   2002-01-28 18:21:35.000000000 -0800
  16 @@ -20,7 +20,7 @@
  17
  18  module MonadException where
  19         {
  20 +       import Control.Exception as Exception;
  21 -       import Exception;
  22
  23         -- much like MonadError, but without the fundep
  24         class (Monad m) => MonadException ex m where
  25 diff -u ./TypedCallback.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedCallback.hs
  26 --- Haskell/TypedCallback.hs    2006-09-02 23:43:13.000000000 -0700
  27 +++ Haskell/TypedCallback.hs    2002-08-05 17:27:04.000000000 -0700
  28 @@ -33,8 +33,8 @@
  29         import VMLayer;
  30         import JavaLayer;
  31         import BasicLayer;
  32 +       import Control.Concurrent as Concurrent;
  33 +       import Control.Exception as Exception;
  34 -       import Concurrent;
  35 -       import Exception;
  36
  37  {--
  38         data CallbackClass t = MkCallbackClass JClass;
  39 diff -u ./TypedLayer.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedLayer.hs
  40 --- Haskell/TypedLayer.hs       2006-09-02 23:44:06.000000000 -0700
  41 +++ Haskell/TypedLayer.hs       2002-01-28 18:21:35.000000000 -0800
  42 @@ -60,7 +60,7 @@
  43         import VMLayer;
  44         import JavaLayer;
  45         import BasicLayer;
  46 +       import Control.Monad.Error;
  47 -       import MonadError;
  48
  49         runJavaClass :: (IsJVMMonad m) => ClassName -> [JString] -> m ();
  50         runJavaClass className args = do
  51