Ticket #1231: get-rid-of-haskell98-dependency.dpatch

7 patches for repository http://code.haskell.org/gtk2hs:

Thu Aug 11 22:05:47 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Get rid of haskell98 dependency
  
  This is needed for GHC 7.2.1 compatibility.
  

Thu Aug 11 22:10:59 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Drop haskell98 dependency from glib

Thu Aug 11 22:12:27 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Drop spurious dependency on haskell98 from cairo

Thu Aug 11 22:13:55 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Drop spurious haskell98 dependency from pango

Thu Aug 11 22:15:24 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Drop spurious haskell98 dependency from gio

Thu Aug 11 22:26:02 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Drop spurious haskell98 dependency from gtk

Thu Aug 11 22:26:06 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
  * Fix a build failure under GHC 7.2

New patches:

[Get rid of haskell98 dependency
Bryan O'Sullivan <bos@serpentine.com>**20110812050547
 Ignore-this: a32cb65a458849c10fc527400637d48b
 
 This is needed for GHC 7.2.1 compatibility.
 
] hunk ./tools/c2hs/base/general/FastMutInt.hs 1
+{-# LANGUAGE BangPatterns #-}
 {-# OPTIONS -cpp -fglasgow-exts #-}
 --
 -- (c) The University of Glasgow 2002
hunk ./tools/c2hs/base/general/FileOps.hs 35
 where
 
 -- standard libs
-import Char      (chr, ord)
-import Directory (doesFileExist)
-import IO       (Handle, IOMode(..), openFile)
-import Monad    (liftM)
-import Random    (newStdGen, randomRs)
+import Data.Char      (chr, ord)
+import System.Directory (doesFileExist)
+import System.IO        (Handle, IOMode(..), openFile)
+import Control.Monad    (liftM)
+import System.Random    (newStdGen, randomRs)
 
 import FNameOps  (dirname, stripDirname, addPath)
 
hunk ./tools/c2hs/base/general/UNames.hs 58
               saveRootNameSupply, restoreRootNameSupply)
 where
 
-import Monad  (when)
-import Ix
+import Control.Monad  (when)
+import Data.Ix
 import System.IO.Unsafe (unsafePerformIO)
 import Data.IORef       (IORef, newIORef, readIORef, writeIORef)
 import Binary (Binary(..))
hunk ./tools/c2hs/base/state/CIO.hs 75
            fileFindInCIO, mktempCIO)
 where
 
-import IO
-import Directory
-import System
-#if __GLASGOW_HASKELL__ >= 612
-import System.IO (hSetEncoding, latin1)
-#endif
+import System.Directory
+import System.Environment
+import System.Exit
+import System.IO
+import System.IO.Error
+import System.Process
 
 import FileOps  (fileFindIn, mktemp)
 import StateBase (PreCST, liftIO)
hunk ./tools/c2hs/base/state/State.hs 72
              getNameSupply)
 where
 
-import Ix
-import Monad       (when)
-import List        (sort)
+import Data.Ix
+import Control.Monad       (when)
+import Data.List        (sort)
 
 import BaseVersion (version, copyright, disclaimer)
 import Config     (errorLimit)
hunk ./tools/c2hs/base/state/StateTrans.hs 82
                   MVar, newMV, readMV, assignMV)
 where
 
-import Monad      (liftM)
+import Control.Monad      (liftM)
 import System.IO  (fixIO)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
 
hunk ./tools/c2hs/base/syms/Attributes.hs 91
                   getGenAttr, setGenAttr, updGenAttr) 
 where
 
-import Array
+import Data.Array
 import Control.Exception (assert)
 import Position   (Position, Pos(posOf), nopos, isNopos, dontCarePos, 
                   isDontCarePos)
hunk ./tools/c2hs/base/syms/Idents.hs 66
               getIdentAttrs, dumpIdent)  
 where
 
-import Char
+import Data.Char
 import Position   (Position, Pos(posOf), nopos)
 import UNames     (Name)
 import Errors     (interr)
hunk ./tools/c2hs/base/syntax/Lexers.hs 137
               star, plus, quest, alt, string, LexerState, execLexer)
 where 
 
-import Maybe  (fromMaybe, isNothing)
-import Array  (Ix(..), Array, array, (!), assocs, accumArray)
+import Data.Maybe  (fromMaybe, isNothing)
+import Data.Array  (Ix(..), Array, array, (!), assocs, accumArray)
 
 import Position (Position(..), Pos (posOf), nopos, incPos, tabPos, retPos)
 import DLists (DList, openDL, zeroDL, unitDL, snocDL, joinDL, closeDL)
hunk ./tools/c2hs/c/CAttrs.hs 71
               CObj(..), CTag(..), CDef(..))
 where
 
-import Char      (toUpper)
-import List       (isPrefixOf)
-import Maybe     (mapMaybe)
+import Data.Char         (toUpper)
+import Data.List       (isPrefixOf)
+import Data.Maybe        (mapMaybe)
 
 import Position   (Position, Pos(posOf), nopos, dontCarePos, builtinPos)
 import Errors     (interr)
hunk ./tools/c2hs/c/CLexer.x 67
 
 {
 
+{-# LANGUAGE BangPatterns #-}
+
 module CLexer (lexC, parseError) where
 
hunk ./tools/c2hs/c/CLexer.x 71
-import Char      (isDigit)
+import Data.Char      (isDigit)
 import Numeric   (readDec, readOct, readHex)
 
 import Position  (Position(..), Pos(posOf))
hunk ./tools/c2hs/c/CNames.hs 40
 module CNames (nameAnalysis)
 where
 
-import Monad    (when, mapM_)
+import Control.Monad    (when, mapM_)
 
 import Position  (Position, posOf)
 import Idents   (Ident, identToLexeme)
hunk ./tools/c2hs/c/CTrav.hs 83
              lookupDeclOrTag)
 where
 
-import List       (find)
-import Maybe     (fromMaybe)
-import Monad     (liftM)
+import Data.List       (find)
+import Data.Maybe        (fromMaybe)
+import Control.Monad     (liftM)
 import Control.Exception (assert)
 
 import Position   (Position, Pos(..), nopos)
hunk ./tools/c2hs/chs/CHS.hs 98
 where 
 
 -- standard libraries
-import Char     (isSpace, toUpper, toLower)
-import List     (intersperse)
-import Monad    (when, unless)
+import Data.Char        (isSpace, toUpper, toLower)
+import Data.List        (intersperse)
+import Control.Monad    (when, unless)
 
 -- Compiler Toolkit
 import Position  (Position(..), Pos(posOf), nopos, isBuiltinPos)
hunk ./tools/c2hs/chs/CHSLexer.hs 172
 module CHSLexer (CHSToken(..), lexCHS) 
 where 
 
-import List     ((\\))
-import Char     (isDigit)
-import Monad    (liftM)
+import Data.List        ((\\))
+import Data.Char        (isDigit)
+import Control.Monad    (liftM)
 import Numeric   (readDec, readOct, readHex)
 
 import Position  (Position(..), Pos(posOf), incPos, retPos, tabPos)
hunk ./tools/c2hs/gen/GBMonad.hs 75
   ) where
 
 -- standard libraries
-import Char      (toUpper, toLower, isSpace)
-import List       (find)
-import Maybe     (fromMaybe)
+import Data.Char         (toUpper, toLower, isSpace)
+import Data.List       (find)
+import Data.Maybe        (fromMaybe)
 
 -- Compiler Toolkit
 import Position   (Position, Pos(posOf), nopos, builtinPos)
hunk ./tools/c2hs/gen/GenBind.hs 115
 where 
 
 -- standard libraries
-import Char      (toUpper, toLower, isSpace)
-import List       (deleteBy, intersperse, isPrefixOf, find)
-import Maybe     (isNothing, isJust, fromJust, fromMaybe)
-import Monad     (when, unless, liftM, mapAndUnzipM)
+import Data.Char         (toUpper, toLower, isSpace)
+import Data.List       (deleteBy, intersperse, isPrefixOf, find)
+import Data.Maybe        (isNothing, isJust, fromJust, fromMaybe)
+import Control.Monad     (when, unless, liftM, mapAndUnzipM)
 
 import Data.Bits  ((.&.), (.|.), xor, complement)
 
hunk ./tools/c2hs/gen/GenHeader.hs 51
 ) where 
 
 -- standard libraries
-import Monad     (when)
+import Control.Monad     (when)
 
 -- Compiler Toolkit
 import Position  (Position, Pos(..), nopos)
hunk ./tools/c2hs/state/C2HSState.hs 54
                  putTraceStr, setSwitch, getSwitch) 
 where
 
-import Monad    (when)
+import Control.Monad    (when)
 
 import State
 
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 45
   bitfieldDirection, bitfieldPadding, bitfieldIntSigned, bitfieldAlignment
 ) where
 
-import Ix    (Ix)
-import Array (Array, array)
+import Data.Ix    (Ix)
+import Data.Array (Array, array)
 
 import Foreign (Ptr, FunPtr)
 import Foreign  (Storable(sizeOf, alignment), toBool)
hunk ./tools/c2hs/toplevel/Main.hs 143
 where
 
 -- standard libraries
-import List      (isPrefixOf)
-import IO        ()
-import Monad      (when, unless, mapM)
-import Maybe      (fromJust)
+import Data.List         (isPrefixOf)
+import Control.Monad      (when, unless, mapM)
+import Data.Maybe      (fromJust)
 
 -- base libraries
 import System.Console.GetOpt     
hunk ./tools/gtk2hs-buildtools.cabal 55
         main-is:        Main.hs
         build-depends:  base >= 4 && < 5,
                         process, directory, array, containers, pretty,
-                        haskell98, filepath
+                        random, filepath
         build-tools:    alex, happy
         other-modules:  BaseVersion
                         Config
[Drop haskell98 dependency from glib
Bryan O'Sullivan <bos@serpentine.com>**20110812051059
 Ignore-this: e4e88aca4bf564919e4c03fea52931db
] hunk ./glib/System/Glib/FFI.hs 36
   newForeignPtr,
   withForeignPtrs,
   module Foreign,
-  module Foreign.C
+  module Foreign.C,
+  module System.IO.Unsafe
   ) where
 
 import System.IO.Unsafe (unsafePerformIO)
hunk ./glib/System/Glib/FFI.hs 47
 
 import Foreign.C
 import qualified Foreign hiding (free)
-import Foreign  hiding (with, newForeignPtr, free
+import Foreign  hiding (with, newForeignPtr, free, unsafePerformIO
 #if (__GLASGOW_HASKELL__<606)
     , withObject
 #endif
hunk ./glib/System/Glib/Types.chs 55
   toGObject         :: o -> GObject
   -- | Unchecked downcast.
   unsafeCastGObject :: GObject -> o
-  {-# INLINE toGObject #-}
-  {-# INLINE unsafeCastGObject #-}
 
 instance GObjectClass GObject where
   toGObject = id
hunk ./glib/glib.cabal 36
 
 Library
         build-depends:  base >= 4 && < 5,
-                        containers, haskell98
+                        containers
         build-tools:    gtk2hsC2hs
         cpp-options:     -DHAVE_NEW_CONTROL_EXCEPTION
         if flag(closure_signals)
[Drop spurious dependency on haskell98 from cairo
Bryan O'Sullivan <bos@serpentine.com>**20110812051227
 Ignore-this: 1c779ce0fef19e5a8484004c6f6ff8f3
] hunk ./cairo/cairo.cabal 49
   
 Library
         build-depends:  base >= 4 && < 5,
-                        bytestring, mtl, haskell98, array
+                        bytestring, mtl, array
         build-tools:    gtk2hsC2hs
         exposed-modules:  Graphics.Rendering.Cairo
                           Graphics.Rendering.Cairo.Matrix
[Drop spurious haskell98 dependency from pango
Bryan O'Sullivan <bos@serpentine.com>**20110812051355
 Ignore-this: 951b198d8e71533bb2527481dc6f5e43
] hunk ./pango/pango.cabal 44
 
 Library
         build-depends:  base >= 3 && < 5,
-                        process, directory, array, containers, pretty, mtl, haskell98,
+                        process, directory, array, containers, pretty, mtl,
                         glib  >= 0.12 && < 0.13,
                         cairo >= 0.12 && < 0.13
 
[Drop spurious haskell98 dependency from gio
Bryan O'Sullivan <bos@serpentine.com>**20110812051524
 Ignore-this: 9ce85e89e84356b42555c2210eadc9f
] hunk ./gio/gio.cabal 43
   subdir:       gio
 
 Library
-        build-depends:  base >= 4 && < 5, array, containers, haskell98, mtl, bytestring,
+        build-depends:  base >= 4 && < 5, array, containers, mtl, bytestring,
                         glib >= 0.12.0 && < 0.13
         build-tools:    gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen
 
[Drop spurious haskell98 dependency from gtk
Bryan O'Sullivan <bos@serpentine.com>**20110812052602
 Ignore-this: 66a08c472d75e4c1eb874a8717e7a25f
] hunk ./gtk/gtk.cabal 133
 
 Library
         build-depends:  base >= 4 && < 5,
-                        array, containers, haskell98, mtl, bytestring,
+                        array, containers, mtl, bytestring,
                         glib  >= 0.12.0 && < 0.13,
                         pango >= 0.12.0 && < 0.13,
                         cairo >= 0.12.0 && < 0.13
[Fix a build failure under GHC 7.2
Bryan O'Sullivan <bos@serpentine.com>**20110812052606
 Ignore-this: 16498bf1d6235effbe8afadc30040de5
] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1
-{-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
+{-# LANGUAGE FlexibleInstances, ScopedTypeVariables, TypeSynonymInstances #-}
 {-# OPTIONS_HADDOCK hide #-}
 -- -*-haskell-*-
 
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1039
     #{poke GdkKeymapKey, level} ptr ((fromIntegral level)::#gtk2hs_type gint)
                
                
+

Context:

[Fix typo and add docs in INSTALL
Andy Stewart <lazycat.manatee@gmail.com>**20101222122119
 Ignore-this: bc363a0efc4f6c975f35a3c8ffdbca1
] 
[Add have-quartz-gtk flag to disable linking against gdk_x11_drawable_get_xid
Max Bolingbroke <batterseapower@hotmail.com>**20101222113914
 Ignore-this: 3cf2009a8db78814ad5de1ed0b2173ba
] 
[Fix docs about 'imContextRetrieveSurrounding' signal.
Andy Stewart <lazycat.manatee@gmail.com>**20101217115003
 Ignore-this: 26e7b7d10a3e97f7a185a0afbe72a9b9
] 
[Don't emit an update signal with the incorrect stamp.
Axel.Simon@in.tum.de**20101216124643
 Ignore-this: 64b053e5495b4879923b802194b91111
] 
[Wrap version flag make gio can compile under gio-2.18.x
Andy Stewart <lazycat.manatee@gmail.com>**20101130130716
 Ignore-this: 84989139d42c5790828cadaaec6a73bf
] 
[Wrap 2.16.0 with EntryIconPosition to make gtk can compile in gtk+-2.14.x
Andy Stewart <lazycat.manatee@gmail.com>**20101130125652
 Ignore-this: 2853a6fc9749f123b67ddc0b10b53174
] 
[Add functions to query and show tooltips in TreeViews.
Axel.Simon@in.tum.de**20101123090253
 Ignore-this: fa122105338c3b22d0ebccb8e213ebd0
] 
[Add a note on broken binary Gtk+ installers on Windows.
Axel.Simon@in.tum.de**20101116154707
 Ignore-this: 30ab8f947870103cca14271237e5b423
] 
[Added basic GString support.
Andreas Baldeau <andreas@baldeau.net>**20101115103157
 Ignore-this: 4fc62813b652cc6e420c7b69006dfdae
] 
[TAG 0.12.0
Axel.Simon@in.tum.de**20101107135304
 Ignore-this: 14b3023f48c36eed2cb136a2b69d6dae
] 
Patch bundle hash:
355146f17f07786b459156b7086b5c9c38e7fb14